From 0f1c874bb85623f77613f10163491bca7b5b2f65 Mon Sep 17 00:00:00 2001 From: Ondrej Telka Date: Sun, 27 Oct 2024 11:42:57 +0100 Subject: [PATCH 1/2] maintainers: add ondt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d959e70c68c..0c7a7d46a203 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16035,6 +16035,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + ondt = { + name = "Ondrej Telka"; + email = "nix@ondt.dev"; + github = "ondt"; + githubId = 20520951; + }; onedragon = { name = "YiLong Liu"; email = "18922251299@163.com"; From c58ef65a1be68b5d35c1fe24595c9eaadbd3f2e7 Mon Sep 17 00:00:00 2001 From: Ondrej Telka Date: Sun, 27 Oct 2024 12:08:01 +0100 Subject: [PATCH 2/2] xtrlock-pam: python2 -> python3 --- pkgs/misc/screensavers/xtrlock-pam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 25ac90175914..7c3bba246cb7 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, pkg-config, pam, xorg }: +{ lib, stdenv, fetchFromGitHub, python39, pkg-config, pam, xorg }: stdenv.mkDerivation { pname = "xtrlock-pam"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python2 pam xorg.libX11 ]; + buildInputs = [ python39 pam xorg.libX11 ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ondt ]; platforms = with lib.platforms; linux; }; }