From 6a414ec8c3d8888463a3e61abc6173c5d3aaf069 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 19 Feb 2025 09:45:55 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 38 +++++++++++++++++++------------------- patches/382693.patch | 39 --------------------------------------- 2 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 patches/382693.patch diff --git a/flake.lock b/flake.lock index 7df901f5..9b587897 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1739892846, - "narHash": "sha256-U9cZzW8MA8jeRaq8spfOi68cSPi0pDXkww43RJb9ZMU=", + "lastModified": 1739947634, + "narHash": "sha256-awRvesq0tSY7+nDRGFJ41K1ivmPt/fLsp43vfU+/9Nk=", "owner": "accentor", "repo": "api", - "rev": "299300f45634193a3f326a03c30979f4c8a45cf4", + "rev": "02dbdab568d18fe6d59bef9112a8fa08035ec4d8", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1739803606, - "narHash": "sha256-0IGc0sPE9mp5SAbtjRmHx9wPbQW5kMB6huTO58mcfpI=", + "lastModified": 1739947842, + "narHash": "sha256-PBGgEiVq2K0De7JRmiOBLzPr5fDrWNeIJNfo+AeVpJI=", "owner": "accentor", "repo": "web", - "rev": "49abc318c3a5d3103065f613fb8ce8e33e99a0f8", + "rev": "ee8074bf3620cb5f90b11415e67164968eb27627", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739930872, - "narHash": "sha256-nrzASJq/l+p63O5fCBgNb0qDxurnLkwz310VWuNlPZ4=", + "lastModified": 1739953274, + "narHash": "sha256-46OV9XP5X5y+1LUEFYoiIOY3rbpDWSIUqDbrpN6W72I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ac68198cb33b20aaae32527d3810a86acb796bd6", + "rev": "9f30fb22dc6473cdf4afc6b1d38d70b8606cc4b1", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1739803230, - "narHash": "sha256-f7CKapH3QiXJUY6uZtTg/sEXC8YgRYoluU4L38xGKwA=", + "lastModified": 1739943539, + "narHash": "sha256-OxUqMuMHZXs6Ha2DtskMuk68U6U/9qUGDOfHGMRbHtY=", "owner": "chvp", "repo": "tetris", - "rev": "e0793ea68fa7b3285735ea0ab4b252c216852b3e", + "rev": "6598d6b19f90b6ae0788939c76094efc63ae4287", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1739803011, - "narHash": "sha256-1rHikkq3NHLT0fD9/QEKIBtg3N6tktyVWIlxSBZqIIA=", + "lastModified": 1739943401, + "narHash": "sha256-2eXux922svw0iiNocOMZfnpXN3122ujIE5VIjimMVls=", "ref": "refs/heads/main", - "rev": "ce4078fec88fe47f66b153d1ea84be33a990815d", - "revCount": 80, + "rev": "f20481d12fae8986fb35a2951fd33f65ab4f41c4", + "revCount": 81, "type": "git", "url": "https://git.chvp.be/chvp/www.chvp.be" }, diff --git a/patches/382693.patch b/patches/382693.patch deleted file mode 100644 index 110b8e88..00000000 --- a/patches/382693.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix -index f0b4ec1f0654b..ff862f38d5f60 100644 ---- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix -+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix -@@ -1,5 +1,6 @@ - { - lib, -+ nix-update-script, - buildGoModule, - fetchFromGitHub, - olm, -@@ -13,22 +14,24 @@ - - buildGoModule rec { - pname = "mautrix-whatsapp"; -- version = "0.11.2"; -+ version = "0.11.3"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-3S4aNoxK99iExhTJQP/JNq0GajCUjbdq4cUgCBudyXI="; -+ hash = "sha256-b56WCt71A1+TUN7ug3E/F8A99vqGJLJfHN49klZzx9I="; - }; - - buildInputs = lib.optional (!withGoolm) olm; - tags = lib.optional withGoolm "goolm"; - -- vendorHash = "sha256-9iX+pzken+/7+nqYa71rcc1olCdpmu3UfR09ag3KSKs="; -+ vendorHash = "sha256-8Iu5rL42TFFqlClQf01kT86Hhb46qsPObjE1snuz1So="; - - doCheck = false; - -+ passthru.updateScript = nix-update-script { }; -+ - meta = with lib; { - homepage = "https://github.com/tulir/mautrix-whatsapp"; - description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";