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-02 18:32:38 +02:00
parent 0cf17211b7
commit b226f3511c
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 21 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flake.lock generated
View file

@ -19,11 +19,11 @@
]
},
"locked": {
"lastModified": 1664478174,
"narHash": "sha256-BTGFtfY58/1HONdMNMtj7BbeiqmuMqkZyrJaL48+b+k=",
"lastModified": 1664651104,
"narHash": "sha256-fXfftYs95SF9AL1201qa3jVVCl2DXdMmvtlL2VECV+U=",
"owner": "accentor",
"repo": "flake",
"rev": "baf9e31e93cbf2784f3e12cff9c49946e3f2693b",
"rev": "14fc7f673f2a6a1d4b95854c187b3c4d11822d3e",
"type": "github"
},
"original": {
@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1664614918,
"narHash": "sha256-68FwcXVAFKfnFhm8TUlUnD0MU/pGl87S96jsbPFbFTk=",
"lastModified": 1664650725,
"narHash": "sha256-4ypnH3u2Nm1jOCW1phGJX7zagvg9/gukbcY5tpIYY+Y=",
"owner": "accentor",
"repo": "api",
"rev": "fef2bbe913f7df2ab5fa22d9b14a13bb945bb8b1",
"rev": "e5215b5146c9a697b26ea70871260356c0a20ad9",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1664615183,
"narHash": "sha256-Ynh0gbOdr+5H6ComqwGd04p3YXGJocACblQDyTBwMv8=",
"lastModified": 1664650828,
"narHash": "sha256-17t8RwLX4PQeSTm1p61wSCTCNb4j9nhp5XIeGBKPJro=",
"owner": "accentor",
"repo": "web",
"rev": "06f521fd97ad7cf860c7790055a628f90ecca145",
"rev": "790469a900fae4e3617486ce748ac3610a3c633e",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1664620675,
"narHash": "sha256-gM+I6bVR90Lwz1srnzPcXmnjxMr/+mX+x8UKNFGyIUM=",
"lastModified": 1664705374,
"narHash": "sha256-ONIxfaS94t8NjoT7zMlz+e/Xa+k9d4Uhkys/IMls2A4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "9e18e2e8a995b88159e36dfd10ceca902a756225",
"rev": "70787f42dbf53b8a57c4b9181fd98da1d710ac5b",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1664370076,
"narHash": "sha256-NDnIo0nxJozLwEw0VPM+RApMA90uTfbvaNNtC5eB7Os=",
"lastModified": 1664538465,
"narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "854fdc68881791812eddd33b2fed94b954979a8e",
"rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796",
"type": "github"
},
"original": {
@ -262,11 +262,11 @@
},
"nur": {
"locked": {
"lastModified": 1664630754,
"narHash": "sha256-3mYT3Ul93MkGEMVOD2wRROyNu6fxH7etEqPKGpExLAg=",
"lastModified": 1664718272,
"narHash": "sha256-BNnUks1BKzBr8HzoKBFQ8a7/avQhDkKCu0DSgW1ulcY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "945a4c663db1f3d2b41366d5905762fdec208813",
"rev": "392b26288ad1cdebd03eac17adb70491f9f392d3",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1664608080,
"narHash": "sha256-kpdIDiWeJkfRQ9NUo9/luy3bDSgp3rlkq+Aw8fDaMNw=",
"lastModified": 1664650291,
"narHash": "sha256-/mP5h7F6MY9P15KVd5oea8WpAbnILSDBlSNXsDCi5l4=",
"owner": "chvp",
"repo": "tetris",
"rev": "a8dc778b71432bb579d41cd368dd1a7c0ae2e69e",
"rev": "eec140f53f788d16f23a67e549fd5fe54f15d150",
"type": "github"
},
"original": {

75
patches/192812.patch
View file

@ -1,75 +0,0 @@
From 80bd40cd9d3ba4472d3f0efc48f3770390db0242 Mon Sep 17 00:00:00 2001
From: Daniel Thwaites <danthwaites30@btinternet.com>
Date: Sat, 24 Sep 2022 20:25:42 +0100
Subject: [PATCH] zeroad: 0.0.25b -> 0.0.26
---
pkgs/games/0ad/data.nix | 2 +-
pkgs/games/0ad/game.nix | 17 +++++------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 57018e04904c6..4437a5d26995b 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
- sha256 = "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy";
+ sha256 = "sgDkhVj4goB5EOPGhlZ7ajliSNnUGAROz94JCwV3LX0=";
};
installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index e51aab519a490..23e906703f433 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -2,7 +2,7 @@
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
-, gloox, nvidia-texture-tools
+, gloox, nvidia-texture-tools, freetype
, withEditor ? true, wxGTK
}:
@@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "0ad";
- version = "0.0.25b";
+ version = "0.0.26";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
- sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp";
+ sha256 = "Lhxt9+MxLnfF+CeIZkz/w6eNO/YGBsAAOSdeHRPA7ks=";
};
nativeBuildInputs = [ python3 perl pkg-config ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
spidermonkey_78_6 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
- nvidia-texture-tools libsodium fmt
+ nvidia-texture-tools libsodium fmt freetype
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
@@ -50,14 +50,7 @@ stdenv.mkDerivation rec {
"-I${fmt.dev}/include"
];
- patches = [
- ./rootdir_env.patch
- (fetchpatch {
- # fix build with gcc11 and glibc 2.35
- url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch";
- hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0=";
- })
- ];
+ patches = [ ./rootdir_env.patch ];
configurePhase = ''
# Delete shipped libraries which we don't need.