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

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2022-10-28 10:55:04 +02:00
parent 220421c5df
commit a92c58cda6
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 43 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -19,11 +19,11 @@
]
},
"locked": {
"lastModified": 1666722663,
"narHash": "sha256-WcIUceDTX5U7dju/HnzNAdBdaWKeenZm7haiU390xM8=",
"lastModified": 1666943433,
"narHash": "sha256-nerz056SycgiQOqkARYt4xoAg4UcKMbi1u0j7pep7Rc=",
"owner": "accentor",
"repo": "flake",
"rev": "c1640f1ba16fc00bccff6801f63ec7b4e45e1593",
"rev": "a6e280586e4f909d32cb14bedc5977461725731e",
"type": "github"
},
"original": {
@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1666738383,
"narHash": "sha256-kmSOTunzq9sPey3s3vcBahVobY9GVNLTVbKUypSVCAk=",
"lastModified": 1666911026,
"narHash": "sha256-6sRCGixYNsktCxBGHEy3BmBZEDqauLqlb2RZjYfQjP0=",
"owner": "accentor",
"repo": "api",
"rev": "144bedc3f774b389db212ee32b1e417f585af03c",
"rev": "ff97a16bb4caeb6af3bf4ca5af0299c9723d4424",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1666731217,
"narHash": "sha256-/uEu3NByma5A8E15UZ1APXfUnF1GIRndJIlklLVf6AM=",
"lastModified": 1666926477,
"narHash": "sha256-9zVgwamp9hKideU+R764JA1qacTOK3Br2elmNRxoyPw=",
"owner": "accentor",
"repo": "web",
"rev": "b2c401d5143458b3cb317d97960548733dce623a",
"rev": "da6ee1445c9b5f9f98e76b53665534d7331ffd2f",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1666874755,
"narHash": "sha256-+rAaB/q0OpdX4FRJNVdJZErBPx3i00eAt70k8VEq67c=",
"lastModified": 1666935769,
"narHash": "sha256-jvf1mod8cE7XzNuLF2R1wK9cQWMdXjusipqhw7wj3nk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "8c3e6c2f6bacda8f86e87207b8509ceaec7f5853",
"rev": "a1ffca78cf018cf9078a015b268cf5b22dddb017",
"type": "github"
},
"original": {
@ -191,11 +191,11 @@
]
},
"locked": {
"lastModified": 1666887363,
"narHash": "sha256-+bs3z5wk57MHmqTELsx62jrySYJbiWfQIW+Tj79oNGI=",
"lastModified": 1666903647,
"narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d3f21617acace32097a53b0b74fb5000d333d094",
"rev": "213a06295dff96668a1d673b9fd1c03ce1de6745",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1666703756,
"narHash": "sha256-GwpMJ1hT+z1fMAUkaGtvbvofJQwdVFDEGVhfE82+AUk=",
"lastModified": 1666869603,
"narHash": "sha256-3V53or4Vpu4+LrGfGSh3T2V8+qf5RP6nRuex9GywkwE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f994293d1eb8812f032e8919e10a594567cf6ef7",
"rev": "2001e2b31c565bcdf7bc13062b8d7cfccaca05b8",
"type": "github"
},
"original": {
@ -262,11 +262,11 @@
},
"nur": {
"locked": {
"lastModified": 1666886685,
"narHash": "sha256-lM42Y0IFBb8Bn6GePkid3MYZgZxtkVY4BrOTPLmPtt4=",
"lastModified": 1666946571,
"narHash": "sha256-/USsax5AeG1ipuEqOWjGLpIbxJ02JVLJo9aasrYCkUY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "68967fd110a414b5e9a0f625ad8856405a172bbc",
"rev": "87119c2819a3d255f2084651bcb482ae2e4a54ae",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1666847587,
"narHash": "sha256-jYngT68RTY7GCsGgWx4duZB2QL3L1cH9imJ7lsSJn2g=",
"lastModified": 1666947188,
"narHash": "sha256-2xs7VsrM9tJuDNcdj8Lta3G9dcbNODVEhd38JKVkKkU=",
"owner": "chvp",
"repo": "tetris",
"rev": "a3a72f252cb0e8d5d5ae2a642da009211133771b",
"rev": "d79ca13c9f65dae3120b1be93c4544f4368e1911",
"type": "github"
},
"original": {

19
machines/lasting-integrity/default.nix
View file

@ -67,14 +67,17 @@
{
fqdn = "vanpetegem.me";
options = {
locations = let matrixRedirect = {
proxyPass = "http://127.0.0.1:8448";
extraConfig = ''
proxy_read_timeout 600;
client_max_body_size 10M;
proxy_set_header X-Forwarded-Ssl on;
'';
}; in
locations =
let
matrixRedirect = {
proxyPass = "http://127.0.0.1:8448";
extraConfig = ''
proxy_read_timeout 600;
client_max_body_size 10M;
proxy_set_header X-Forwarded-Ssl on;
'';
};
in
{
"/_matrix" = matrixRedirect;
"/.well-known/matrix" = {

14
modules/graphical/mail/default.nix
View file

@ -323,12 +323,14 @@ in
};
};
"vdirsyncer/config".text =
let nextcloudConfig = type: {
inherit type;
url = "https://nextcloud.vanpetegem.me/remote.php/dav/";
username = "chvp";
"password.fetch" = [ "command" "${passwordScript}" "social/Nextcloud" ];
}; in
let
nextcloudConfig = type: {
inherit type;
url = "https://nextcloud.vanpetegem.me/remote.php/dav/";
username = "chvp";
"password.fetch" = [ "command" "${passwordScript}" "social/Nextcloud" ];
};
in
lib.generators.toINI
{ mkKeyValue = lib.generators.mkKeyValueDefault { mkValueString = builtins.toJSON; } "="; }
{

26
patches/197504.patch
View file

@ -1,26 +0,0 @@
From 036faba2adf7a9ca0e878b7fc7cafc5388edb527 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 24 Oct 2022 09:28:30 +0200
Subject: [PATCH] zeroad: fix build
---
pkgs/games/0ad/game.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 488ef0c91e17f..7e1375a829f97 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
- "-I${xorgproto}/include/X11"
- "-I${libX11.dev}/include/X11"
- "-I${libXcursor.dev}/include/X11"
+ "-I${xorgproto}/include"
+ "-I${libX11.dev}/include"
+ "-I${libXcursor.dev}/include"
"-I${SDL2}/include/SDL2"
"-I${fmt.dev}/include"
"-I${nvidia-texture-tools.dev}/include"

30
patches/197685.patch
View file

@ -1,30 +0,0 @@
From 30a57da8e0c34ad1821ebb3e0205dbeff15dac6d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 25 Oct 2022 09:32:04 +0200
Subject: [PATCH] mu: 1.8.10 -> 1.8.11
https://github.com/djcb/mu/releases/tag/v1.8.11
---
pkgs/tools/networking/mu/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 6a578b4723988..0544b6d1ec116 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.8.10";
+ version = "1.8.11";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- hash = "sha256-hwroSuxn9zVjQBz8r2y93o42zzVkHWAZaEKKEVgSb5s=";
+ hash = "sha256-IEfwAAUqEGtN4vww0pfW7iuIY/U3eqzC+MJsqtossCw=";
};
postPatch = ''