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 2021-08-10 09:56:14 +02:00
parent ff5188ef07
commit 1a8fcfc5bb
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 10 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -42,11 +42,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1628473758, "lastModified": 1628560239,
"narHash": "sha256-EKTy/96QK+krye7RU/nFBxMI5GdBGgxp+Ik6B7fv6mQ=", "narHash": "sha256-Tcq9yzD4fFi39skf+jjxmIXh5/d3fSHFqzJA3nTMeu0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "73538fa26b715cc7b4d265ee7b0c582e6c27fe4c", "rev": "29829efa3367108398a024db927263d95a55bba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628468976, "lastModified": 1628547133,
"narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=", "narHash": "sha256-KCOyWv81NxRO2vgqtu09bbndXmy3T/0PkSfrXxnFN+8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c4234cb79684646657f9cfcd4075c3122845670", "rev": "5515ec99cc1a8df5b8ca2204f752e1501572fa1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +92,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1628287055, "lastModified": 1628465643,
"narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=", "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3", "rev": "6ef4f522d63f22b40004319778761040d3197390",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/services/accentor/default.nix
View file

@ -43,7 +43,7 @@
owner = "accentor"; owner = "accentor";
repo = "web"; repo = "web";
rev = "main"; rev = "main";
sha256 = "FKKfhbYYFIix4x2hXUDpomLjVb0Kt2ZR8ipqLSJb2Ew="; sha256 = "I2TlA4ENhD5sXlZmj5BNR4F9N6Nnp1K2mtmpyYRkEIM=";
}; };
}); });
}; };

85
patches/133015.patch
View file

@ -1,85 +0,0 @@
From bb550a67d820bc581a58cf96e1e4dff3ad6f4ce9 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 7 Aug 2021 14:37:26 +0200
Subject: [PATCH 1/3] mautrix-whatsapp: 0.1.7 -> 0.1.8
---
pkgs/servers/mautrix-whatsapp/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index a5b2f14e9d58d..0b2da872bd06e 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "0.1.7";
+ version = "0.1.8";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
- sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE=";
+ sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U=";
};
buildInputs = [ olm ];
- vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4=";
+ vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0=";
doCheck = false;
From 57e621437054555b6b1e563208badec390e4efea Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 7 Aug 2021 15:21:51 +0200
Subject: [PATCH 2/3] mautrix-whatsapp: update repository location
---
pkgs/servers/mautrix-whatsapp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 0b2da872bd06e..759d53df66638 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -5,8 +5,8 @@ buildGoModule rec {
version = "0.1.8";
src = fetchFromGitHub {
- owner = "tulir";
- repo = "mautrix-whatsapp";
+ owner = "mautrix";
+ repo = "whatsapp";
rev = "v${version}";
sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U=";
};
From a6692271eb99c51137e8604d4c4a58b2e71bb7d0 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 7 Aug 2021 15:22:16 +0200
Subject: [PATCH 3/3] mautrix-whatsapp: specify agpl3plus license
e.g. https://github.com/mautrix/whatsapp/blob/f4a7394b670db59aadd6ad99f761acbff255e1b6/bridgestate.go
mentions the option of using a later version.
---
pkgs/servers/mautrix-whatsapp/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 759d53df66638..c2f9e206e9cb7 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://github.com/tulir/mautrix-whatsapp";
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
- license = licenses.agpl3;
+ license = licenses.agpl3Plus;
maintainers = with maintainers; [ vskilet ma27 ];
};
}