Merge pull request #300742 from stephen-huan/backintime-1.4.3

backintime: 1.3.3 -> 1.4.3

authored by Peder Bergebakken Sundt and committed by GitHub 9a1d9718 5e626f8e

+18 -8
+9
maintainers/maintainer-list.nix
··· 18858 githubId = 89950; 18859 name = "Stéphan Kochen"; 18860 }; 18861 stephenmw = { 18862 email = "stephen@q5comm.com"; 18863 github = "stephenmw";
··· 18858 githubId = 89950; 18859 name = "Stéphan Kochen"; 18860 }; 18861 + stephen-huan = { 18862 + name = "Stephen Huan"; 18863 + email = "stephen.huan@cgdct.moe"; 18864 + github = "stephen-huan"; 18865 + githubId = 20411956; 18866 + keys = [{ 18867 + fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; 18868 + }]; 18869 + }; 18870 stephenmw = { 18871 email = "stephen@q5comm.com"; 18872 github = "stephenmw";
+5 -3
pkgs/applications/networking/sync/backintime/common.nix
··· 7 apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; 8 in stdenv.mkDerivation rec { 9 pname = "backintime-common"; 10 - version = "1.3.3"; 11 12 src = fetchFromGitHub { 13 owner = "bit-team"; 14 repo = "backintime"; 15 rev = "v${version}"; 16 - sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; 17 }; 18 19 nativeBuildInputs = [ makeWrapper gettext ]; 20 buildInputs = [ python' ]; 21 22 installFlags = [ "DEST=$(out)" ]; 23 24 preConfigure = '' 25 cd common ··· 41 homepage = "https://github.com/bit-team/backintime"; 42 description = "Simple backup tool for Linux"; 43 license = lib.licenses.gpl2; 44 - maintainers = [ ]; 45 platforms = lib.platforms.all; 46 longDescription = '' 47 Back In Time is a simple backup tool (on top of rsync) for Linux
··· 7 apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; 8 in stdenv.mkDerivation rec { 9 pname = "backintime-common"; 10 + version = "1.4.3"; 11 12 src = fetchFromGitHub { 13 owner = "bit-team"; 14 repo = "backintime"; 15 rev = "v${version}"; 16 + sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; 17 }; 18 19 nativeBuildInputs = [ makeWrapper gettext ]; 20 buildInputs = [ python' ]; 21 22 installFlags = [ "DEST=$(out)" ]; 23 + 24 + configureFlags = [ "--python=${lib.getExe python'}" ]; 25 26 preConfigure = '' 27 cd common ··· 43 homepage = "https://github.com/bit-team/backintime"; 44 description = "Simple backup tool for Linux"; 45 license = lib.licenses.gpl2; 46 + maintainers = with lib.maintainers; [ stephen-huan ]; 47 platforms = lib.platforms.all; 48 longDescription = '' 49 Back In Time is a simple backup tool (on top of rsync) for Linux
+3 -4
pkgs/applications/networking/sync/backintime/qt.nix
··· 11 12 buildInputs = [ python' backintime-common ]; 13 14 preConfigure = '' 15 cd qt 16 - substituteInPlace configure \ 17 - --replace '"/../etc' '"/etc' 18 - substituteInPlace qttools.py \ 19 --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' 20 ''; 21 ··· 37 --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" 38 39 substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ 40 - --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ 41 --replace "/usr/share/backintime" "$out/share/backintime" 42 43 substituteInPlace "$out/bin/backintime-qt_polkit" \
··· 11 12 buildInputs = [ python' backintime-common ]; 13 14 + configureFlags = [ "--python=${lib.getExe python'}" ]; 15 + 16 preConfigure = '' 17 cd qt 18 + substituteInPlace qttools_path.py \ 19 --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' 20 ''; 21 ··· 37 --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" 38 39 substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ 40 --replace "/usr/share/backintime" "$out/share/backintime" 41 42 substituteInPlace "$out/bin/backintime-qt_polkit" \
+1 -1
pkgs/development/libraries/science/math/blis/default.nix
··· 58 description = "BLAS-compatible linear algebra library"; 59 homepage = "https://github.com/flame/blis"; 60 license = licenses.bsd3; 61 - maintainers = [ ]; 62 platforms = [ "x86_64-linux" ]; 63 }; 64 }
··· 58 description = "BLAS-compatible linear algebra library"; 59 homepage = "https://github.com/flame/blis"; 60 license = licenses.bsd3; 61 + maintainers = with maintainers; [ stephen-huan ]; 62 platforms = [ "x86_64-linux" ]; 63 }; 64 }