diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level')
-rw-r--r-- | nixpkgs/pkgs/top-level/aliases.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 752 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/haskell-packages.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/make-tarball.nix | 17 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/packages-config.nix | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/perl-packages.nix | 88 | ||||
-rw-r--r-- | nixpkgs/pkgs/top-level/python-packages.nix | 85 |
8 files changed, 753 insertions, 239 deletions
diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index edb05f176119..fe234143e70b 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -212,6 +212,7 @@ mapAliases ({ krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 + latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 @@ -234,7 +235,9 @@ mapAliases ({ libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 + liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 + librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 @@ -478,6 +481,7 @@ mapAliases ({ telnet = inetutils; # added 2018-05-15 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 + terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tesseract_4 = tesseract4; # added 2018-12-19 testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13 @@ -486,6 +490,7 @@ mapAliases ({ tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 + tomcat85 = tomcat8; # added 2020-03-11 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trang = jing-trang; # added 2018-04-25 @@ -502,6 +507,7 @@ mapAliases ({ v4l_utils = v4l-utils; # added 2019-08-07 v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages"; valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38"; + vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 440166c9dfb9..a5e24bc2efb6 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest { }; + conftest = callPackage ../development/tools/conftest { + inherit (darwin.apple_sdk.frameworks) Security; + }; corgi = callPackage ../development/tools/corgi { }; @@ -175,9 +177,13 @@ in hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { + inherit (darwin.apple_sdk.frameworks) Security; + }; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { + inherit (darwin.apple_sdk.frameworks) Security; + }; demoit = callPackage ../servers/demoit { }; @@ -191,7 +197,9 @@ in dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { }; + archiver = callPackage ../applications/misc/archiver { + inherit (darwin.apple_sdk.frameworks) Security; + }; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; @@ -211,7 +219,9 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; - docui = callPackage ../tools/misc/docui { }; + docui = callPackage ../tools/misc/docui { + inherit (darwin.apple_sdk.frameworks) Security; + }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -288,13 +298,18 @@ in # Version 2.6.0 fails to build with go 1.13 due to nested modules: # go: directory v2/packr2 is outside main module buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; - pet = callPackage ../development/tools/pet { }; + pet = callPackage ../development/tools/pet { + inherit (darwin.apple_sdk.frameworks) Security; + }; run = callPackage ../development/tools/run { }; - mod = callPackage ../development/tools/mod { }; + mod = callPackage ../development/tools/mod { + inherit (darwin.apple_sdk.frameworks) Security; + }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -528,7 +543,9 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + inherit (darwin.apple_sdk.frameworks) Security; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -553,7 +570,9 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerc = callPackage ../applications/networking/mailreaders/aerc { + inherit (darwin.apple_sdk.frameworks) Security; + }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -563,7 +582,9 @@ in acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; - amass = callPackage ../tools/networking/amass { }; + amass = callPackage ../tools/networking/amass { + inherit (darwin.apple_sdk.frameworks) Security; + }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -687,8 +708,6 @@ in artyFX = callPackage ../applications/audio/artyFX {}; - as31 = callPackage ../development/compilers/as31 {}; - owl-lisp = callPackage ../development/compilers/owl-lisp {}; ascii = callPackage ../tools/text/ascii { }; @@ -740,19 +759,27 @@ in aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; - aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-vault = callPackage ../tools/admin/aws-vault { + inherit (darwin.apple_sdk.frameworks) Security; + }; - iamy = callPackage ../tools/admin/iamy { }; + iamy = callPackage ../tools/admin/iamy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; - azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; brakeman = callPackage ../development/tools/analysis/brakeman { }; @@ -824,16 +851,22 @@ in calls = callPackage ../applications/networking/calls { }; - certigo = callPackage ../tools/admin/certigo { }; + certigo = callPackage ../tools/admin/certigo { + inherit (darwin.apple_sdk.frameworks) Security; + }; - chezmoi = callPackage ../tools/misc/chezmoi { }; + chezmoi = callPackage ../tools/misc/chezmoi { + inherit (darwin.apple_sdk.frameworks) Security; + }; chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; }; - clair = callPackage ../tools/admin/clair { }; + clair = callPackage ../tools/admin/clair { + inherit (darwin.apple_sdk.frameworks) Security; + }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -865,7 +898,9 @@ in crc32c = callPackage ../development/libraries/crc32c { }; - cue = callPackage ../development/tools/cue { }; + cue = callPackage ../development/tools/cue { + inherit (darwin.apple_sdk.frameworks) Security; + }; deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; @@ -890,7 +925,9 @@ in sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { }; + elvish = callPackage ../shells/elvish { + inherit (darwin.apple_sdk.frameworks) Security; + }; emplace = callPackage ../tools/package-management/emplace { }; @@ -960,6 +997,8 @@ in hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; + http2tcp = callPackage ../tools/networking/http2tcp { }; + httperf = callPackage ../tools/networking/httperf { }; ili2c = callPackage ../tools/misc/ili2c { }; @@ -1032,6 +1071,8 @@ in ssh-agents = callPackage ../tools/networking/ssh-agents { }; + ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -1102,7 +1143,9 @@ in awstats = callPackage ../tools/system/awstats { }; - awsweeper = callPackage ../tools/admin/awsweeper { }; + awsweeper = callPackage ../tools/admin/awsweeper { + inherit (darwin.apple_sdk.frameworks) Security; + }; axel = callPackage ../tools/networking/axel { libssl = openssl; @@ -1367,8 +1410,12 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; + caddy = callPackage ../servers/caddy { + inherit (darwin.apple_sdk.frameworks) Security; + }; + caddy2 = callPackage ../servers/caddy/v2.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1420,9 +1467,13 @@ in ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { }; + cassowary = callPackage ../tools/networking/cassowary { + inherit (darwin.apple_sdk.frameworks) Security; + }; - croc = callPackage ../tools/networking/croc { }; + croc = callPackage ../tools/networking/croc { + inherit (darwin.apple_sdk.frameworks) Security; + }; cddl = callPackage ../development/tools/cddl { }; @@ -1442,7 +1493,9 @@ in clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + inherit (darwin.apple_sdk.frameworks) Security; + }; clasp = callPackage ../tools/misc/clasp { }; @@ -1707,7 +1760,9 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - eksctl = callPackage ../tools/admin/eksctl { }; + eksctl = callPackage ../tools/admin/eksctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; @@ -1861,7 +1916,9 @@ in gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; gping = callPackage ../tools/networking/gping { }; @@ -2093,6 +2150,8 @@ in pueue = callPackage ../applications/misc/pueue { }; + pixiecore = callPackage ../tools/networking/pixiecore {}; + pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; @@ -2165,6 +2224,7 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken + libksi = null; # Currently Broken }; rsyslog-light = rsyslog.override { @@ -2438,7 +2498,9 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; circus = callPackage ../tools/networking/circus { }; @@ -2472,6 +2534,8 @@ in cmst = libsForQt5.callPackage ../tools/networking/cmst { }; + cmt = callPackage ../applications/audio/cmt {}; + codimd = callPackage ../servers/web-apps/codimd { nodejs = nodejs-10_x; }; @@ -2607,7 +2671,9 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; - age = callPackage ../tools/security/age { }; + age = callPackage ../tools/security/age { + inherit (darwin.apple_sdk.frameworks) Security; + }; brotli = callPackage ../tools/compression/brotli { }; @@ -2832,7 +2898,9 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -2935,9 +3003,13 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drone = callPackage ../development/tools/continuous-integration/drone { }; + drone = callPackage ../development/tools/continuous-integration/drone { + inherit (darwin.apple_sdk.frameworks) Security; + }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; dropbear = callPackage ../tools/networking/dropbear { }; @@ -3003,6 +3075,8 @@ in edid-decode = callPackage ../tools/misc/edid-decode { }; + edid-generator = callPackage ../tools/misc/edid-generator { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -3862,6 +3936,7 @@ in grpcui = callPackage ../tools/networking/grpcui { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ @@ -4088,7 +4163,9 @@ in hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; - hey = callPackage ../tools/networking/hey { }; + hey = callPackage ../tools/networking/hey { + inherit (darwin.apple_sdk.frameworks) Security; + }; hhpc = callPackage ../tools/misc/hhpc { }; @@ -4170,6 +4247,8 @@ in icecast = callPackage ../servers/icecast { }; + icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak; + iceshelf = callPackage ../tools/backup/iceshelf { }; darkice = callPackage ../tools/audio/darkice { }; @@ -4284,9 +4363,12 @@ in # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) # This is fixed in master, but release containing the fix does not exist yet. buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + inherit (darwin.apple_sdk.frameworks) Security; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -4446,6 +4528,8 @@ in keepalived = callPackage ../tools/networking/keepalived { }; + keeperrl = callPackage ../games/keeperrl { }; + kexectools = callPackage ../os-specific/linux/kexectools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; @@ -4528,7 +4612,9 @@ in lefthook = gitAndTools.lefthook; - lego = callPackage ../tools/admin/lego { }; + lego = callPackage ../tools/admin/lego { + inherit (darwin.apple_sdk.frameworks) Security; + }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4621,7 +4707,9 @@ in mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { + inherit (darwin.apple_sdk.frameworks) Security; + }; mcfly = callPackage ../tools/misc/mcfly { inherit (darwin.apple_sdk.frameworks) Security; @@ -4658,7 +4746,9 @@ in motion = callPackage ../applications/video/motion { }; - mtail = callPackage ../servers/monitoring/mtail { }; + mtail = callPackage ../servers/monitoring/mtail { + inherit (darwin.apple_sdk.frameworks) Security; + }; multitail = callPackage ../tools/misc/multitail { }; @@ -5105,7 +5195,9 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; + minio-client = callPackage ../tools/networking/minio-client { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -5224,7 +5316,9 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; - mutagen = callPackage ../tools/misc/mutagen { }; + mutagen = callPackage ../tools/misc/mutagen { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; mycli = callPackage ../tools/admin/mycli { }; @@ -5262,7 +5356,9 @@ in ndppd = callPackage ../applications/networking/ndppd { }; - nebula = callPackage ../tools/networking/nebula { }; + nebula = callPackage ../tools/networking/nebula { + inherit (darwin.apple_sdk.frameworks) Security; + }; nemiver = callPackage ../development/tools/nemiver { }; @@ -5339,6 +5435,8 @@ in networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; + libnma = callPackage ../tools/networking/network-manager/libnma { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; @@ -5349,7 +5447,8 @@ in grocy = callPackage ../servers/grocy { }; - nextcloud = callPackage ../servers/nextcloud { }; + inherit (callPackage ../servers/nextcloud {}) + nextcloud17 nextcloud18; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -5487,7 +5586,9 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + inherit (darwin.apple_sdk.frameworks) Security; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -5537,6 +5638,7 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; + openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; opencc = callPackage ../tools/text/opencc { }; @@ -5560,6 +5662,8 @@ in openjade = callPackage ../tools/text/sgml/openjade { }; + openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; + openmvg = callPackage ../applications/science/misc/openmvg { }; openmvs = callPackage ../applications/science/misc/openmvs { }; @@ -5714,10 +5818,14 @@ in parted = callPackage ../tools/misc/parted { }; + passh = callPackage ../tools/networking/passh { }; + paulstretch = callPackage ../applications/audio/paulstretch { }; pazi = callPackage ../tools/misc/pazi { }; + peep = callPackage ../tools/misc/peep { }; + pell = callPackage ../applications/misc/pell { }; pepper = callPackage ../tools/admin/salt/pepper { }; @@ -5820,9 +5928,13 @@ in pg_top = callPackage ../tools/misc/pg_top { }; - pgcenter = callPackage ../tools/misc/pgcenter { }; + pgcenter = callPackage ../tools/misc/pgcenter { + inherit (darwin.apple_sdk.frameworks) Security; + }; - pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pgmetrics = callPackage ../tools/misc/pgmetrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation @@ -6264,6 +6376,8 @@ in rlwrap = callPackage ../tools/misc/rlwrap { }; + rmtrash = callPackage ../tools/misc/rmtrash { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; @@ -6342,6 +6456,8 @@ in safecopy = callPackage ../tools/system/safecopy { }; + sacd = callPackage ../tools/cd-dvd/sacd { }; + safe = callPackage ../tools/security/safe { }; safe-rm = callPackage ../tools/system/safe-rm { }; @@ -6358,7 +6474,10 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws {}; + saml2aws = callPackage ../tools/security/saml2aws { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; + }; samplicator = callPackage ../tools/networking/samplicator { }; @@ -6852,7 +6971,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = callPackage ../applications/editors/texworks { }; + texworks = libsForQt5.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -7287,6 +7406,8 @@ in woof = callPackage ../tools/misc/woof { }; + wootility = callPackage ../tools/misc/wootility { }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -7574,6 +7695,8 @@ in xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; + xmage = callPackage ../games/xmage { }; + xml2 = callPackage ../tools/text/xml/xml2 { }; xmlformat = callPackage ../tools/text/xml/xmlformat { }; @@ -7657,7 +7780,9 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - yggdrasil = callPackage ../tools/networking/yggdrasil { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -7668,6 +7793,8 @@ in you-get = python3Packages.callPackage ../tools/misc/you-get { }; + zasm = callPackage ../development/compilers/zasm {}; + zbackup = callPackage ../tools/backup/zbackup {}; zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; @@ -7708,7 +7835,9 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history = callPackage ../shells/zsh/zsh-history { + inherit (darwin.apple_sdk.frameworks) Security; + }; zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; @@ -7818,6 +7947,24 @@ in abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; + adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + + adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-13 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; @@ -8008,7 +8155,9 @@ in scry = callPackage ../development/tools/scry {}; - dbmate = callPackage ../development/tools/database/dbmate { }; + dbmate = callPackage ../development/tools/database/dbmate { + inherit (darwin.apple_sdk.frameworks) Security; + }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -8036,7 +8185,9 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - flyctl = callPackage ../development/web/flyctl { }; + flyctl = callPackage ../development/web/flyctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; fpc = callPackage ../development/compilers/fpc { }; @@ -8474,7 +8625,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8519,21 +8670,33 @@ in else openjdk11.override { headless = true; }; + openjdk13-bootstrap = + if adoptopenjdk-hotspot-bin-13.meta.available then + adoptopenjdk-hotspot-bin-13 + else + /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ + callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; + /* current JDK */ - openjdk12 = + openjdk13 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx12; + openjfx = openjfx13; inherit (gnome2) GConf gnome_vfs; }; - openjdk12_headless = + openjdk13_headless = if stdenv.isDarwin then - openjdk12 + openjdk13 else - openjdk12.override { headless = true; }; + openjdk13.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8545,8 +8708,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk12 = openjdk12; - jdk12_headless = openjdk12_headless; + jdk13 = openjdk13; + jdk13_headless = openjdk13_headless; jdk = jdk8; jre = jre8; @@ -8785,6 +8948,8 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; + acme = callPackage ../development/compilers/acme { }; + nasm = callPackage ../development/compilers/nasm { }; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; @@ -8998,7 +9163,6 @@ in swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { - openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) Security; }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -9196,7 +9360,9 @@ in jmeter = callPackage ../applications/networking/jmeter {}; - joker = callPackage ../development/interpreters/joker {}; + joker = callPackage ../development/interpreters/joker { + inherit (darwin.apple_sdk.frameworks) Security; + }; davmail = callPackage ../applications/networking/davmail {}; @@ -9424,7 +9590,7 @@ in python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; python38Full = python38.override{x11Support=true;}; - python39Full = python38.override{x11Support=true;}; + python39Full = python39.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -9863,7 +10029,9 @@ in go = go_1_12; }; - bazelisk = callPackage ../development/tools/bazelisk { }; + bazelisk = callPackage ../development/tools/bazelisk { + inherit (darwin.apple_sdk.frameworks) Security; + }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -10131,7 +10299,9 @@ in binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; + dive = callPackage ../development/tools/dive { + inherit (darwin.apple_sdk.frameworks) Security; + }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -10141,7 +10311,9 @@ in doit = callPackage ../development/tools/build-managers/doit { }; - dolt = callPackage ../servers/sql/dolt { }; + dolt = callPackage ../servers/sql/dolt { + inherit (darwin.apple_sdk.frameworks) Security; + }; dot2tex = pythonPackages.dot2tex; @@ -10160,7 +10332,9 @@ in drush = callPackage ../development/tools/misc/drush { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { + inherit (darwin.apple_sdk.frameworks) Security; + }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10201,7 +10375,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { }; + fly = callPackage ../development/tools/continuous-integration/fly { + inherit (darwin.apple_sdk.frameworks) Security; + }; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10210,7 +10386,9 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { }; + frp = callPackage ../tools/networking/frp { + inherit (darwin.apple_sdk.frameworks) Security; + }; fsatrace = callPackage ../development/tools/misc/fsatrace { }; @@ -10279,7 +10457,9 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - gotify-server = callPackage ../servers/gotify { }; + gotify-server = callPackage ../servers/gotify { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotty = callPackage ../servers/gotty { }; @@ -10323,7 +10503,9 @@ in halfempty = callPackage ../development/tools/halfempty {}; - hcloud = callPackage ../development/tools/hcloud { }; + hcloud = callPackage ../development/tools/hcloud { + inherit (darwin.apple_sdk.frameworks) Security; + }; help2man = callPackage ../development/tools/misc/help2man { }; @@ -10405,13 +10587,17 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; - kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubeprompt = callPackage ../development/tools/kubeprompt { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { }; - kustomize = callPackage ../development/tools/kustomize { }; + kustomize = callPackage ../development/tools/kustomize { + inherit (darwin.apple_sdk.frameworks) Security; + }; ktlint = callPackage ../development/tools/ktlint { }; @@ -10468,14 +10654,18 @@ in mdl = callPackage ../development/tools/misc/mdl { }; - minify = callPackage ../development/web/minify { }; + minify = callPackage ../development/web/minify { + inherit (darwin.apple_sdk.frameworks) Security; + }; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { }; + mkcert = callPackage ../development/tools/misc/mkcert { + inherit (darwin.apple_sdk.frameworks) Security; + }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -10527,7 +10717,7 @@ in # NOTE: Override and set icon-lang = null to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; - nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -10657,7 +10847,9 @@ in withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { }; + reviewdog = callPackage ../development/tools/misc/reviewdog { + inherit (darwin.apple_sdk.frameworks) Security; + }; rman = callPackage ../development/tools/misc/rman { }; @@ -10799,7 +10991,9 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; + terracognita = callPackage ../development/tools/misc/terracognita { + inherit (darwin.apple_sdk.frameworks) Security; + }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -10820,11 +11014,15 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tflint = callPackage ../development/tools/analysis/tflint { }; + tflint = callPackage ../development/tools/analysis/tflint { + inherit (darwin.apple_sdk.frameworks) Security; + }; tfsec = callPackage ../development/tools/analysis/tfsec { }; - todoist = callPackage ../applications/misc/todoist { }; + todoist = callPackage ../applications/misc/todoist { + inherit (darwin.apple_sdk.frameworks) Security; + }; todoist-electron = callPackage ../applications/misc/todoist-electron { }; @@ -12917,6 +13115,8 @@ in libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; + libinstpatch = callPackage ../development/libraries/audio/libinstpatch { }; + libisofs = callPackage ../development/libraries/libisofs { }; libisoburn = callPackage ../development/libraries/libisoburn { }; @@ -12936,6 +13136,8 @@ in libkate = callPackage ../development/libraries/libkate { }; + libkml = callPackage ../development/libraries/libkml { }; + libksba = callPackage ../development/libraries/libksba { }; libksi = callPackage ../development/libraries/libksi { }; @@ -13130,6 +13332,8 @@ in libsigsegv = callPackage ../development/libraries/libsigsegv { }; + libslirp = callPackage ../development/libraries/libslirp { }; + libsndfile = callPackage ../development/libraries/libsndfile { inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; @@ -13422,6 +13626,8 @@ in loudmouth = callPackage ../development/libraries/loudmouth { }; + lrdf = callPackage ../development/libraries/lrdf { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; luabind_luajit = luabind.override { lua = luajit; }; @@ -13643,6 +13849,8 @@ in nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; + nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; + nvtop = callPackage ../tools/system/nvtop { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -14181,9 +14389,6 @@ in librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 - librdf = callPackage ../development/libraries/librdf { }; - liblrdf = librdf; # added 2018-04-25 - libsmf = callPackage ../development/libraries/audio/libsmf { }; lilv = callPackage ../development/libraries/audio/lilv { }; @@ -14223,9 +14428,7 @@ in rttr = callPackage ../development/libraries/rttr { }; - rubberband = callPackage ../development/libraries/rubberband { - inherit (vamp) vampSDK; - }; + rubberband = callPackage ../development/libraries/rubberband { }; sad = callPackage ../applications/science/logic/sad { }; @@ -14725,7 +14928,7 @@ in vale = callPackage ../tools/text/vale { }; - vamp = callPackage ../development/libraries/audio/vamp { }; + vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vc = callPackage ../development/libraries/vc { }; @@ -15444,6 +15647,7 @@ in gobetween = callPackage ../servers/gobetween { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; h2o = callPackage ../servers/http/h2o { }; @@ -15473,7 +15677,9 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - imgproxy = callPackage ../servers/imgproxy { }; + imgproxy = callPackage ../servers/imgproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -15512,7 +15718,9 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; + matterbridge = callPackage ../servers/matterbridge { + inherit (darwin.apple_sdk.frameworks) Security; + }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -15526,7 +15734,9 @@ in micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { }; + minio = callPackage ../servers/minio { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -15717,11 +15927,27 @@ in }; mysql = mariadb; # TODO: move to aliases.nix - mongodb = callPackage ../servers/nosql/mongodb { + mongodb = hiPrio mongodb-3_4; + + mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix { sasl = cyrus_sasl; boost = boost160; - openssl = openssl_1_0_2; - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + + mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix { + sasl = cyrus_sasl; + boost = boost160; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + + mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix { + sasl = cyrus_sasl; + boost = boost169; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; nginx-sso = callPackage ../servers/nginx-sso { }; @@ -15860,7 +16086,9 @@ in prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; + prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; @@ -15868,7 +16096,9 @@ in prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; - prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; @@ -15890,6 +16120,7 @@ in # Version 1.5.1 fails to build with go 1.13 due to test failure # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { @@ -16006,7 +16237,9 @@ in sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { }) + inherit (callPackages ../servers/monitoring/sensu-go { + inherit (darwin.apple_sdk.frameworks) Security; + }) sensu-go-agent sensu-go-backend sensu-go-cli; @@ -16052,12 +16285,15 @@ in syncserver = callPackage ../servers/syncserver { }; - thanos = callPackage ../servers/monitoring/thanos { }; + tailscale = callPackage ../servers/tailscale { }; + + thanos = callPackage ../servers/monitoring/thanos { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 - tomcat85 tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; @@ -16078,7 +16314,9 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { }; + shiori = callPackage ../servers/web-apps/shiori { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/web-apps/matomo {}) matomo @@ -16091,7 +16329,9 @@ in unifiStable; unifi = unifiStable; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16292,9 +16532,13 @@ in conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - coredns = callPackage ../servers/dns/coredns { }; + coredns = callPackage ../servers/dns/coredns { + inherit (darwin.apple_sdk.frameworks) Security; + }; - corerad = callPackage ../tools/networking/corerad { }; + corerad = callPackage ../tools/networking/corerad { + inherit (darwin.apple_sdk.frameworks) Security; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -17102,7 +17346,9 @@ in golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { }; + golangci-lint = callPackage ../development/tools/golangci-lint { + inherit (darwin.apple_sdk.frameworks) Security; + }; gocyclo = callPackage ../development/tools/gocyclo { }; @@ -17116,9 +17362,13 @@ in govendor = callPackage ../development/tools/govendor { }; - go-tools = callPackage ../development/tools/go-tools { }; + go-tools = callPackage ../development/tools/go-tools { + inherit (darwin.apple_sdk.frameworks) Security; + }; - gotools = callPackage ../development/tools/gotools { }; + gotools = callPackage ../development/tools/gotools { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotop = callPackage ../tools/system/gotop { }; @@ -17225,7 +17475,9 @@ in procdump = callPackage ../os-specific/linux/procdump { }; - prototool = callPackage ../development/tools/prototool { }; + prototool = callPackage ../development/tools/prototool { + inherit (darwin.apple_sdk.frameworks) Security; + }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); @@ -17302,7 +17554,10 @@ in smem = callPackage ../os-specific/linux/smem { }; - smimesign = callPackage ../os-specific/darwin/smimesign { }; + smimesign = callPackage ../os-specific/darwin/smimesign { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Security; + }; speedometer = callPackage ../os-specific/linux/speedometer { }; @@ -17452,6 +17707,8 @@ in wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; + wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; @@ -17509,7 +17766,13 @@ in anonymousPro = callPackage ../data/fonts/anonymous-pro { }; - ant-theme = callPackage ../data/themes/ant-theme { }; + ant-theme = callPackage ../data/themes/ant-theme/ant.nix { }; + + ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { }; + + ant-dracula-theme = callPackage ../data/themes/ant-theme/ant-dracula.nix { }; + + ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; @@ -17630,7 +17893,9 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - documize-community = callPackage ../servers/documize-community { }; + documize-community = callPackage ../servers/documize-community { + inherit (darwin.apple_sdk.frameworks) Security; + }; doge = callPackage ../misc/doge { }; @@ -17733,7 +17998,9 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { + inherit (darwin.apple_sdk.frameworks) Security; + }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; @@ -17750,8 +18017,11 @@ in iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; inconsolata = callPackage ../data/fonts/inconsolata {}; + inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; + inconsolata-nerdfont = callPackage ../data/fonts/inconsolata-nerdfont {}; + input-fonts = callPackage ../data/fonts/input-fonts { }; inriafonts = callPackage ../data/fonts/inriafonts { }; @@ -17785,8 +18055,6 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - latinmodern-math = callPackage ../data/fonts/lm-math {}; - lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -17821,7 +18089,7 @@ in libre-franklin = callPackage ../data/fonts/libre-franklin { }; - lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; + lmmath = callPackage ../data/fonts/lmmath {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -18156,6 +18424,8 @@ in terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + terminus-nerdfont = callPackage ../data/fonts/terminus-nerdfont { }; + termtekst = callPackage ../misc/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -18352,14 +18622,17 @@ in ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; - inherit (vamp) vampSDK; }; arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { }; + argo = callPackage ../applications/networking/cluster/argo { + inherit (darwin.apple_sdk.frameworks) Security; + }; - argocd = callPackage ../applications/networking/cluster/argocd { }; + argocd = callPackage ../applications/networking/cluster/argocd { + inherit (darwin.apple_sdk.frameworks) Security; + }; ario = callPackage ../applications/audio/ario { }; @@ -18384,6 +18657,8 @@ in astroid = callPackage ../applications/networking/mailreaders/astroid { }; + aucatctl = callPackage ../applications/audio/aucatctl { }; + audacious = callPackage ../applications/audio/audacious { }; audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { }; @@ -18401,6 +18676,8 @@ in cadence = qt5.callPackage ../applications/audio/cadence { }; + cheesecutter = callPackage ../applications/audio/cheesecutter { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -18753,7 +19030,9 @@ in csdp = callPackage ../applications/science/math/csdp { }; - ctop = callPackage ../tools/system/ctop { }; + ctop = callPackage ../tools/system/ctop { + inherit (darwin.apple_sdk.frameworks) Security; + }; cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; @@ -18864,6 +19143,7 @@ in docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { @@ -18944,7 +19224,9 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; - echoip = callPackage ../servers/echoip { }; + echoip = callPackage ../servers/echoip { + inherit (darwin.apple_sdk.frameworks) Security; + }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { jdk = jdk11; @@ -19096,7 +19378,9 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - exercism = callPackage ../applications/misc/exercism { }; + exercism = callPackage ../applications/misc/exercism { + inherit (darwin.apple_sdk.frameworks) Security; + }; go-motion = callPackage ../development/tools/go-motion { }; @@ -19208,7 +19492,9 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19231,6 +19517,8 @@ in ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; }; + grandorgue = callPackage ../applications/audio/grandorgue { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; @@ -19247,7 +19535,9 @@ in inherit (darwin) libiconv; }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -19337,7 +19627,9 @@ in sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - termshark = callPackage ../tools/networking/termshark { }; + termshark = callPackage ../tools/networking/termshark { + inherit (darwin.apple_sdk.frameworks) Security; + }; fbida = callPackage ../applications/graphics/fbida { }; @@ -19570,7 +19862,9 @@ in inherit (darwin) IOKit; }; - glow = callPackage ../applications/editors/glow { }; + glow = callPackage ../applications/editors/glow { + inherit (darwin.apple_sdk.frameworks) Security; + }; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; @@ -19708,6 +20002,8 @@ in herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hercules = callPackage ../applications/virtualization/hercules { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; hexcurse = callPackage ../applications/editors/hexcurse { }; @@ -19748,11 +20044,15 @@ in wxGTK = wxGTK30; }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + inherit (darwin.apple_sdk.frameworks) Security; + }; hydrogen = callPackage ../applications/audio/hydrogen { }; - hydroxide = callPackage ../applications/networking/hydroxide { }; + hydroxide = callPackage ../applications/networking/hydroxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; hyper = callPackage ../applications/misc/hyper { }; @@ -20035,8 +20335,6 @@ in josm = callPackage ../applications/misc/josm { }; - jbrout = callPackage ../applications/graphics/jbrout { }; - jwm = callPackage ../applications/window-managers/jwm { }; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; @@ -20096,7 +20394,9 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { }; + kepubify = callPackage ../tools/misc/kepubify { + inherit (darwin.apple_sdk.frameworks) Security; + }; kermit = callPackage ../tools/misc/kermit { }; @@ -20157,25 +20457,39 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = buildPackages.go_1_13; }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; - k9s = callPackage ../applications/networking/cluster/k9s { }; + k9s = callPackage ../applications/networking/cluster/k9s { + inherit (darwin.apple_sdk.frameworks) Security; + }; - fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; + linkerd = callPackage ../applications/networking/cluster/linkerd { + inherit (darwin.apple_sdk.frameworks) Security; + }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; @@ -20472,7 +20786,9 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin.apple_sdk.frameworks) vmnet; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -20485,9 +20801,7 @@ in meh = callPackage ../applications/graphics/meh {}; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { - inherit (vamp) vampSDK; - }; + mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; @@ -20564,6 +20878,8 @@ in mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; + mopidy-mpd = callPackage ../applications/audio/mopidy/mpd.nix { }; + motif = callPackage ../development/libraries/motif { }; mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; @@ -20669,6 +20985,8 @@ in else null; }; + mup = callPackage ../applications/audio/mup { }; + # TODO: we should probably merge these 2 musescore = if stdenv.isDarwin then @@ -20702,6 +21020,9 @@ in notion = callPackage ../applications/window-managers/notion { }; + nootka = qt5.callPackage ../applications/audio/nootka { }; + nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openshift = callPackage ../applications/networking/cluster/openshift { @@ -20759,7 +21080,9 @@ in ptex = callPackage ../development/libraries/ptex {}; - qbec = callPackage ../applications/networking/cluster/qbec { }; + qbec = callPackage ../applications/networking/cluster/qbec { + inherit (darwin.apple_sdk.frameworks) Security; + }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -20981,10 +21304,7 @@ in opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -21303,6 +21623,8 @@ in qmetro = callPackage ../applications/misc/qmetro { }; + qmidiarp = callPackage ../applications/audio/qmidiarp {}; + qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; @@ -21550,7 +21872,9 @@ in sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + inherit (darwin.apple_sdk.frameworks) Security; + }; shfmt = callPackage ../tools/text/shfmt { }; @@ -21582,7 +21906,9 @@ in sooperlooper = callPackage ../applications/audio/sooperlooper { }; - sops = callPackage ../tools/security/sops { }; + sops = callPackage ../tools/security/sops { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; sorcer = callPackage ../applications/audio/sorcer { }; @@ -21731,13 +22057,9 @@ in skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { - inherit (pkgs.vamp) vampSDK; - }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; - sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { - inherit (pkgs.vamp) vampSDK; - }; + sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; @@ -21784,7 +22106,8 @@ in stp = callPackage ../applications/science/logic/stp { }; stretchly = callPackage ../applications/misc/stretchly { - inherit (gnome2) GConf; + # Error on launch w/electron_8 + electron = electron_7; }; stumpish = callPackage ../applications/window-managers/stumpish {}; @@ -21840,7 +22163,10 @@ in syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + }) syncthing syncthing-cli syncthing-discovery @@ -21927,6 +22253,7 @@ in tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -22033,6 +22360,8 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; + tony = libsForQt5.callPackage ../applications/audio/tony { }; + toot = callPackage ../applications/misc/toot { }; tootle = callPackage ../applications/misc/tootle { }; @@ -22103,7 +22432,6 @@ in unison = callPackage ../applications/networking/sync/unison { enableX11 = config.unison.enableX11 or true; - ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; unpaper = callPackage ../tools/graphics/unpaper { }; @@ -22159,6 +22487,8 @@ in gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); + vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { @@ -22437,7 +22767,6 @@ in inherit (lib) optional; in with libretro; ([ ] - ++ optional (cfg.enable4do or false) _4do ++ optional (cfg.enableAtari800 or false) atari800 ++ optional (cfg.enableBeetleGBA or false) beetle-gba ++ optional (cfg.enableBeetleLynx or false) beetle-lynx @@ -22445,26 +22774,33 @@ in ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast ++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx ++ optional (cfg.enableBeetlePSX or false) beetle-psx + ++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn + ++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw ++ optional (cfg.enableBeetleSNES or false) beetle-snes ++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx ++ optional (cfg.enableBeetleWswan or false) beetle-wswan ++ optional (cfg.enableBeetleVB or false) beetle-vb ++ optional (cfg.enableBlueMSX or false) bluemsx ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury - ++ optional (cfg.enableDOSBox or false) dosbox + ++ optional (cfg.enableCitra or false) citra ++ optional (cfg.enableDesmume or false) desmume ++ optional (cfg.enableDesmume2015 or false) desmume2015 ++ optional (cfg.enableDolphin or false) dolphin - ++ optional (cfg.enableFBA or false) fba + ++ optional (cfg.enableDOSBox or false) dosbox + ++ optional (cfg.enableEightyOne or false) eightyone + ++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012 + ++ optional (cfg.enableFBNeo or false) fbneo ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableFlycast or false) flycast + ++ optional (cfg.enableFMSX or false) fmsx + ++ optional (cfg.enableFreeIntv or false) freeintv ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx ++ optional (cfg.enableGpsp or false) gpsp + ++ optional (cfg.enableGW or false) gw ++ optional (cfg.enableHandy or false) handy ++ optional (cfg.enableHatari or false) hatari - ++ optional (cfg.enableHiganSFC or false) higan-sfc ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMAME2000 or false) mame2000 ++ optional (cfg.enableMAME2003 or false) mame2003 @@ -22473,10 +22809,13 @@ in ++ optional (cfg.enableMAME2015 or false) mame2015 ++ optional (cfg.enableMAME2016 or false) mame2016 ++ optional (cfg.enableMesen or false) mesen + ++ optional (cfg.enableMeteor or false) meteor ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus + ++ optional (cfg.enableNeoCD or false) neocd ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enableO2EM or false) o2em + ++ optional (cfg.enableOpera or false) opera ++ optional (cfg.enableParallelN64 or false) parallel-n64 ++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed ++ optional (cfg.enablePicodrive or false) picodrive @@ -22485,24 +22824,22 @@ in ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enableProSystem or false) prosystem ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableSameBoy or false) sameboy ++ optional (cfg.enableScummVM or false) scummvm + ++ optional (cfg.enableSMSPlusGX or false) smsplus-gx ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9x2002 or false) snes9x2002 ++ optional (cfg.enableSnes9x2005 or false) snes9x2005 ++ optional (cfg.enableSnes9x2010 or false) snes9x2010 ++ optional (cfg.enableStella or false) stella + ++ optional (cfg.enableStella2014 or false) stella2014 + ++ optional (cfg.enableTGBDual or false) tgbdual + ++ optional (cfg.enableTIC80 or false) tic80 ++ optional (cfg.enableVbaNext or false) vba-next ++ optional (cfg.enableVbaM or false) vba-m ++ optional (cfg.enableVecx or false) vecx ++ optional (cfg.enableVirtualJaguar or false) virtualjaguar ++ optional (cfg.enableYabause or false) yabause - # added on 2017-02-25 due #23163 - ++ optional (cfg.enableMednafenPCEFast or false) - (throw "nix config option enableMednafenPCEFast has been renamed to enableBeetlePCEFast") - ++ optional (cfg.enableMednafenPSX or false) - (throw "nix config option enableMednafenPSX has been renamed to enableBeetlePSX") - ++ optional (cfg.enableMednafenSaturn or false) - (throw "nix config option enableMednafenSaturn has been renamed to enableBeetleSaturn") ); wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { @@ -22563,6 +22900,10 @@ in x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; + x42-avldrums = callPackage ../applications/audio/x42-avldrums { }; + + x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { }; + x42-plugins = callPackage ../applications/audio/x42-plugins { }; xannotate = callPackage ../tools/X11/xannotate {}; @@ -22861,6 +23202,8 @@ in zim = callPackage ../applications/office/zim { }; + zita-at1 = callPackage ../applications/audio/zita-at1 { }; + zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; zola = callPackage ../applications/misc/zola { @@ -22931,7 +23274,7 @@ in freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; }; ledger_agent = with python3Packages; toPythonApplication ledger_agent; @@ -22945,14 +23288,17 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost16x; + protobuf = protobuf3_10; }; masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; @@ -22973,6 +23319,8 @@ in sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + tessera = callPackage ../applications/blockchains/tessera.nix { }; + vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; @@ -22990,6 +23338,8 @@ in particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + quorum = callPackage ../applications/blockchains/quorum.nix { }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -23654,7 +24004,6 @@ in spring = callPackage ../games/spring { boost = boost155; - cmake = cmake_2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -23936,6 +24285,7 @@ in clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; @@ -24332,13 +24682,6 @@ in rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (python3Packages) numpy ply pytest python six sympy; - pythonPackages = python3Packages; - pythonBindings = true; - docs = true; - }; - lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; @@ -24381,6 +24724,8 @@ in suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_5_3; + suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas {}; + superlu = callPackage ../development/libraries/science/math/superlu {}; symmetrica = callPackage ../applications/science/math/symmetrica {}; @@ -24886,7 +25231,9 @@ in hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; - hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; + hepmc3 = callPackage ../development/libraries/physics/hepmc3 { + python = null; + }; herwig = callPackage ../development/libraries/physics/herwig { }; @@ -24933,7 +25280,9 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { + inherit (darwin.apple_sdk.frameworks) Security; + }; auctex = callPackage ../tools/typesetting/tex/auctex { }; @@ -25121,7 +25470,9 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gobuster = callPackage ../tools/security/gobuster { }; + gobuster = callPackage ../tools/security/gobuster { + inherit (darwin.apple_sdk.frameworks) Security; + }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -25135,7 +25486,9 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile = callPackage ../applications/networking/cluster/helmfile { + inherit (darwin.apple_sdk.frameworks) Security; + }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; @@ -25200,8 +25553,9 @@ in kops_1_13 kops_1_14 kops_1_15 + kops_1_16 ; - kops = kops_1_15; + kops = kops_1_16; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -25229,6 +25583,8 @@ in mongoc = callPackage ../development/libraries/mongoc { }; + mongoose = callPackage ../development/libraries/science/math/mongoose {}; + morph = callPackage ../tools/package-management/morph { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; @@ -25237,7 +25593,9 @@ in musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; @@ -25704,12 +26062,15 @@ in sqsh = callPackage ../development/tools/sqsh { }; - jx = callPackage ../applications/networking/cluster/jx {}; + jx = callPackage ../applications/networking/cluster/jx { + inherit (darwin.apple_sdk.frameworks) Security; + }; prow = callPackage ../applications/networking/cluster/prow { # Version 2019-08-14 fails to build with go 1.13 due to dependencies: # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; inherit (callPackage ../applications/networking/cluster/terraform { @@ -25728,7 +26089,7 @@ in terraform-providers = recurseIntoAttrs ( callPackage ../applications/networking/cluster/terraform-providers { - inherit buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; } ); @@ -25849,7 +26210,9 @@ in webfs = callPackage ../servers/http/webfs { }; - websocketd = callPackage ../applications/networking/websocketd { }; + websocketd = callPackage ../applications/networking/websocketd { + inherit (darwin.apple_sdk.frameworks) Security; + }; wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; @@ -26069,7 +26432,9 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + inherit (darwin.apple_sdk.frameworks) Security; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -26130,7 +26495,9 @@ in dsniff = callPackage ../tools/networking/dsniff {}; - wal-g = callPackage ../tools/backup/wal-g {}; + wal-g = callPackage ../tools/backup/wal-g { + inherit (darwin.apple_sdk.frameworks) Security; + }; tlwg = callPackage ../data/fonts/tlwg { }; @@ -26233,19 +26600,28 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr {}; + gortr = callPackage ../servers/gortr { + inherit (darwin.apple_sdk.frameworks) Security; + }; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { + inherit (darwin.apple_sdk.frameworks) Security; + }; unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + hashdeep = callPackage ../tools/security/hashdeep { }; fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; btcdeb = callPackage ../applications/blockchains/btcdeb {}; + } diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 2d03b3ed8f44..052b84f269e6 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -4,7 +4,7 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ "ghc822Binary" - "ghc863Binary" + "ghc865Binary" "ghc844" "ghcjs" "ghcjs86" @@ -42,7 +42,7 @@ in { ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { }; - ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { }; + ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; @@ -57,31 +57,31 @@ in { llvmPackages = pkgs.llvmPackages_6; }; ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; @@ -117,9 +117,9 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc863Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc863Binary; - ghc = bh.compiler.ghc863Binary; + ghc865Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc865Binary; + ghc = bh.compiler.ghc865Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; diff --git a/nixpkgs/pkgs/top-level/make-tarball.nix b/nixpkgs/pkgs/top-level/make-tarball.nix index ff0b0568819c..23542e4afe0a 100644 --- a/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/nixpkgs/pkgs/top-level/make-tarball.nix @@ -22,7 +22,7 @@ releaseTools.sourceTarball { then builtins.substring 0 8 nixpkgs.lastModified else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; - buildInputs = [ nix.out jq lib-tests ]; + buildInputs = [ nix.out jq lib-tests pkgs.brotli ]; configurePhase = '' eval "$preConfigure" @@ -38,6 +38,8 @@ releaseTools.sourceTarball { doCheck = true; checkPhase = '' + set -o pipefail + export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix @@ -83,12 +85,10 @@ releaseTools.sourceTarball { --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null - stopNest done header "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null - stopNest header "checking find-tarballs.nix" nix-instantiate --readonly-mode --eval --strict --show-trace --json \ @@ -100,7 +100,16 @@ releaseTools.sourceTarball { echo "suspiciously low number of URLs" exit 1 fi - stopNest + + header "generating packages.json" + mkdir -p $out/nix-support + echo -n '{"version":2,"packages":' > tmp + nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + echo -n '}' >> tmp + packages=$out/packages.json.br + jq -c < tmp | brotli -9 > $packages + + echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; distPhase = '' diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index e8a6bc21035b..7e12a3db3f78 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -16,8 +16,6 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; - buildDune2Package = buildDunePackage.override { dune = dune_2; }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -232,9 +230,9 @@ let dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; - dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; }; + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; - dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; }; + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; earley = callPackage ../development/ocaml-modules/earley { }; @@ -349,6 +347,11 @@ let gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + graphics = + if lib.versionOlder "4.09" ocaml.version + then callPackage ../development/ocaml-modules/graphics { } + else null; + graphql = callPackage ../development/ocaml-modules/graphql { }; graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { }; diff --git a/nixpkgs/pkgs/top-level/packages-config.nix b/nixpkgs/pkgs/top-level/packages-config.nix new file mode 100644 index 000000000000..8ce855780cf9 --- /dev/null +++ b/nixpkgs/pkgs/top-level/packages-config.nix @@ -0,0 +1,13 @@ +# Used in the generation of package search database. +{ + # Ensures no aliases are in the results. + allowAliases = false; + + # Enable recursion into attribute sets that nix-env normally doesn't look into + # so that we can get a more complete picture of the available packages for the + # purposes of the index. + packageOverrides = super: { + haskellPackages = super.recurseIntoAttrs super.haskellPackages; + rPackages = super.recurseIntoAttrs super.rPackages; + }; +} diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index f617bdd27e36..99bbdf1af1a4 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -1243,6 +1243,21 @@ let }; }; + BytesRandomSecure = buildPerlPackage { + pname = "Bytes-Random-Secure"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-0.29.tar.gz"; + sha256 = "53bbd339e6a11efca07c619a615c7c188a68bb2be849a1cb7efc3dd4d9ae85ae"; + }; + propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ]; + meta = { + description = "Perl extension to generate cryptographically-secure random bytes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CacheCache = buildPerlPackage { pname = "Cache-Cache"; version = "1.08"; @@ -3329,9 +3344,9 @@ let }; patches = [ (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff"; + url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff"; name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false"; - sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr"; + sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp"; }) ]; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; @@ -3605,6 +3620,22 @@ let }; }; + CryptRandomSeed = buildPerlPackage { + pname = "Crypt-Random-Seed"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-Seed-0.03.tar.gz"; + sha256 = "593da54b522c09cc26bbcc0e4e49c1c8e688a6fd33b0726af801d722a5c8d0f1"; + }; + propagatedBuildInputs = [ CryptRandomTESHA2 ]; + meta = { + homepage = "https://github.com/danaj/Crypt-Random-Seed"; + description = "Provide strong randomness for seeding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptRandomSource = buildPerlModule { pname = "Crypt-Random-Source"; version = "0.14"; @@ -3620,6 +3651,20 @@ let }; }; + CryptRandomTESHA2 = buildPerlPackage { + pname = "Crypt-Random-TESHA2"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-TESHA2-0.01.tar.gz"; + sha256 = "a0912b42c52be173da528d5527e40d967324bc04ac78d9fc2ddc91ff16fe9633"; + }; + meta = { + homepage = "https://github.com/danaj/Crypt-Random-TESHA2"; + description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptRC4 = buildPerlPackage { pname = "Crypt-RC4"; version = "2.02"; @@ -3826,14 +3871,15 @@ let CryptSSLeay = buildPerlPackage { pname = "Crypt-SSLeay"; - version = "0.72"; + version = "0.73_06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz; - sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; + url = "mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.73_06.tar.gz"; + sha256 = "0b159lw3ia5r87qsgff3qhdnz3l09xcz04rbk4ji7fbyr12wmv7q"; }; + makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; buildInputs = [ PathClass ]; - propagatedBuildInputs = [ LWPProtocolHttps ]; + propagatedBuildInputs = [ LWPProtocolHttps BytesRandomSecure ]; }; CSSDOM = buildPerlPackage { @@ -12225,6 +12271,23 @@ let }; }; + MojoPg = buildPerlPackage { + pname = "Mojo-Pg"; + version = "4.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz"; + sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; + meta = { + homepage = "https://github.com/mojolicious/mojo-pg"; + description = "Mojolicious <3 PostgreSQL"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14541,6 +14604,19 @@ let }; }; + ParseYapp = buildPerlPackage { + pname = "Parser-Yapp"; + version = "1.21"; + src = fetchurl { + url = mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz; + sha256 = "1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q"; + }; + meta = { + description = "Perl extension for generating and using LALR parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathClass = buildPerlModule { pname = "Path-Class"; version = "0.37"; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 0773a1984ab5..aba67f63a828 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ in { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + bacpypes = callPackage ../development/python-modules/bacpypes {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; @@ -617,6 +619,8 @@ in { diofant = callPackage ../development/python-modules/diofant { }; + dipy = callPackage ../development/python-modules/dipy { }; + docrep = callPackage ../development/python-modules/docrep { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -878,6 +882,8 @@ in { markerlib = callPackage ../development/python-modules/markerlib { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; + matchpy = callPackage ../development/python-modules/matchpy { }; maxminddb = callPackage ../development/python-modules/maxminddb { }; @@ -1288,6 +1294,8 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; @@ -1504,11 +1512,11 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; - spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {} - else callPackage ../development/python-modules/spyder-kernels/2.nix {}; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; - spyder = if isPy3k then callPackage ../development/python-modules/spyder {} - else callPackage ../development/python-modules/spyder/2.nix {}; + spyder = callPackage ../development/python-modules/spyder {}; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; tenacity = callPackage ../development/python-modules/tenacity { }; @@ -2242,6 +2250,11 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); + impacket = callPackage ../development/python-modules/impacket { }; jsonlines = callPackage ../development/python-modules/jsonlines { }; @@ -2254,6 +2267,10 @@ in { jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + hepmc3 = toPythonModule (pkgs.hepmc3.override { + inherit python; + }); + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -2345,8 +2362,6 @@ in { pyhcl = callPackage ../development/python-modules/pyhcl { }; - pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = if isPy3k then self.pytest_5 else self.pytest_4; pytest_5 = callPackage ../development/python-modules/pytest { @@ -2391,12 +2406,14 @@ in { pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; + pytest-html = callPackage ../development/python-modules/pytest-html { }; + + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; @@ -2509,6 +2526,7 @@ in { libfdt = toPythonModule (pkgs.dtc.override { inherit python; + pythonSupport = true; }); libtmux = callPackage ../development/python-modules/libtmux { }; @@ -2702,6 +2720,12 @@ in { ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; + filetype = callPackage ../development/python-modules/filetype { }; flammkuchen = callPackage ../development/python-modules/flammkuchen { }; @@ -3333,8 +3357,6 @@ in { django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; - django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; - django-allauth = callPackage ../development/python-modules/django-allauth { }; django-anymail = callPackage ../development/python-modules/django-anymail {}; @@ -3415,20 +3437,6 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_4_3 = if - self.django.version != "1.8.19" - then throw "django_tagging_0_4_3 should be build with django_1_8" - else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { - pname = "django-tagging"; - version = "0.4.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; - }; - propagatedBuildInputs = with self; [ django ]; - }); - django_classytags = callPackage ../development/python-modules/django_classytags { }; # This package may need an older version of Django. @@ -3941,6 +3949,8 @@ in { colored = callPackage ../development/python-modules/colored { }; + xdg = callPackage ../development/python-modules/xdg { }; + xdis = callPackage ../development/python-modules/xdis { }; xnd = callPackage ../development/python-modules/xnd { }; @@ -4149,6 +4159,11 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); + libkeepass = callPackage ../development/python-modules/libkeepass { }; librepo = pipe pkgs.librepo [ @@ -4619,7 +4634,7 @@ in { offtrac = callPackage ../development/python-modules/offtrac { }; - openpyxl = if isPy3k then + openpyxl = if pythonAtLeast "3.6" then callPackage ../development/python-modules/openpyxl { } else callPackage ../development/python-modules/openpyxl/2.nix { }; @@ -4632,6 +4647,8 @@ in { omegaconf = callPackage ../development/python-modules/omegaconf { }; + opuslib = callPackage ../development/python-modules/opuslib { }; + orderedset = callPackage ../development/python-modules/orderedset { }; python-multipart = callPackage ../development/python-modules/python-multipart { }; @@ -4751,6 +4768,8 @@ in { patch = callPackage ../development/python-modules/patch { }; + patch-ng = callPackage ../development/python-modules/patch-ng { }; + pathos = callPackage ../development/python-modules/pathos { }; patsy = callPackage ../development/python-modules/patsy { }; @@ -4901,6 +4920,8 @@ in { ppft = callPackage ../development/python-modules/ppft { }; + pproxy = callPackage ../development/python-modules/pproxy { }; + praw = if isPy3k then callPackage ../development/python-modules/praw { } else callPackage ../development/python-modules/praw/6.3.nix { }; @@ -5059,6 +5080,8 @@ in { pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + pymumble = callPackage ../development/python-modules/pymumble { }; + pyomo = callPackage ../development/python-modules/pyomo { }; pyopencl = callPackage ../development/python-modules/pyopencl { }; @@ -5187,6 +5210,8 @@ in { progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + protego = callPackage ../development/python-modules/protego {}; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; @@ -6245,6 +6270,8 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + wsgitools = callPackage ../development/python-modules/wsgitools { }; + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; xcaplib = callPackage ../development/python-modules/xcaplib { }; @@ -6394,8 +6421,6 @@ in { influxgraph = callPackage ../development/python-modules/influxgraph { }; - graphitepager = callPackage ../development/python-modules/graphitepager { }; - pyspotify = callPackage ../development/python-modules/pyspotify { }; pykka = callPackage ../development/python-modules/pykka { }; @@ -7035,6 +7060,10 @@ in { qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; qasm2image = callPackage ../development/python-modules/qasm2image { }; @@ -7094,6 +7123,8 @@ in { pybotvac = callPackage ../development/python-modules/pybotvac { }; + pymetno = callPackage ../development/python-modules/pymetno { }; + pytado = callPackage ../development/python-modules/pytado { }; casttube = callPackage ../development/python-modules/casttube { }; |