From c574e375890f705a4f6d1fdc36e815594065565f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Jul 2023 20:18:06 +0200 Subject: [PATCH 1/2] duplicity: add empty meta.maintainers, remove default meta.platforms, other cleanup --- pkgs/tools/backup/duplicity/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 216d4dc7da6..15b8a33de67 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , python3 , librsync @@ -11,10 +12,8 @@ , makeWrapper , gettext }: -let - pythonPackages = python3.pkgs; -in -pythonPackages.buildPythonApplication rec { + +python3.pkgs.buildPythonApplication rec { pname = "duplicity"; version = "0.8.23"; @@ -51,14 +50,15 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper gettext - pythonPackages.wrapPython - pythonPackages.setuptools-scm + python3.pkgs.wrapPython + python3.pkgs.setuptools-scm ]; + buildInputs = [ librsync ]; - pythonPath = with pythonPackages; [ + pythonPath = with python3.pkgs; [ b2sdk boto3 cffi @@ -82,7 +82,7 @@ pythonPackages.buildPythonApplication rec { par2cmdline # Add 'par2' to PATH. ] ++ lib.optionals stdenv.isLinux [ util-linux # Add 'setsid' to PATH. - ] ++ (with pythonPackages; [ + ] ++ (with python3.pkgs; [ lockfile mock pexpect @@ -127,6 +127,6 @@ pythonPackages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "https://duplicity.gitlab.io/duplicity-web/"; license = licenses.gpl2Plus; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } From 99c6837a65d2fd240092dbddb019d1731da983dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Jul 2023 20:18:43 +0200 Subject: [PATCH 2/2] cc2538-bsl: remove unused rec --- pkgs/tools/misc/cc2538-bsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/tools/misc/cc2538-bsl/default.nix index 77280835fe0..2fb7fc2030a 100644 --- a/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/pkgs/tools/misc/cc2538-bsl/default.nix @@ -4,7 +4,7 @@ python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; version = "unstable-2022-08-03"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "JelmerT"; repo = pname; rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970";