From cc89b20a2cef6a7f52724969b1f3a1dc2bd5e96f Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 16 Dec 2024 17:31:30 +0100 Subject: [PATCH 1/2] pkgs/overrides/xmppc: patch to read password from file --- flake.nix | 3 ++- pkgs/overlay.nix | 2 ++ pkgs/overrides/xmppc.nix | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/overrides/xmppc.nix diff --git a/flake.nix b/flake.nix index 9ca4456..4dd91e3 100644 --- a/flake.nix +++ b/flake.nix @@ -141,7 +141,8 @@ run-with-docker-group ssh-gpg update-from-hydra - uptimestatus; + uptimestatus + xmppc; }); inherit lib self; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 3bc8eb6..01098cd 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -22,4 +22,6 @@ final: prev: { ssh-gpg = final.callPackage ./ssh-gpg {}; update-from-hydra = final.callPackage ./update-from-hydra {}; uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {}; + + xmppc = import ./overrides/xmppc.nix final prev; } diff --git a/pkgs/overrides/xmppc.nix b/pkgs/overrides/xmppc.nix new file mode 100644 index 0000000..3f01351 --- /dev/null +++ b/pkgs/overrides/xmppc.nix @@ -0,0 +1,11 @@ +final: prev: +prev.xmppc.overrideAttrs (finalAttrs: prevAttrs: { + version = "0.1.2-clerie-custom"; + patches = [ + (final.fetchpatch { + # read password from file + url = "https://codeberg.org/Anoxinon_e.V./xmppc/pulls/38.patch"; + hash = "sha256-gAD0mfuvqqC7AFtMdtbW+tJiD1F9tOP6/E0eJayDXqc="; + }) + ]; +}) From 69358ecbe0e959befdc259057b1c3d73b33f7503 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Tue, 17 Dec 2024 03:03:03 +0100 Subject: [PATCH 2/2] Update nixpkgs 2024-12-17-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 98cf1d2..ad2696b 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": {