From 164204149c458378a0f9126f629c043e7cb7c3f2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 20 Dec 2022 20:51:48 +0100 Subject: bump --- _sources/generated.json | 20 ++++++++++---------- _sources/generated.nix | 20 ++++++++++---------- flake.lock | 36 ++++++++++++++++++------------------ hosts/surtr/http/default.nix | 1 - hosts/vidhar/default.nix | 3 +++ hosts/vidhar/network/default.nix | 6 ++++-- overlays/prometheus-lvm-exporter.nix | 2 +- overlays/spm/server/Spm/Server.hs | 4 +++- system-profiles/networkmanager.nix | 2 +- 9 files changed, 50 insertions(+), 44 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index d3b81268..eeb61f3e 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -41,7 +41,7 @@ }, "etebase-py": { "cargoLocks": null, - "date": "2022-07-06", + "date": "2022-12-11", "extract": null, "name": "etebase-py", "passthru": null, @@ -53,11 +53,11 @@ "name": null, "owner": "etesync", "repo": "etebase-py", - "rev": "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445", - "sha256": "sha256-OSzOoL7o4rWYOK1OyxfpslOnNfnK5CKhdhiFEXz/WvY=", + "rev": "2f65a4120b28776cc376572ebc67d6b824e72464", + "sha256": "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=", "type": "github" }, - "version": "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445" + "version": "2f65a4120b28776cc376572ebc67d6b824e72464" }, "lesspipe": { "cargoLocks": null, @@ -231,11 +231,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-bytPqK2kvDrskbvmyybejUr1+RU6YdOgzmtqbKyfSNA=", + "sha256": "sha256-72pxbPjmhK/SQTNkv2RMUhsuGKFWs12KRQPMrE++Ek4=", "type": "url", - "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.1.tar.gz" + "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz" }, - "version": "0.3.1" + "version": "0.3.2" }, "psql-versioning": { "cargoLocks": null, @@ -280,11 +280,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-vf59Z23DSFQrzVk9VnpZZdUWgPOUgxNPnPoUJc8Kt2E=", + "sha256": "sha256-MlxC7sAP1ehFKHFCRg7vhjMY0VODkEqKyJxrDtTZCHQ=", "type": "url", - "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.1/UHK.Agent-2.0.1-linux-x86_64.AppImage" + "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.2/UHK.Agent-2.0.2-linux-x86_64.AppImage" }, - "version": "2.0.1" + "version": "2.0.2" }, "v4l2loopback": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 89857492..564f6cc4 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -29,15 +29,15 @@ }; etebase-py = { pname = "etebase-py"; - version = "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445"; + version = "2f65a4120b28776cc376572ebc67d6b824e72464"; src = fetchFromGitHub ({ owner = "etesync"; repo = "etebase-py"; - rev = "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445"; + rev = "2f65a4120b28776cc376572ebc67d6b824e72464"; fetchSubmodules = false; - sha256 = "sha256-OSzOoL7o4rWYOK1OyxfpslOnNfnK5CKhdhiFEXz/WvY="; + sha256 = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q="; }); - date = "2022-07-06"; + date = "2022-12-11"; }; lesspipe = { pname = "lesspipe"; @@ -138,10 +138,10 @@ }; prometheus-lvm-exporter = { pname = "prometheus-lvm-exporter"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.1.tar.gz"; - sha256 = "sha256-bytPqK2kvDrskbvmyybejUr1+RU6YdOgzmtqbKyfSNA="; + url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz"; + sha256 = "sha256-72pxbPjmhK/SQTNkv2RMUhsuGKFWs12KRQPMrE++Ek4="; }; }; psql-versioning = { @@ -167,10 +167,10 @@ }; uhk-agent = { pname = "uhk-agent"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.1/UHK.Agent-2.0.1-linux-x86_64.AppImage"; - sha256 = "sha256-vf59Z23DSFQrzVk9VnpZZdUWgPOUgxNPnPoUJc8Kt2E="; + url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.2/UHK.Agent-2.0.2-linux-x86_64.AppImage"; + sha256 = "sha256-MlxC7sAP1ehFKHFCRg7vhjMY0VODkEqKyJxrDtTZCHQ="; }; }; v4l2loopback = { diff --git a/flake.lock b/flake.lock index e73b3e25..840452c1 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1668900402, - "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=", + "lastModified": 1671335968, + "narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44", + "rev": "37713c6b04b963d41664e03576f73a18c9b0d224", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668935927, - "narHash": "sha256-N+ixZEWNw4YduHgj1egfUV6hlMeEi0TcWMMjU+jQU2Y=", + "lastModified": 1671400963, + "narHash": "sha256-mJGp4Ys5lfxZkoxsiCgp97Atvplr1V5o+aLd19tE1WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "713ec3b98fde68ef79544fa5293665a5b227fbdc", + "rev": "ba46d30d1f9a636f46fb7877008140984f5e7b75", "type": "github" }, "original": { @@ -147,18 +147,18 @@ "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-stable": { "locked": { - "lastModified": 1668908668, - "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", + "rev": "86370507cb20c905800527539fc049a2bf09c667", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -191,11 +191,11 @@ "pypi-deps-db": { "flake": false, "locked": { - "lastModified": 1668931723, - "narHash": "sha256-PYs7AOk+gFFhvAtuxG7GEN+MFH2drdv0Lowf/ZE9G2k=", + "lastModified": 1670518748, + "narHash": "sha256-pfUce0zlRI+tzxPgvRSKkusjxDCBVjCpkcDKWboHa+U=", "owner": "DavHau", "repo": "pypi-deps-db", - "rev": "ff0e0f855d8560b7f094a58f4d22029d6379ba1c", + "rev": "e9571cac25d2f509e44fec9dc94a3703a40126ff", "type": "github" }, "original": { @@ -222,14 +222,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1668915833, - "narHash": "sha256-7VYPiDJZdGct8Nl3kKhg580XZfoRcViO+zUGPkfBsqM=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f72e050c3ef148b1131a0d2df55385c045e4166b", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { diff --git a/hosts/surtr/http/default.nix b/hosts/surtr/http/default.nix index 939a54fb..858ad31b 100644 --- a/hosts/surtr/http/default.nix +++ b/hosts/surtr/http/default.nix @@ -26,7 +26,6 @@ client_body_temp_path /run/nginx-client-bodies; ''; - additionalModules = with pkgs.nginxModules; [ dav pam ]; }; systemd.services.nginx = { preStart = lib.mkForce config.services.nginx.preStart; diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index 5c23dea2..7f780d9a 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -101,6 +101,9 @@ with lib; options = "--delete-older-than 30d"; }; }; + systemd.services."nix-daemon".serviceConfig = { + CPUQuota = "1200%"; + }; powerManagement = { enable = true; diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix index 0cf17c0a..ddc5d78d 100644 --- a/hosts/vidhar/network/default.nix +++ b/hosts/vidhar/network/default.nix @@ -1,4 +1,6 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: + +with lib; { imports = [ ./dsl.nix ./bifrost ./dhcp ]; @@ -57,7 +59,7 @@ services.resolved.enable = false; - systemd.services."systemd-networkd-wait-online".enable = false; + systemd.services."systemd-networkd-wait-online".enable = mkForce false; environment.etc."dnssec-trust-anchors.d/root.positive".source = "${pkgs.dns-root-data}/root.ds"; diff --git a/overlays/prometheus-lvm-exporter.nix b/overlays/prometheus-lvm-exporter.nix index ead1e820..8568e24d 100644 --- a/overlays/prometheus-lvm-exporter.nix +++ b/overlays/prometheus-lvm-exporter.nix @@ -3,7 +3,7 @@ pname = "prometheus-lvm-exporter"; inherit (sources.prometheus-lvm-exporter) version src; - vendorHash = "sha256-DyvUM3pP2P1IGfXKpkR5Y4CVcnSBsnNy0kd3WTjbWpg="; + vendorHash = "sha256-5rNrCkX+y8pItkpkvYO7uVgT/sIkUthwJ41RkMsefL4="; doCheck = false; diff --git a/overlays/spm/server/Spm/Server.hs b/overlays/spm/server/Spm/Server.hs index 6bb9dfe6..e6a876cb 100644 --- a/overlays/spm/server/Spm/Server.hs +++ b/overlays/spm/server/Spm/Server.hs @@ -275,7 +275,9 @@ spmServer dom mbox = whoami spmSql $ do Entity mailboxMappingMailbox _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox - maybe (throwError err400{ errBody = "Address already claimed" }) (const $ return NoContent) =<< insertUnique MailboxMapping{mailboxMappingExtension = Nothing, mailboxMappingDomain = dom, mailboxMappingReject = False, ..} + insert_ MailboxMapping{mailboxMappingExtension = Nothing, mailboxMappingDomain = dom, mailboxMappingReject = False, ..} + + return NoContent listMappings = spmSql $ do Entity mailboxId _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix index 878a12c4..437ee74c 100644 --- a/system-profiles/networkmanager.nix +++ b/system-profiles/networkmanager.nix @@ -19,7 +19,7 @@ with lib; }; systemd.services."NetworkManager-wait-online".enable = false; - systemd.services."systemd-networkd-wait-online".enable = false; + systemd.services."systemd-networkd-wait-online".enable = mkForce false; services.resolved.enable = false; -- cgit v1.2.3