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-05-02 17:16:24 +02:00
parent 681ce9d77b
commit 532c1f92ae
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 12 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682937610, "lastModified": 1683038519,
"narHash": "sha256-EW4YU9JC3BFtYqPYXgxwi4z5EROPebJFav49YJ8fnG8=", "narHash": "sha256-8YnlfR/Lk0BBD2HU+HYMwen5jD0dSpQuqRVDdZMrqfg=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "c858f16f492fe73f69e4b17b3a06240b27053377", "rev": "2f1547353875e1b9a61cd0f42dff56b98a19aae1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682937723, "lastModified": 1683038572,
"narHash": "sha256-4cLG50pCkOYMLM8dKOsN85OsxE8zYLwFvwOVvY0mTWY=", "narHash": "sha256-ZoFdcKoIWTR4htKGvJbiMA+2Cp4P4vevP1g/X4cho4I=",
"owner": "accentor", "owner": "accentor",
"repo": "web", "repo": "web",
"rev": "a14a218e7d73f5cc0f4661d2d4d4c798613d29e7", "rev": "c0c412ea097182a79f896c3a96a64a6d632dc123",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682879489, "lastModified": 1683014792,
"narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682937324, "lastModified": 1683038145,
"narHash": "sha256-2wZIFMSQ9o1cdlxPICs6TIazfmQ5iahGkumZVjO884I=", "narHash": "sha256-qdlPOm6/3D0pv/fKErI2ajH1dFnRklkgjQwJd6wojNE=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "1981913f536535c555e63c9bb9f34696593d0e8d", "rev": "5a45cc8794a007e36c25a9a958bf8cbae347104b",
"type": "github" "type": "github"
}, },
"original": { "original": {

58
patches/223229.patch
View file

@ -1,58 +0,0 @@
From 547bd1ce043110cb4a06dd02b732fbd2be765854 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 26 Mar 2023 12:41:08 +0200
Subject: [PATCH 1/2] mu: 1.18.14 -> 1.10.3
https://github.com/djcb/mu/releases/tag/v1.10.0
https://github.com/djcb/mu/releases/tag/v1.10.1
https://github.com/djcb/mu/releases/tag/v1.10.2
https://github.com/djcb/mu/releases/tag/v1.10.3
---
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 9d2286e2271f1..c025546ea9616 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.14";
+ version = "1.10.3";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0=";
+ hash = "sha256-AqIPdKdNKLnAHIlqgs8zzm7j+iwNvDFWslvp8RjQPnI=";
};
postPatch = ''
From 6e3d08874319a29e933e2c53d3c460e30485b623 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 2 Apr 2023 11:22:09 +0200
Subject: [PATCH 2/2] mu: don't use (very) old version of texinfo
---
pkgs/top-level/all-packages.nix | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ca6bc33c230..bc07fe3c340ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22640,9 +22640,7 @@ with pkgs;
mtxclient = callPackage ../development/libraries/mtxclient { };
- mu = callPackage ../tools/networking/mu {
- texinfo = texinfo4;
- };
+ mu = callPackage ../tools/networking/mu { };
mueval = callPackage ../development/tools/haskell/mueval { };