From 1ae92677d7e8b6ec2ff56f0cec7a03b493c6e228 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 1 Apr 2024 12:44:34 -0400 Subject: [PATCH 1/3] backintime: 1.3.3 -> 1.4.3 --- pkgs/applications/networking/sync/backintime/common.nix | 6 ++++-- pkgs/applications/networking/sync/backintime/qt.nix | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 059716277032..b3656ee6afc0 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.3"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; + sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; }; nativeBuildInputs = [ makeWrapper gettext ]; @@ -21,6 +21,8 @@ in stdenv.mkDerivation rec { installFlags = [ "DEST=$(out)" ]; + configureFlags = [ "--python=${lib.getExe python'}" ]; + preConfigure = '' cd common substituteInPlace configure \ diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index bd571b1aed35..1580a51151a2 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -11,11 +11,11 @@ mkDerivation { buildInputs = [ python' backintime-common ]; + configureFlags = [ "--python=${lib.getExe python'}" ]; + preConfigure = '' cd qt - substituteInPlace configure \ - --replace '"/../etc' '"/etc' - substituteInPlace qttools.py \ + substituteInPlace qttools_path.py \ --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' ''; @@ -37,7 +37,6 @@ mkDerivation { --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ - --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ --replace "/usr/share/backintime" "$out/share/backintime" substituteInPlace "$out/bin/backintime-qt_polkit" \ From 61585fa9ec125adbc5260ffe6273225205911186 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 1 Apr 2024 12:59:04 -0400 Subject: [PATCH 2/3] maintainers: add stephen-huan --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b328568e5b6a..1e2801c065a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18782,6 +18782,15 @@ githubId = 89950; name = "Stéphan Kochen"; }; + stephen-huan = { + name = "Stephen Huan"; + email = "stephen.huan@cgdct.moe"; + github = "stephen-huan"; + githubId = 20411956; + keys = [{ + fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; + }]; + }; stephenmw = { email = "stephen@q5comm.com"; github = "stephenmw"; From c83cb418a87f7c024b20ee4d9b381cce6c31054a Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 1 Apr 2024 13:14:06 -0400 Subject: [PATCH 3/3] treewide: add stephen-huan as maintainer --- pkgs/applications/networking/sync/backintime/common.nix | 2 +- pkgs/development/libraries/science/math/blis/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index b3656ee6afc0..0a1a1d05dde4 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; license = lib.licenses.gpl2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ stephen-huan ]; platforms = lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 2c9aa745ba12..c32379f26592 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible linear algebra library"; homepage = "https://github.com/flame/blis"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ stephen-huan ]; platforms = [ "x86_64-linux" ]; }; }