Unverified Commit 91481d86 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

deja-dup: 48.4 ->49.2 (#461581)

parents 495a8970 d8d1b59e

pkgs/by-name/de/deja-dup/fix-paths.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
--- a/libdeja/duplicity/DuplicityInstance.vala

+++ b/libdeja/duplicity/DuplicityInstance.vala

@@ -114,8 +114,8 @@ internal class DuplicityInstance : Object

     // We already are pretty sure we don't have other duplicities in our

     // archive directories, because we use our own and we ensure we only have

     // one deja-dup running at a time via DBus.

     var lockfile_glob = Shell.quote(cache_dir) + "/*/lockfile.lock";

-    if (Posix.system("/bin/rm -f " + lockfile_glob) != 0)

+    if (Posix.system("@coreutils@/bin/rm -f " + lockfile_glob) != 0)

       warning("Could not delete '%s'", lockfile_glob);

 

     Process.spawn_async_with_pipes(null, real_argv, real_envp,

                         SpawnFlags.SEARCH_PATH |

pkgs/by-name/de/deja-dup/package.nix

+21 −22
Original line number Diff line number Diff line
@@ -2,25 +2,26 @@ 
  lib,

  stdenv,

  fetchFromGitLab,

  replaceVars,

  meson,

  ninja,

  pkg-config,

  vala,

  gettext,

  itstool,

  blueprint-compiler,

  desktop-file-utils,

  glib,

  glib-networking,

  gtk4,

  coreutils,

  libsoup_3,

  libsecret,

  libadwaita,

  wrapGAppsHook4,

  libgpg-error,

  json-glib,

  borgbackup,

  duplicity,

  fuse,

  rclone,

  restic,

  nix-update-script,
@@ -28,22 +29,16 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "deja-dup";

  version = "48.4";

  version = "49.2";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = "deja-dup";

    rev = finalAttrs.version;

    hash = "sha256-hFmuJqUHBMSsQW+a9GjI82wNOQjHt5f3rEkGUxYA6Y0=";

    tag = finalAttrs.version;

    hash = "sha256-yH4XX1MwPxTmKh6p27pYQBQDyeGIT+Ed9E0Y508EF7s=";

  };



  patches = [

    (replaceVars ./fix-paths.patch {

      inherit coreutils;

    })

  ];



  nativeBuildInputs = [

    meson

    ninja
@@ -51,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
    vala

    gettext

    itstool

    blueprint-compiler

    desktop-file-utils

    wrapGAppsHook4

  ];
@@ -67,10 +63,13 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  mesonFlags = [

    "-Dduplicity_command=${lib.getExe duplicity}"

    "-Drclone_command=${lib.getExe rclone}"

    "-Denable_restic=true"

    "-Drestic_command=${lib.getExe restic}"

    # Check https://gitlab.gnome.org/World/deja-dup/-/blob/main/meson.options

    (lib.mesonOption "borg_command" (lib.getExe borgbackup))

    (lib.mesonOption "duplicity_command" (lib.getExe duplicity))

    (lib.mesonOption "fusermount_command" (lib.getExe' fuse "fusermount"))

    (lib.mesonOption "rclone_command" (lib.getExe rclone))

    (lib.mesonOption "restic_command" (lib.getExe restic))

    (lib.mesonEnable "packagekit" false) # packagekit-glib not packaged

  ];



  preFixup = ''
@@ -84,19 +83,19 @@ stdenv.mkDerivation (finalAttrs: { 
    updateScript = nix-update-script { };

  };



  meta = with lib; {

  meta = {

    description = "Simple backup tool";

    longDescription = ''

      Déjà Dup is a simple backup tool. It hides the complexity \

      of backing up the Right Way (encrypted, off-site, and regular) \

      Déjà Dup is a simple backup tool. It hides the complexity

      of backing up the Right Way (encrypted, off-site, and regular)

      and uses duplicity as the backend.

    '';

    homepage = "https://apps.gnome.org/DejaDup/";

    changelog = "https://gitlab.gnome.org/World/deja-dup/-/releases/${finalAttrs.version}";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ jtojnar ];

    teams = [ teams.gnome-circle ];

    platforms = platforms.linux;

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ jtojnar ];

    teams = [ lib.teams.gnome-circle ];

    platforms = lib.platforms.linux;

    mainProgram = "deja-dup";

  };

})