3
0
Fork 0
forked from mirrors/nixpkgs

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-21 00:01:40 +00:00 committed by GitHub
commit bf4c9d6b39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 216 additions and 78 deletions

View file

@ -1853,6 +1853,12 @@
githubId = 1762540;
name = "Changlin Li";
};
chanley = {
email = "charlieshanley@gmail.com";
github = "charlieshanley";
githubId = 8228888;
name = "Charlie Hanley";
};
CharlesHD = {
email = "charleshdespointes@gmail.com";
github = "CharlesHD";
@ -9862,12 +9868,6 @@
githubId = 11613056;
name = "Scott Dier";
};
sdll = {
email = "sasha.delly@gmail.com";
github = "sdll";
githubId = 17913919;
name = "Sasha Illarionov";
};
SeanZicari = {
email = "sean.zicari@gmail.com";
github = "SeanZicari";

View file

@ -17,11 +17,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "particl-core";
version = "0.19.2.5";
version = "0.19.2.13";
src = fetchurl {
url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
sha256 = "sha256-uI4T8h6RvCikk8h/sZmGlj3Uj3Xhu0vDn/fPb6rLcSg=";
sha256 = "sha256-eXlTfSjxOGZi/0/b7myqILJZYNcbK+QqQmq+PVkh1e8=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View file

@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "ulauncher";
version = "5.11.0";
version = "5.12.1";
disabled = python3Packages.isPy27;
src = fetchurl {
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
sha256 = "sha256-xEM7sG0NRWouDu6NxNA94WTycykEhPI4ByjDk2yjHjo=";
sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ=";
};
nativeBuildInputs = with python3Packages; [

View file

@ -24,13 +24,13 @@
}:
buildPythonApplication rec {
pname = "visidata";
version = "2.5";
version = "2.6";
src = fetchFromGitHub {
owner = "saulpw";
repo = "visidata";
rev = "v${version}";
sha256 = "1iijggdgj36v7d2zm45c00nrbzxaaah2azflpca0f6fjaaxh3lr2";
sha256 = "sha256-fsk+Cn7CzrOAif5+LUMrs8llSnEfoSLAdg1qOFMJOh8=";
};
propagatedBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.140.0";
version = "0.140.1";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU=";
sha256 = "sha256-QnGu/EGzgWva/EA6gKrDzWgjX6OrfZKzWIhRqKbexjU=";
};
vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8=";
vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4=";
doCheck = false;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }:
stdenv.mkDerivation rec {
pname = "libebml";
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";
};
patches = [
# Upstream fix for gcc-11
(fetchpatch {
url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch";
sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl";
excludes = [ "ChangeLog" ];
})
];
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [

View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "amcrest";
version = "1.9.2";
version = "1.9.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tchellomello";
repo = "python-amcrest";
rev = version;
sha256 = "sha256-xBrXe3BUvLfSk7zBHVJLh/K3lGVkFKOCq0RNAOb9GqI=";
sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7";
};
propagatedBuildInputs = [

View file

@ -17,7 +17,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
cython
cython
];
prePatch = ''
@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Cython memory pool for RAII-style memory management";
homepage = "https://github.com/explosion/cymem";
license = licenses.mit;
maintainers = with maintainers; [ sdll ];
};
maintainers = with maintainers; [ ];
};
}

View file

@ -1,26 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-mock
, pytest-vcr
, pytestCheckHook
, pythonOlder
, requests
, tornado
, poetry-core
, pytestCheckHook
, pytest-cov
, pytest-vcr
}:
buildPythonPackage rec {
pname = "deezer-python";
version = "2.3.0";
disabled = pythonOlder "3.6";
version = "2.3.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ=";
sha256 = "sha256-0gkPwIz+nZJjxfucy71D0A5CFkhQaW32UH5t1DkuvEs=";
};
nativeBuildInputs = [
@ -29,8 +30,8 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
pytest-cov
pytest-vcr
pytest-mock
];
propagatedBuildInputs = [
@ -38,6 +39,13 @@ buildPythonPackage rec {
tornado
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=deezer" ""
'';
pythonImportsCheck = [ "deezer" ];
meta = with lib; {
description = "A friendly Python wrapper around the Deezer API";
homepage = "https://github.com/browniebroke/deezer-python";

View file

@ -8,17 +8,18 @@
, pillow
, pytestCheckHook
, python-dateutil
, voluptuous
}:
buildPythonPackage rec {
pname = "env-canada";
version = "0.5.1";
version = "0.5.12";
src = fetchFromGitHub {
owner = "michaeldavie";
repo = "env_canada";
rev = "v${version}";
sha256 = "sha256-tafhOW1wd/D0ojRUdDzp62cQ8w7wgx5ITcWAcoY1i5Y=";
sha256 = "sha256-yrvH0A/+QA9HiKa/ohw5q0IIyWff9s9zu6tT08mIT7w=";
};
propagatedBuildInputs = [
@ -28,6 +29,7 @@ buildPythonPackage rec {
lxml
pillow
python-dateutil
voluptuous
];
checkInputs = [

View file

@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Given Unicode text, make its representation consistent and possibly less broken";
homepage = "https://github.com/LuminosoInsight/python-ftfy";
license = licenses.mit;
maintainers = with maintainers; [ sdll aborsu ];
maintainers = with maintainers; [ aborsu ];
};
}

View file

@ -32,6 +32,6 @@ buildPythonPackage rec {
description = "Cython bindings for MurmurHash2";
homepage = "https://github.com/explosion/murmurhash";
license = licenses.mit;
maintainers = with maintainers; [ aborsu sdll ];
maintainers = with maintainers; [ aborsu ];
};
}

View file

@ -13,14 +13,14 @@ buildPythonPackage rec {
};
checkPhase = ''
cd doc
${python.interpreter} -m unittest discover -p "*test_plac*"
'';
cd doc
${python.interpreter} -m unittest discover -p "*test_plac*"
'';
meta = with lib; {
description = "Parsing the Command Line the Easy Way";
homepage = "https://github.com/micheles/plac";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ sdll ];
};
maintainers = with maintainers; [ ];
};
}

View file

@ -17,9 +17,9 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
cython
cymem
murmurhash
cython
cymem
murmurhash
];
checkInputs = [
@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Cython hash tables that assume keys are pre-hashed";
homepage = "https://github.com/explosion/preshed";
license = licenses.mit;
maintainers = with maintainers; [ sdll ];
};
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,47 @@
{ lib, isPy3k, buildPythonPackage, fetchFromGitHub, fetchpatch, zope_interface, twisted }:
buildPythonPackage rec {
pname = "python3-application";
version = "3.0.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "AGProjects";
repo = pname;
rev = version;
sha256 = "sha256-oscUI/Ag/UXmAi/LN1pPTdyqQe9aAfeQzhKFxaTmW3A=";
};
patches = [
# Apply bugfix commit that is not yet part of a release
(fetchpatch {
name = "fix-time-import.patch";
url = "https://github.com/AGProjects/${pname}/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch";
sha256 = "sha256-MGs8uUIFXkPXStOn5oCNNEMVmcKrq8YPl8Xvl3OTOUM=";
})
];
propagatedBuildInputs = [ zope_interface twisted ];
pythonImportsCheck = [ "application" ];
meta = with lib; {
description = "A collection of modules that are useful when building python applications";
homepage = "https://github.com/AGProjects/python3-application";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ chanley ];
longDescription = ''
This package is a collection of modules that are useful when building python applications. Their purpose is to eliminate the need to divert resources into implementing the small tasks that every application needs to do in order to run successfully and focus instead on the application logic itself.
The modules that the application package provides are:
1. process - UNIX process and signal management.
2. python - python utility classes and functions.
3. configuration - a simple interface to handle configuration files.
4. log - an extensible system logger for console and syslog.
5. debug - memory troubleshooting and execution timing.
6. system - interaction with the underlying operating system.
7. notification - an application wide notification system.
8. version - manage version numbers for applications and packages.
'';
};
}

View file

@ -0,0 +1,34 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope_interface, twisted, greenlet }:
buildPythonPackage rec {
pname = "python3-eventlib";
version = "0.3.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "AGProjects";
repo = "python3-eventlib";
rev = version;
sha256 = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
};
propagatedBuildInputs = [ zope_interface twisted greenlet ];
dontUseSetuptoolsCheck = true;
pythonImportsCheck = [ "eventlib" ];
meta = with lib; {
description = "A networking library written in Python";
homepage = "https://github.com/AGProjects/python3-eventlib";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ chanley ];
longDescription = ''
Eventlib is a networking library written in Python. It achieves high
scalability by using non-blocking I/O while at the same time retaining
high programmer usability by using coroutines to make the non-blocking io
operations appear blocking at the source code level.
'';
};
}

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.25.1";
version = "2.26.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4k4973sNCqE2JbyT901HAijlyymFAR4hJp7NavqlzCQ=";
sha256 = "sha256-fXDBozMZbvMkdqafvPQrCI26OjQ/2Rx6OMQs9X2Q55s=";
};
checkInputs = [ pytestCheckHook ];

View file

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.11.0";
version = "3.11.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "0zwz36mpc7syrkslf1rf7c6sxfanw87mbr2758j01sph50m43g6m";
sha256 = "sha256-csWVzQZAujCLzfLJkUOSHwJZMRqC5GcU4s4kce15qms=";
};
propagatedBuildInputs = [

View file

@ -78,6 +78,6 @@ buildPythonPackage rec {
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
homepage = "https://github.com/explosion/spaCy";
license = licenses.mit;
maintainers = with maintainers; [ sdll ];
maintainers = with maintainers; [ ];
};
}

View file

@ -78,6 +78,6 @@ buildPythonPackage rec {
description = "Practical Machine Learning for NLP in Python";
homepage = "https://github.com/explosion/thinc";
license = licenses.mit;
maintainers = with maintainers; [ aborsu sdll ];
maintainers = with maintainers; [ aborsu ];
};
}

View file

@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.32.1";
version = "3.32.3";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "sha256-bwxxjpIBVzFfjewUwDjFNN9zcaL3ihYjWOlWdrhf1o0=";
sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A=";
};
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";

View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "fundoc";
version = "0.4.1";
src = fetchFromGitHub {
owner = "csssr";
repo = pname;
rev = "v${version}";
sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v";
};
cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE=";
meta = with lib; {
description = "Language agnostic documentation generator";
homepage = "https://github.com/csssr/fundoc";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "automysqlbackup";
version = "3.0.6";
version = "3.0.7";
src = fetchFromGitHub {
owner = "sixhop";
repo = pname;
rev = version;
sha256 = "0lki2049npc38r8m08garymywp1rzgflm0mxsfdznn9jfp4pk2lp";
sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchpatch
{ stdenv, lib
, pkg-config, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
, sqlite, zstd
@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "rpm";
version = "4.16.1.3";
version = "4.17.0";
src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai";
sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a";
};
outputs = [ "out" "dev" "man" ];
@ -36,22 +36,6 @@ stdenv.mkDerivation rec {
"--sharedstatedir=/com"
];
patches = [
# Small fixes for ndb on darwin
# https://github.com/rpm-software-management/rpm/pull/1465
(fetchpatch {
name = "darwin-support.patch";
url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch";
sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171";
})
# Fix build on aarch64-darwin
# https://github.com/rpm-software-management/rpm/pull/1775
(fetchpatch {
url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch";
sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar";
})
];
postPatch = ''
substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
'';

View file

@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
# glibc 2.33 patches from ArchLinux
(fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch";
sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68=";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch";
sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k=";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch";
sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8=";
})
]

View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchCrate }:
rustPlatform.buildRustPackage rec {
pname = "rust-petname";
version = "1.1.1";
src = fetchCrate {
inherit version;
crateName = "petname";
sha256 = "sha256-X1p9W+N0Nhh7CSh776ofzHmG0ayi5COLJjBncxmL8CM=";
};
cargoSha256 = "sha256-jxN2EKLjf9yKkhZ4wsH72sNdk6UYAcCUrg4+qx75bWs=";
meta = with lib; {
description = "Generate human readable random names";
homepage = "https://github.com/allenap/rust-petname";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
mainProgram = "petname";
};
}

View file

@ -2,20 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "tv";
version = "0.5.3";
version = "0.6.0";
src = fetchFromGitHub {
owner = "uzimaru0000";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mh/+MX0MZM1fsi9HGTioRRH1DVatmkdyiwAgG/42cVU=";
sha256 = "sha256-4PcD0keG3OVZPv6MA+rNSL9lysrseJUA6C5cd2f6LRY=";
};
cargoSha256 = "sha256-8uxW0EIeMPvgffYW55Ov1euoVi8Zz9fZ4F44ktxvj9Q=";
cargoSha256 = "sha256-E4qMxCqgJYIA8E6A0d8iUYTbKif5T51zcFdc+Ptq7qc=";
meta = with lib; {
description = "Format json into table view";
homepage = "https://github.com/uzimaru0000/tv";
changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};

View file

@ -8764,6 +8764,7 @@ with pkgs;
rpm = callPackage ../tools/package-management/rpm {
python = python3;
lua = lua5_4;
};
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
@ -8812,6 +8813,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
rust-petname = callPackage ../tools/text/rust-petname { };
rustscan = callPackage ../tools/security/rustscan {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -14009,6 +14012,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
fundoc = callPackage ../development/tools/fundoc { };
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
gede = libsForQt5.callPackage ../development/tools/misc/gede { };

View file

@ -7150,6 +7150,10 @@ in {
pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };
python3-application = callPackage ../development/python-modules/python3-application { };
python3-eventlib = callPackage ../development/python-modules/python3-eventlib { };
python3-openid = callPackage ../development/python-modules/python3-openid { };
python-awair = callPackage ../development/python-modules/python-awair { };