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 2024-01-14 14:32:26 +01:00
parent b5bbd63567
commit 17a2188bc8
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 49 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1705143092,
"narHash": "sha256-KKR1t20BBqLJEbQUB2c5uQsNIJxynFVrL57MvkZjWxU=",
"lastModified": 1705229374,
"narHash": "sha256-/XHAiB0gvhoNi7hE/deEKwgk8dnDi/0tOaLdSqscTaQ=",
"owner": "accentor",
"repo": "api",
"rev": "e434133f2af48e831f988edcb938783046f79fa8",
"rev": "573dfcbeb3b62a99c2101052a66d59ccbf6b3145",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1705144513,
"narHash": "sha256-p4IER19umh7qvUm9IHgP+GjjOKHqGZRs+rQ6Kik6Ocg=",
"lastModified": 1705228893,
"narHash": "sha256-zZYGTtnT8OIhLw+PuowBSh+G2z49b60Y8ZM2XjYegVQ=",
"owner": "accentor",
"repo": "web",
"rev": "9c64debb414ab3ef6017070a1c7d8893c9e726d0",
"rev": "f9bb5cd686e2f355118f45cd373b4d55cff273f6",
"type": "github"
},
"original": {
@ -213,11 +213,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1705196317,
"narHash": "sha256-BGPPbbsZU3fU+hDi5yYOsH08qq21WrTogpgNtSUHQyU=",
"lastModified": 1705222228,
"narHash": "sha256-qa3WIBN2+J0VZRId88CatjROob41nyMz4dQ4q82h3xs=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "37f90a0217cea4a976895240059bb45a904b84e4",
"rev": "8a3a40fdad4a0fa56f98bf0b53db631a9367680b",
"type": "github"
},
"original": {
@ -476,11 +476,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"lastModified": 1705133751,
"narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
"type": "github"
},
"original": {
@ -554,11 +554,11 @@
},
"nur": {
"locked": {
"lastModified": 1705213024,
"narHash": "sha256-0apTR7uIVBlvdtzA/VjfSmG1stYnL1TmhQUDu/+pNl4=",
"lastModified": 1705237125,
"narHash": "sha256-esEbSZwNAhQo30Rv1rWRSx5g+wrbNmU6xY+hYJDxClU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "6cc5619717b9e2b930d6632bd4a0b4235c84d710",
"rev": "9015f77d9e1eabf5c06737cd99aacbfcaa38ffc4",
"type": "github"
},
"original": {
@ -771,11 +771,11 @@
]
},
"locked": {
"lastModified": 1705005389,
"narHash": "sha256-t52x4KeXQcfv8Lz5/tEifPYUazPLnF8skIvNUl9Prhg=",
"lastModified": 1705224941,
"narHash": "sha256-mgy2JT6Qt0sI7NVRkMIL5ALs+/6MGI9o950vPj3qUzQ=",
"owner": "chvp",
"repo": "tetris",
"rev": "ac7ee65f992c0e4fa1258eb856188faa7846a3b8",
"rev": "9f697ac29ae8a698985c8c1b55261a099c8ee06b",
"type": "github"
},
"original": {

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

@ -74,7 +74,7 @@
tetris.server = true;
};
services = {
garmin-scraper.enable = true;
garmin-scraper.enable = false;
git.enable = true;
grafana.enable = true;
mail.enable = true;

30
patches/280626.patch Normal file
View file

@ -0,0 +1,30 @@
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 1738c26659d22a..eadb8bd2745756 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -55,7 +55,24 @@ stdenv.mkDerivation rec {
"-L${nvidia-texture-tools.lib}/lib/static"
];
- patches = [ ./rootdir_env.patch ];
+ patches = [
+ ./rootdir_env.patch
+
+ # Fix build with libxml v2.12
+ # FIXME: Remove with next package update
+ (fetchpatch {
+ name = "libxml-2.12-fix.patch";
+ url = "https://github.com/0ad/0ad/commit/d242631245edb66816ef9960bdb2c61b68e56cec.patch";
+ hash = "sha256-Ik8ThkewB7wyTPTI7Y6k88SqpWUulXK698tevfSBr6I=";
+ })
+ # Fix build with GCC 13
+ # FIXME: Remove with next package update
+ (fetchpatch {
+ name = "gcc-13-fix.patch";
+ url = "https://github.com/0ad/0ad/commit/093e1eb23519ab4a4633a999a555a58e4fd5343e.patch";
+ hash = "sha256-NuWO64narU1JID/F3cj7lJKjo96XR7gSW0w8I3/hhuw=";
+ })
+ ];
configurePhase = ''
# Delete shipped libraries which we don't need.