From f6882726d8f62259668c1090ac3fe461b39c1185 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 15:05:27 -0300 Subject: [PATCH 1/3] luckybackup: libsForQt5.callPackage -> callPackage --- pkgs/tools/backup/luckybackup/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 6fd32a2ceb44..8f51f494b742 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, fetchurl -, pkg-config, libtool, qmake -, rsync, ssh +{ stdenv, lib, fetchurl +, pkg-config, libtool, qt5 +, rsync, openssh }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -12,9 +12,9 @@ mkDerivation rec { sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; }; - buildInputs = [ rsync ssh ]; + buildInputs = [ rsync openssh ]; - nativeBuildInputs = [ pkg-config libtool qmake ]; + nativeBuildInputs = [ pkg-config libtool qt5.qmake qt5.wrapQtAppsHook ]; prePatch = '' for File in luckybackup.pro menu/luckybackup-pkexec \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdc99a11d17..a2d0f76293fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7203,9 +7203,7 @@ with pkgs; evtx = callPackage ../tools/security/evtx { }; - luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { - ssh = openssh; - }; + luckybackup = callPackage ../tools/backup/luckybackup { }; kics = callPackage ../tools/admin/kics { }; From 758ee91317eafeaa1f3bbaf976af04e0efbe866c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 15:36:42 -0300 Subject: [PATCH 2/3] luckybackup: migrate to by-name --- .../default.nix => by-name/lu/luckybackup/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/backup/luckybackup/default.nix => by-name/lu/luckybackup/package.nix} (100%) diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/by-name/lu/luckybackup/package.nix similarity index 100% rename from pkgs/tools/backup/luckybackup/default.nix rename to pkgs/by-name/lu/luckybackup/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2d0f76293fa..d63847c14ac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7203,8 +7203,6 @@ with pkgs; evtx = callPackage ../tools/security/evtx { }; - luckybackup = callPackage ../tools/backup/luckybackup { }; - kics = callPackage ../tools/admin/kics { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; From a689118a3ff401667f3144f260764f5895b8f869 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 27 Sep 2024 16:50:45 -0300 Subject: [PATCH 3/3] luckybackup: refactor - finalAttrs - split outputs - strictDeps - no nested with --- pkgs/by-name/lu/luckybackup/package.nix | 66 ++++++++++++++++++------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix index 8f51f494b742..7fe889178cf7 100644 --- a/pkgs/by-name/lu/luckybackup/package.nix +++ b/pkgs/by-name/lu/luckybackup/package.nix @@ -1,31 +1,59 @@ -{ stdenv, lib, fetchurl -, pkg-config, libtool, qt5 -, rsync, openssh +{ + lib, + fetchurl, + libtool, + openssh, + pkg-config, + qt5, + rsync, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luckybackup"; version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz"; - sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; + url = "mirror://sourceforge/project/luckybackup/${finalAttrs.version}/source/luckybackup-${finalAttrs.version}.tar.gz"; + hash = "sha256-6AGvJIPL3WK8mvji3tJSxRrbrYFILikQQvWOIcPUkls="; }; - buildInputs = [ rsync openssh ]; + outputs = [ + "out" + "doc" + "man" + ]; - nativeBuildInputs = [ pkg-config libtool qt5.qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + libtool + pkg-config + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + rsync + openssh + ]; + + strictDeps = true; prePatch = '' - for File in luckybackup.pro menu/luckybackup-pkexec \ - menu/luckybackup-su.desktop menu/luckybackup.desktop \ - menu/net.luckybackup.su.policy src/functions.cpp \ - src/global.cpp src/scheduleDialog.cpp; do - substituteInPlace $File --replace "/usr" "$out" + for File in \ + luckybackup.pro \ + menu/luckybackup-pkexec \ + menu/luckybackup-su.desktop \ + menu/luckybackup.desktop \ + menu/net.luckybackup.su.policy \ + src/functions.cpp \ + src/global.cpp \ + src/scheduleDialog.cpp; do + substituteInPlace $File --replace "/usr" "$out" done ''; - meta = with lib; { + meta = { + homepage = "https://luckybackup.sourceforge.net/"; description = "Powerful, fast and reliable backup & sync tool"; longDescription = '' luckyBackup is an application for data back-up and synchronization @@ -36,9 +64,9 @@ stdenv.mkDerivation rec { before proceeding in any data manipulation), reliable and fully customizable. ''; - homepage = "https://luckybackup.sourceforge.net/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + mainProgram = "luckybackup"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +})