chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-11-18 12:25:26 +01:00
parent 0dd5fadc57
commit c7d29abdf7
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 54 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700160052, "lastModified": 1700305180,
"narHash": "sha256-rfAmcavbA0OiOeOwiu7Kw9eOCrkqbtmUDQFYFZiEuzw=", "narHash": "sha256-k3JMKZcfXCsNr2iJbiKv47dUDVS2+q0FT5lywZo3lRU=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "f50cbddd31a9d738e66d168f5a6399a7d457c65d", "rev": "afa9aa7eea240cdace48740887bafcea9f23645a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1700160154, "lastModified": 1700305056,
"narHash": "sha256-nY9qsRXcrJo/IgyI47Pp/j3y/FWtOE2M0jlXk9k6Yqg=", "narHash": "sha256-73ktSjU8tOE6k7MdBZi0Nw17Svh7nhmGvyrx6D8dJfE=",
"owner": "accentor", "owner": "accentor",
"repo": "web", "repo": "web",
"rev": "7e66a7ab455bc2fe385d0980311963f6d1238d8c", "rev": "99ba0d8ae706fea6895c08d39e41382aa2633e9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1700274000, "lastModified": 1700300278,
"narHash": "sha256-oLAYuELjHByXzvvY5+Jsy5ASL1SSQ/1EgRaAfmU1VN4=", "narHash": "sha256-kiC0UziADqkBSst4GhkJEp54wrD0Hcxm/zQrOICBJ0k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "afe0c2530f88b7a42f6a02fa5ac511892dab13b3", "rev": "a163b43334a82ef433d8e11c1be767afd3ac0226",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699963925, "lastModified": 1700204040,
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bf744fe90419885eefced41b3e5ae442d732712d", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +534,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1700294221, "lastModified": 1700300339,
"narHash": "sha256-Oy7W4Ix60yCAsCJTkMm61OEG7Xn8U7U1pNRWpohclh0=", "narHash": "sha256-Bw8D/qyAdAWQaiFiep3dZo47zMSgHjNJdnt5d7PDwAI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "8f01ffd1c26e833e56a4fde3321215b179d0e488", "rev": "907f5557e579259e9503f0b8a83802a974d7547f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -736,11 +736,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700156094, "lastModified": 1700303712,
"narHash": "sha256-ikwysf2r9pff/INmoPhItCAgLdZQr9hvcq2cZf5oXgc=", "narHash": "sha256-hAHCedESvCkfyjPeTSwPf82xvBMQzeydgAWW/HSibxI=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "5156dfa8cafbaf11d20998e03b49653104518ede", "rev": "e0834f8d6d943c9284b63d7b59e9b8c2f137f468",
"type": "github" "type": "github"
}, },
"original": { "original": {

43
modules/base/network/wireguard.nix
View file

@ -108,10 +108,9 @@ in
PublicKey = data.lasting-integrity.pubkey; PublicKey = data.lasting-integrity.pubkey;
AllowedIPs = subnet; AllowedIPs = subnet;
Endpoint = Endpoint =
#if config.chvp.base.network.wireguard.onCorporate if config.chvp.base.network.wireguard.onCorporate
#then "127.0.0.1:51820" then "127.0.0.1:51820"
#else "lasting-integrity.vanpetegem.me:51820"; else "lasting-integrity.vanpetegem.me:51820";
"lasting-integrity.vanpetegem.me:51820";
PresharedKeyFile = pskFile; PresharedKeyFile = pskFile;
PersistentKeepalive = 25; PersistentKeepalive = 25;
}; };
@ -138,24 +137,24 @@ in
}; };
}; };
services = { services = {
#udp2raw-server = lib.mkIf config.chvp.base.network.wireguard.server { udp2raw-server = lib.mkIf config.chvp.base.network.wireguard.server {
# description = "UDP tunnel over TCP for wireguard"; description = "UDP tunnel over TCP for wireguard";
# wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# after = [ "network.target" ]; after = [ "network.target" ];
# script = '' script = ''
# ${pkgs.udp2raw}/bin/udp2raw -s -l 0.0.0.0:8080 -r 127.0.0.1:51820 \ ${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})" -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})"
# ''; '';
#}; };
#udp2raw-client = lib.mkIf config.chvp.base.network.wireguard.onCorporate { udp2raw-client = lib.mkIf config.chvp.base.network.wireguard.onCorporate {
# description = "UDP tunnel over TCP for wireguard"; description = "UDP tunnel over TCP for wireguard";
# wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# after = [ "network.target" ]; after = [ "network.target" ];
# script = '' script = ''
# ${pkgs.udp2raw}/bin/udp2raw -c -l 127.0.0.1:51820 -r 54.38.222.69:8080 \ ${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})" -k "$(cat ${config.age.secrets."files/wireguard/udp2raw".path})"
# ''; '';
#}; };
}; };
}; };
age.secrets."files/wireguard/psk" = { age.secrets."files/wireguard/psk" = {

1
modules/services/mastodon/default.nix
View file

@ -37,6 +37,7 @@
configureNginx = false; configureNginx = false;
localDomain = "social.chvp.be"; localDomain = "social.chvp.be";
enableUnixSocket = true; enableUnixSocket = true;
streamingProcesses = 4;
database.createLocally = true; database.createLocally = true;
redis.createLocally = true; redis.createLocally = true;

26
patches/267444.patch
View file

@ -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 ];

14
patches/268027.patch Normal file
View file

@ -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.