public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nixpkgs/master' into staging-next

Browse Source 
Conflicts:
	pkgs/top-level/python-packages.nix
This commit is contained in:
Alyssa Ross
2021-04-23 21:18:11 +00:00
parent f52d4a72bc 8d0340aee5
commit 0d0e7ca769
27 changed files with 1064 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+50
View File
@@ -923,6 +923,8 @@ in {
bacpypes = callPackage ../development/python-modules/bacpypes { };
banal = callPackage ../development/python-modules/banal { };
bandit = callPackage ../development/python-modules/bandit { };
bap = callPackage ../development/python-modules/bap {
@@ -1463,6 +1465,8 @@ in {
commandparse = callPackage ../development/python-modules/commandparse { };
commoncode = callPackage ../development/python-modules/commoncode { };
CommonMark = callPackage ../development/python-modules/commonmark { };
compiledb = callPackage ../development/python-modules/compiledb { };
@@ -1707,6 +1711,8 @@ in {
debian = callPackage ../development/python-modules/debian { };
debian-inspector = callPackage ../development/python-modules/debian-inspector { };
debts = callPackage ../development/python-modules/debts { };
debugpy = callPackage ../development/python-modules/debugpy { };
@@ -2209,6 +2215,24 @@ in {
exrex = callPackage ../development/python-modules/exrex { };
extractcode = callPackage ../development/python-modules/extractcode { };
extractcode-7z = callPackage ../development/python-modules/extractcode/7z.nix {
inherit (pkgs) p7zip;
};
extractcode-libarchive = callPackage ../development/python-modules/extractcode/libarchive.nix {
inherit (pkgs)
libarchive
libb2
bzip2
expat
lz4
lzma
zlib
zstd;
};
extras = callPackage ../development/python-modules/extras { };
eyeD3 = callPackage ../development/python-modules/eyed3 { };
@@ -2311,6 +2335,8 @@ in {
finalfusion = callPackage ../development/python-modules/finalfusion { };
fingerprints = callPackage ../development/python-modules/fingerprints { };
fints = callPackage ../development/python-modules/fints { };
fiona = callPackage ../development/python-modules/fiona { };
@@ -2576,6 +2602,8 @@ in {
geeknote = callPackage ../development/python-modules/geeknote { };
gemfileparser = callPackage ../development/python-modules/gemfileparser { };
genanki = callPackage ../development/python-modules/genanki { };
genome-collector = callPackage ../development/python-modules/genome-collector { };
@@ -3230,6 +3258,8 @@ in {
intake = callPackage ../development/python-modules/intake { };
intbitset = callPackage ../development/python-modules/intbitset { };
intelhex = callPackage ../development/python-modules/intelhex { };
internetarchive = callPackage ../development/python-modules/internetarchive { };
@@ -4425,6 +4455,8 @@ in {
noiseprotocol = callPackage ../development/python-modules/noiseprotocol { };
normality = callPackage ../development/python-modules/normality { };
nose2 = callPackage ../development/python-modules/nose2 { };
nose = callPackage ../development/python-modules/nose { };
@@ -4962,6 +4994,8 @@ in {
pluggy = callPackage ../development/python-modules/pluggy { };
plugincode = callPackage ../development/python-modules/plugincode { };
pluginbase = callPackage ../development/python-modules/pluginbase { };
plugnplay = callPackage ../development/python-modules/plugnplay { };
@@ -5667,6 +5701,8 @@ in {
pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
pymaven-patch = callPackage ../development/python-modules/pymaven-patch { };
pymavlink = callPackage ../development/python-modules/pymavlink { };
pymazda = callPackage ../development/python-modules/pymazda { };
@@ -7109,6 +7145,8 @@ in {
inherit (pkgs) sane-backends;
};
saneyaml = callPackage ../development/python-modules/saneyaml { };
sampledata = callPackage ../development/python-modules/sampledata { };
samplerate = callPackage ../development/python-modules/samplerate { };
@@ -7129,6 +7167,8 @@ in {
scales = callPackage ../development/python-modules/scales { };
scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { };
scapy = callPackage ../development/python-modules/scapy { };
schedule = callPackage ../development/python-modules/schedule { };
@@ -7487,6 +7527,8 @@ in {
sparse = callPackage ../development/python-modules/sparse { };
spdx-tools = callPackage ../development/python-modules/spdx-tools { };
speaklater = callPackage ../development/python-modules/speaklater { };
spectral-cube = callPackage ../development/python-modules/spectral-cube { };
@@ -8118,6 +8160,12 @@ in {
txtorcon = callPackage ../development/python-modules/txtorcon { };
typecode = callPackage ../development/python-modules/typecode { };
typecode-libmagic = callPackage ../development/python-modules/typecode/libmagic.nix {
inherit (pkgs) file zlib;
};
typed-ast = callPackage ../development/python-modules/typed-ast { };
typeguard = callPackage ../development/python-modules/typeguard { };
@@ -8238,6 +8286,8 @@ in {
pytestCheckHook = self.pytestCheckHook_6_1;
};
urlpy = callPackage ../development/python-modules/urlpy { };
urwid = callPackage ../development/python-modules/urwid { };
urwidtrees = callPackage ../development/python-modules/urwidtrees { };