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

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

Browse Source 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-20 09:12:42 -07:00
parent 24f13758b9 8aac6d8daf
commit 14f3686af1
120 changed files with 7535 additions and 2303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+24
View File
@@ -1089,6 +1089,8 @@ in {
block-io = callPackage ../development/python-modules/block-io { };
blspy = callPackage ../development/python-modules/blspy { };
bluepy = callPackage ../development/python-modules/bluepy { };
bluepy-devices = callPackage ../development/python-modules/bluepy-devices { };
@@ -1279,6 +1281,8 @@ in {
connect-box = callPackage ../development/python-modules/connect_box { };
coqpit = callPackage ../development/python-modules/coqpit { };
cerberus = callPackage ../development/python-modules/cerberus { };
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
@@ -1343,6 +1347,12 @@ in {
chevron = callPackage ../development/python-modules/chevron { };
chiabip158 = callPackage ../development/python-modules/chiabip158 { };
chiapos = callPackage ../development/python-modules/chiapos { };
chiavdf = callPackage ../development/python-modules/chiavdf { };
chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
ci-info = callPackage ../development/python-modules/ci-info { };
@@ -1351,6 +1361,10 @@ in {
cirq = callPackage ../development/python-modules/cirq { };
cirq-core = callPackage ../development/python-modules/cirq-core { };
cirq-google = callPackage ../development/python-modules/cirq-google { };
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
@@ -1437,6 +1451,12 @@ in {
clustershell = callPackage ../development/python-modules/clustershell { };
clvm = callPackage ../development/python-modules/clvm { };
clvm-rs = callPackage ../development/python-modules/clvm-rs { };
clvm-tools = callPackage ../development/python-modules/clvm-tools { };
cma = callPackage ../development/python-modules/cma { };
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
@@ -1503,6 +1523,8 @@ in {
compiledb = callPackage ../development/python-modules/compiledb { };
concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { };
conda = callPackage ../development/python-modules/conda { };
ConfigArgParse = self.configargparse; # added 2021-03-18
@@ -3663,6 +3685,8 @@ in {
keyring = callPackage ../development/python-modules/keyring { };
keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };
keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };
keystone-engine = callPackage ../development/python-modules/keystone-engine { };