diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index fa722747e5f..e77fc5a522a 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,20 +1,16 @@ -{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages }: +{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: stdenv.mkDerivation rec { - version = "1.0.36"; + version = "1.1.0"; name = "backintime-common-${version}"; src = fetchurl { - url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz"; - md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8"; + url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz"; + md5 = "21e15538c38d0c440c1281457319c7f1"; }; - # because upstream tarball has no top-level directory. - # https://bugs.launchpad.net/backintime/+bug/1359076 - sourceRoot = "."; - - buildInputs = [ makeWrapper gettext python2 python2Packages.dbus ]; + buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ]; installFlags = [ "DEST=$(out)" ]; @@ -43,4 +39,4 @@ stdenv.mkDerivation rec { done by taking snapshots of a specified set of directories. ''; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/sync/backintime/gnome.nix b/pkgs/applications/networking/sync/backintime/gnome.nix deleted file mode 100644 index 56d0f6c5481..00000000000 --- a/pkgs/applications/networking/sync/backintime/gnome.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool, backintime-common }: - -stdenv.mkDerivation rec { - inherit (backintime-common) version src sourceRoot installFlags meta; - - name = "backintime-gnome-${version}"; - - buildInputs = [ makeWrapper gettext python2 python2Packages.dbus backintime-common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ]; - - preConfigure = "cd gnome"; - configureFlags = [ "--no-check" ]; - - preFixup = - '' - # Make sure all Python files refer to $prefix/share/backintime - # instead of config.get_app_path() which returns the path of the - # 'common' module, not the path of the 'gnome' module. - filelist=$(mktemp) - find "$out/share/backintime/gnome" -name "*.py" -print0 > $filelist - while IFS="" read -r -d "" file <&9; do - substituteInPlace "$file" \ - --replace "glade_file = os.path.join(config.get_app_path()," \ - "glade_file = os.path.join('$prefix/share/backintime'," \ - --replace "glade_file = os.path.join(self.config.get_app_path()," \ - "glade_file = os.path.join('$prefix/share/backintime'," - done 9< "$filelist" - rm "$filelist" - - substituteInPlace "$out/bin/backintime-gnome" \ - --replace "=\"/usr/share" "=\"$prefix/share" - - wrapProgram "$out/bin/backintime-gnome" \ - --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${backintime-common}/share/backintime/common:$PYTHONPATH" \ - --prefix PATH : "${backintime-common}/bin:$PATH" - ''; - -} diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix new file mode 100644 index 00000000000..67d521d272a --- /dev/null +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: + +stdenv.mkDerivation rec { + inherit (backintime-common) version src installFlags meta; + + name = "backintime-gnome-${version}"; + + buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; + + preConfigure = "cd qt4"; + configureFlags = [ ]; + + dontAddPrefix = true; + + preFixup = + '' + substituteInPlace "$out/bin/backintime-qt4" \ + --replace "=\"/usr/share" "=\"$prefix/share" + + wrapProgram "$out/bin/backintime-qt4" \ + --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \ + --prefix PATH : "${backintime-common}/bin:$PATH" + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66dba26f70c..3e6bcb2a982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9279,9 +9279,9 @@ let backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { }; + backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; - backintime = backintime-gnome; + backintime = backintime-qt4; bar = callPackage ../applications/window-managers/bar { };