Merge pull request #244201 from SuperSandro2000/python-cleanup

duplicity: add empty meta.maintainers, cc2538-bsl: remove unused rec
This commit is contained in:
Weijia Wang 2023-09-08 00:09:21 +02:00 committed by GitHub
commit d824744618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions

View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitLab , fetchFromGitLab
, python3 , python3
, librsync , librsync
@ -11,10 +12,8 @@
, makeWrapper , makeWrapper
, gettext , gettext
}: }:
let
pythonPackages = python3.pkgs; python3.pkgs.buildPythonApplication rec {
in
pythonPackages.buildPythonApplication rec {
pname = "duplicity"; pname = "duplicity";
version = "0.8.23"; version = "0.8.23";
@ -51,14 +50,15 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
gettext gettext
pythonPackages.wrapPython python3.pkgs.wrapPython
pythonPackages.setuptools-scm python3.pkgs.setuptools-scm
]; ];
buildInputs = [ buildInputs = [
librsync librsync
]; ];
pythonPath = with pythonPackages; [ pythonPath = with python3.pkgs; [
b2sdk b2sdk
boto3 boto3
cffi cffi
@ -82,7 +82,7 @@ pythonPackages.buildPythonApplication rec {
par2cmdline # Add 'par2' to PATH. par2cmdline # Add 'par2' to PATH.
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
util-linux # Add 'setsid' to PATH. util-linux # Add 'setsid' to PATH.
] ++ (with pythonPackages; [ ] ++ (with python3.pkgs; [
lockfile lockfile
mock mock
pexpect pexpect
@ -127,6 +127,6 @@ pythonPackages.buildPythonApplication rec {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
homepage = "https://duplicity.gitlab.io/duplicity-web/"; homepage = "https://duplicity.gitlab.io/duplicity-web/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -5,7 +5,7 @@ python3Packages.buildPythonPackage rec {
version = "unstable-2022-08-03"; version = "unstable-2022-08-03";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub rec { src = fetchFromGitHub {
owner = "JelmerT"; owner = "JelmerT";
repo = pname; repo = pname;
rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970";