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/aliases.nix
+1
View File
@@ -642,6 +642,7 @@ mapAliases ({
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22
retroshare = throw "retroshare was removed because it was broken"; # added 2021-05-17
rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream.";
rng_tools = rng-tools; # added 2018-10-24
robomongo = robo3t; #added 2017-09-28
pkgs/top-level/all-packages.nix
+16 -9
View File
@@ -295,6 +295,8 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
};
mix2nix = callPackage ../development/tools/mix2nix/default.nix { };
proto-contrib = callPackage ../development/tools/proto-contrib {};
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
@@ -2326,6 +2328,8 @@ in
ddate = callPackage ../tools/misc/ddate { };
dduper = callPackage ../tools/filesystems/dduper { };
dedup = callPackage ../tools/backup/dedup { };
dehydrated = callPackage ../tools/admin/dehydrated { };
@@ -3268,7 +3272,9 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
bacon = callPackage ../development/tools/bacon { };
bacon = callPackage ../development/tools/bacon {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
bareos = callPackage ../tools/backup/bareos { };
@@ -6345,10 +6351,6 @@ in
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {
enableNpm = false;
};
nodejs-15_x = callPackage ../development/web/nodejs/v15.nix { };
nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix {
enableNpm = false;
};
nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { };
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
@@ -14823,6 +14825,8 @@ in
givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {};
ghp-import = with python3Packages; toPythonApplication ghp-import;
ghcid = haskellPackages.ghcid.bin;
@@ -19222,6 +19226,7 @@ in
opensmtpd = callPackage ../servers/mail/opensmtpd { };
opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
openxpki = callPackage ../servers/openxpki { };
@@ -20489,6 +20494,8 @@ in
gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { };
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null;
@@ -26113,10 +26120,6 @@ in
remotebox = callPackage ../applications/virtualization/remotebox { };
# This package is currently broken with libupnp
# But when unbroken, it should work with the stable Qt5
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
rgp = libsForQt5.callPackage ../development/tools/rgp { };
ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { };
@@ -27209,6 +27212,8 @@ in
write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
wlc = callPackage ../tools/misc/wlc { };
wllvm = callPackage ../development/tools/wllvm { };
wmname = callPackage ../applications/misc/wmname { };
@@ -27737,6 +27742,8 @@ in
cgminer = callPackage ../applications/blockchains/cgminer { };
chia = callPackage ../applications/blockchains/chia { };
clightning = callPackage ../applications/blockchains/clightning.nix { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
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 { };