diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/sync/backintime/common.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/sync/backintime/qt.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/blis/default.nix | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 059716277032e..0a1a1d05dde4a 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 \ @@ -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 diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index bd571b1aed356..1580a51151a2b 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" \ diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 2c9aa745ba12e..c32379f26592d 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" ]; }; } |