Unverified Commit 9a1d9718 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

backintime: 1.3.3 -> 1.4.3
parents 5e626f8e c83cb418

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -18858,6 +18858,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";

pkgs/applications/networking/sync/backintime/common.nix

+5 −3
Original line number Diff line number Diff line
@@ -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 \
@@ -41,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

pkgs/applications/networking/sync/backintime/qt.nix

+3 −4
Original line number Diff line number Diff line
@@ -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" \

pkgs/development/libraries/science/math/blis/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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" ];

  };

}