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-07-17 20:50:19 +02:00
parent 9155eda274
commit c7874360cf
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 15 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1657968602,
"narHash": "sha256-AvVIt63UqFU0aaUlSSO/F8WDUuu7xna0Ub759kyzGFA=",
"lastModified": 1658083688,
"narHash": "sha256-uox4r0Sk2xgMB9wKIINyqSdltdhbmAeg+3oabVgK4m8=",
"owner": "accentor",
"repo": "api",
"rev": "a89278856f07efce60420682277c831eabb060a1",
"rev": "5ecaac208b290db7976bc43b0a905cafecc286c4",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1658054880,
"narHash": "sha256-j+pBQjGi3zQlbgbgmrTIXjb1TiV2MVJltQNKjO6s5uM=",
"lastModified": 1658083628,
"narHash": "sha256-Sc3DibJDtveCYfAZPO8r/R5Fi8KvIYbHl7jlDRn5pNs=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "1d0bad6294cd4228070a60f936c6e74976d2b327",
"rev": "afb0f1be5bdcb7ba95495a536ed1ddea96653ee0",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1657802959,
"narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=",
"lastModified": 1658015103,
"narHash": "sha256-mO+23f3SO+fBzEvbxRe6GkSB5Xp43CT2sV8Rs8MYdz8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8",
"rev": "8f485713f5e6b6883a9b6959afa98688360a3ecb",
"type": "github"
},
"original": {
@ -262,11 +262,11 @@
},
"nur": {
"locked": {
"lastModified": 1658072573,
"narHash": "sha256-Ok9GGPsEzqyLb5nPgK4hJbzjZkxx0GDFrkGKTULNjzQ=",
"lastModified": 1658082336,
"narHash": "sha256-pbf0nkDAZNOynCKOK6UnHmdPq00+R1W1pfr9FeNwkNY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "baeef2cc31b96006490ca9527a03cd6534651e6e",
"rev": "7a681c8c520c58b01df80270089c90fbfb12f582",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1657860431,
"narHash": "sha256-e96tIS4nOubsfS/RdPDT56vbFz3/MNeQfbgL0o+5W3Y=",
"lastModified": 1658083417,
"narHash": "sha256-3v2jAg6gpNqwQc6kZASfhyG3mnecx4vzskSXNdUopYI=",
"owner": "chvp",
"repo": "tetris",
"rev": "771d28da98f576c7efcd7f372459730014efdd86",
"rev": "9b282eb280aafa388f8900b9cc759347251b9610",
"type": "github"
},
"original": {

29
patches/181451.patch
View file

@ -1,29 +0,0 @@
From 333887c91c7fa26912b08daf35725bd3767040df Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 14 Jul 2022 10:16:39 +0200
Subject: [PATCH] mu: 1.8.5 -> 1.8.6
---
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 e980c8a76b81b..f711b18671ae4 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.5";
+ version = "1.8.6";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- sha256 = "BbH8P5l3zoBKeyFUxJqXIn0sUqg80BApdJCoz+bG/uc=";
+ sha256 = "u3MN7MrfHt/ylxDoNnfwnAOKdOAbVZwvIukje0EYgOo=";
};
postPatch = ''

58
patches/181467.patch
View file

@ -1,58 +0,0 @@
From 38c9f6428b87a75ff70ba886c2a559a94095c8d5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 14 Jul 2022 13:10:59 +0200
Subject: [PATCH] xapian: 1.4.19 -> 1.4.20
---
pkgs/development/libraries/xapian/default.nix | 2 +-
pkgs/development/libraries/xapian/tools/omega/default.nix | 6 +++---
pkgs/development/python-modules/xapian/default.nix | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 4d23752b2420c..b85086374dc1f 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM=";
+ xapian_1_4 = generic "1.4.20" "zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0=";
}
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 79e5786f0488c..eeea4a7cc9e3f 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }:
+{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre2, zlib, libmagic }:
stdenv.mkDerivation rec {
pname = "xapian-omega";
@@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
- sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr";
+ sha256 = "Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8=";
};
- buildInputs = [ xapian perl pcre zlib libmagic ];
+ buildInputs = [ xapian perl pcre2 zlib libmagic ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index a71ade1b41b78..cb0d788e84325 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
- sha256 = "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm";
+ sha256 = "eGzCjQVmCyJ5VEE68OL2bk6tKgbT322rrqSERUtgHvU=";
};
configureFlags = [