From c7d29abdf72de2919998c54b8b364cab38609ca9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 18 Nov 2023 12:25:26 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 36 +++++++++++----------- modules/base/network/wireguard.nix | 43 +++++++++++++-------------- modules/services/mastodon/default.nix | 1 + patches/267444.patch | 26 ---------------- patches/268027.patch | 14 +++++++++ 5 files changed, 54 insertions(+), 66 deletions(-) delete mode 100644 patches/267444.patch create mode 100644 patches/268027.patch diff --git a/flake.lock b/flake.lock index fdce736c..fa26cf54 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1700160052, - "narHash": "sha256-rfAmcavbA0OiOeOwiu7Kw9eOCrkqbtmUDQFYFZiEuzw=", + "lastModified": 1700305180, + "narHash": "sha256-k3JMKZcfXCsNr2iJbiKv47dUDVS2+q0FT5lywZo3lRU=", "owner": "accentor", "repo": "api", - "rev": "f50cbddd31a9d738e66d168f5a6399a7d457c65d", + "rev": "afa9aa7eea240cdace48740887bafcea9f23645a", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1700160154, - "narHash": "sha256-nY9qsRXcrJo/IgyI47Pp/j3y/FWtOE2M0jlXk9k6Yqg=", + "lastModified": 1700305056, + "narHash": "sha256-73ktSjU8tOE6k7MdBZi0Nw17Svh7nhmGvyrx6D8dJfE=", "owner": "accentor", "repo": "web", - "rev": "7e66a7ab455bc2fe385d0980311963f6d1238d8c", + "rev": "99ba0d8ae706fea6895c08d39e41382aa2633e9d", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700274000, - "narHash": "sha256-oLAYuELjHByXzvvY5+Jsy5ASL1SSQ/1EgRaAfmU1VN4=", + "lastModified": 1700300278, + "narHash": "sha256-kiC0UziADqkBSst4GhkJEp54wrD0Hcxm/zQrOICBJ0k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "afe0c2530f88b7a42f6a02fa5ac511892dab13b3", + "rev": "a163b43334a82ef433d8e11c1be767afd3ac0226", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699963925, - "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf744fe90419885eefced41b3e5ae442d732712d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1700294221, - "narHash": "sha256-Oy7W4Ix60yCAsCJTkMm61OEG7Xn8U7U1pNRWpohclh0=", + "lastModified": 1700300339, + "narHash": "sha256-Bw8D/qyAdAWQaiFiep3dZo47zMSgHjNJdnt5d7PDwAI=", "owner": "nix-community", "repo": "NUR", - "rev": "8f01ffd1c26e833e56a4fde3321215b179d0e488", + "rev": "907f5557e579259e9503f0b8a83802a974d7547f", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1700156094, - "narHash": "sha256-ikwysf2r9pff/INmoPhItCAgLdZQr9hvcq2cZf5oXgc=", + "lastModified": 1700303712, + "narHash": "sha256-hAHCedESvCkfyjPeTSwPf82xvBMQzeydgAWW/HSibxI=", "owner": "chvp", "repo": "tetris", - "rev": "5156dfa8cafbaf11d20998e03b49653104518ede", + "rev": "e0834f8d6d943c9284b63d7b59e9b8c2f137f468", "type": "github" }, "original": { diff --git a/modules/base/network/wireguard.nix b/modules/base/network/wireguard.nix index de71768b..75fc14e7 100644 --- a/modules/base/network/wireguard.nix +++ b/modules/base/network/wireguard.nix @@ -108,10 +108,9 @@ in PublicKey = data.lasting-integrity.pubkey; AllowedIPs = subnet; Endpoint = - #if config.chvp.base.network.wireguard.onCorporate - #then "127.0.0.1:51820" - #else "lasting-integrity.vanpetegem.me:51820"; - "lasting-integrity.vanpetegem.me:51820"; + if config.chvp.base.network.wireguard.onCorporate + then "127.0.0.1:51820" + else "lasting-integrity.vanpetegem.me:51820"; PresharedKeyFile = pskFile; PersistentKeepalive = 25; }; @@ -138,24 +137,24 @@ in }; }; services = { - #udp2raw-server = lib.mkIf config.chvp.base.network.wireguard.server { - # description = "UDP tunnel over TCP for wireguard"; - # wantedBy = [ "multi-user.target" ]; - # after = [ "network.target" ]; - # script = '' - # ${pkgs.udp2raw}/bin/udp2raw -s -l 0.0.0.0:8080 -r 127.0.0.1:51820 \ - # -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})" - # ''; - #}; - #udp2raw-client = lib.mkIf config.chvp.base.network.wireguard.onCorporate { - # description = "UDP tunnel over TCP for wireguard"; - # wantedBy = [ "multi-user.target" ]; - # after = [ "network.target" ]; - # script = '' - # ${pkgs.udp2raw}/bin/udp2raw -c -l 127.0.0.1:51820 -r 54.38.222.69:8080 \ - # -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})" - # ''; - #}; + udp2raw-server = lib.mkIf config.chvp.base.network.wireguard.server { + description = "UDP tunnel over TCP for wireguard"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.udp2raw}/bin/udp2raw -s -l 0.0.0.0:8080 -r 127.0.0.1:51820 \ + -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})" + ''; + }; + udp2raw-client = lib.mkIf config.chvp.base.network.wireguard.onCorporate { + description = "UDP tunnel over TCP for wireguard"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.udp2raw}/bin/udp2raw -c -l 127.0.0.1:51820 -r 54.38.222.69:8080 \ + -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})" + ''; + }; }; }; age.secrets."files/wireguard/psk" = { diff --git a/modules/services/mastodon/default.nix b/modules/services/mastodon/default.nix index ab810917..46d98078 100644 --- a/modules/services/mastodon/default.nix +++ b/modules/services/mastodon/default.nix @@ -37,6 +37,7 @@ configureNginx = false; localDomain = "social.chvp.be"; enableUnixSocket = true; + streamingProcesses = 4; database.createLocally = true; redis.createLocally = true; diff --git a/patches/267444.patch b/patches/267444.patch deleted file mode 100644 index 696509bb..00000000 --- a/patches/267444.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -index 2ff8a8d81a89cc..5d24459f274f73 100644 ---- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -@@ -19,18 +19,18 @@ - - stdenv.mkDerivation (finalAttrs: { - pname = "teams-for-linux"; -- version = "1.3.18"; -+ version = "1.3.19"; - - src = fetchFromGitHub { - owner = "IsmaelMartinez"; - repo = "teams-for-linux"; - rev = "v${finalAttrs.version}"; -- hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ="; -+ hash = "sha256-+n26VTNRymPdzMbSz8AZsQ73xOHizOFAstw6toKfZQM="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; -- hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0="; -+ hash = "sha256-SxUdTzk8WngkKwT05U8HJsK8+8ezcJWdiT/ettxpeEE="; - }; - - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; diff --git a/patches/268027.patch b/patches/268027.patch new file mode 100644 index 00000000..9053ab57 --- /dev/null +++ b/patches/268027.patch @@ -0,0 +1,14 @@ +diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +index 1a6f9c784cf675..6d51b51b215d43 100644 +--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix ++++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +@@ -57,7 +57,8 @@ + # Raise an error if two packages are installed with the same name + # TODO: For cross we probably need a different PYTHONPATH, or not + # add the runtime deps until after buildPhase. +-, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) ++# FIXME: disabled for Python 2 because broken ++, catchConflicts ? false + + # Additional arguments to pass to the makeWrapper function, which wraps + # generated binaries.