diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4554 |
1 files changed, 2974 insertions, 1580 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09272b44c50..e6b9cdd009e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -149,11 +149,19 @@ in buildMaven = callPackage ../build-support/build-maven.nix {}; + castget = callPackage ../applications/networking/feedreaders/castget { }; + castxml = callPackage ../development/tools/castxml { }; + cereal = callPackage ../development/libraries/cereal { }; + + clj-kondo = callPackage ../development/tools/clj-kondo { }; + cmark = callPackage ../development/libraries/cmark { }; - conftest = callPackage ../development/tools/conftest {}; + cm256cc = callPackage ../development/libraries/cm256cc { }; + + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -169,6 +177,10 @@ in demoit = callPackage ../servers/demoit { }; + deviceTree = callPackage ../os-specific/linux/device-tree {}; + + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -189,6 +201,8 @@ in docker-ls = callPackage ../tools/misc/docker-ls { }; + docker-slim = callPackage ../build-support/docker-slim { }; + docker-sync = callPackage ../tools/misc/docker-sync { }; docui = callPackage ../tools/misc/docui { }; @@ -201,10 +215,26 @@ in dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; - dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { }; + dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); + + dotnet-sdk = dotnetCorePackages.sdk_2_1; + + dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; + + dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; + + dotnet-netcore = dotnetCorePackages.netcore_2_1; + + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; + + dumb-init = callPackage ../applications/virtualization/dumb-init {}; + + umoci = callPackage ../applications/virtualization/umoci {}; dispad = callPackage ../tools/X11/dispad { }; + dupeguru = callPackage ../applications/misc/dupeguru { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { }; @@ -234,8 +264,6 @@ in cacert = buildPackages.cacert; }; - fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { }; - fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); @@ -250,10 +278,16 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; + packr = callPackage ../development/libraries/packr { + # 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; + }; pet = callPackage ../development/tools/pet { }; + run = callPackage ../development/tools/run { }; + mod = callPackage ../development/tools/mod { }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -273,9 +307,11 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = import ../build-support/fetchurl { - inherit lib stdenvNoCC; - curl = buildPackages.curl.override rec { + fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform + then buildPackages.fetchurl # No need to do special overrides twice, + else makeOverridable (import ../build-support/fetchurl) { + inherit lib stdenvNoCC buildPackages; + curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -283,6 +319,14 @@ in perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; + coreutils = buildPackages.coreutils.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; + gmp = null; + aclSupport = false; + attrSupport = false; + }; inherit perl; buildPackages = { inherit perl; }; }; @@ -292,7 +336,12 @@ in }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. - gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + # So turn gssSupport off there, and on Windows. + # On other platforms, keep the previous value. + gssSupport = + if stdenv.isDarwin || stdenv.hostPlatform.isWindows + then false + else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; inherit pkgconfig perl openssl; @@ -304,7 +353,7 @@ in c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; - }; + }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -325,6 +374,8 @@ in fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; + fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; + fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; fetchNuGet = callPackage ../build-support/fetchnuget { }; @@ -337,6 +388,8 @@ in inherit url; }; + installShellFiles = callPackage ../build-support/install-shell-files {}; + lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } @@ -362,10 +415,12 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; + ociTools = callPackage ../build-support/oci-tools { }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } @@ -375,6 +430,10 @@ in setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; + shortenPerlShebang = makeSetupHook + { deps = [ dieHook ]; } + ../build-support/setup-hooks/shorten-perl-shebang.sh; + singularity-tools = callPackage ../build-support/singularity-tools { }; srcOnly = args: callPackage ../build-support/src-only args; @@ -415,7 +474,7 @@ in findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = makeSetupHook { - deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ]; + deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -435,8 +494,12 @@ in _0x0 = callPackage ../tools/misc/0x0 { }; + _3llo = callPackage ../tools/misc/3llo { }; + _1password = callPackage ../applications/misc/1password { }; + _6tunnel = callPackage ../tools/networking/6tunnel { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -459,6 +522,8 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; + act = callPackage ../development/tools/misc/act {}; + actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; @@ -492,7 +557,7 @@ in amass = callPackage ../tools/networking/amass { }; - afew = callPackage ../applications/networking/mailreaders/afew { pythonPackages = python3Packages; }; + afew = callPackage ../applications/networking/mailreaders/afew { }; afio = callPackage ../tools/archivers/afio { }; @@ -516,6 +581,8 @@ in airfield = callPackage ../tools/networking/airfield { }; + apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; + airsonic = callPackage ../servers/misc/airsonic { }; airspy = callPackage ../applications/radio/airspy { }; @@ -543,7 +610,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - ammonite = callPackage ../development/tools/ammonite {}; + inherit (callPackages ../development/tools/ammonite {}) + ammonite_2_12 + ammonite_2_13; + ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; amp = callPackage ../applications/editors/amp {}; @@ -555,6 +625,8 @@ in antora = callPackage ../development/tools/documentation/antora {}; + apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -573,7 +645,10 @@ in arandr = callPackage ../tools/X11/arandr { }; - arangodb = callPackage ../servers/nosql/arangodb { }; + inherit (callPackages ../servers/nosql/arangodb { + stdenv = gcc8Stdenv; + }) arangodb_3_3 arangodb_3_4 arangodb_3_5; + arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; @@ -613,10 +688,16 @@ in asciiquarium = callPackage ../applications/misc/asciiquarium {}; asymptote = callPackage ../tools/graphics/asymptote { - texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; + texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; }; gsl = gsl_1; }; + async = callPackage ../development/tools/async {}; + + atheme = callPackage ../servers/irc/atheme { }; + + atinout = callPackage ../tools/networking/atinout { }; + atomicparsley = callPackage ../tools/video/atomicparsley { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -645,15 +726,15 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; iamy = callPackage ../tools/admin/iamy { }; - azure-cli = nodePackages_8_x.azure-cli; + azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; @@ -661,14 +742,20 @@ in awless = callPackage ../tools/virtualization/awless { }; + berglas = callPackage ../tools/admin/berglas/default.nix { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + boxes = callPackage ../tools/text/boxes { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; + ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; + altermime = callPackage ../tools/networking/altermime {}; alttab = callPackage ../tools/X11/alttab { }; @@ -677,7 +764,7 @@ in amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; - daemon = true; + enableDaemon = true; }); amuleGui = appendToName "gui" (amule.override { @@ -687,11 +774,6 @@ in apg = callPackage ../tools/security/apg { }; - apt = callPackage ../tools/package-management/apt { - # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - stdenv = gcc5Stdenv; - }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -700,20 +782,24 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bitwarden = callPackage ../tools/security/bitwarden { }; + + inherit (nodePackages) bitwarden-cli; + bitwarden_rs = callPackage ../tools/security/bitwarden_rs { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; - bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; + boulder = callPackage ../tools/admin/boulder { }; + buildbot = with python3Packages; toPythonApplication buildbot; buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; buildbot-full = with python3Packages; toPythonApplication buildbot-full; @@ -721,6 +807,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + calls = callPackage ../applications/networking/calls { }; + certigo = callPackage ../tools/admin/certigo { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -734,20 +822,34 @@ in cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + cloudflare-wrangler = callPackage ../development/tools/cloudflare-wrangler { }; + + codeql = callPackage ../development/tools/analysis/codeql { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + ccextractor = callPackage ../applications/video/ccextractor { }; + cconv = callPackage ../tools/text/cconv { }; go-check = callPackage ../development/tools/check { }; chkcrontab = callPackage ../tools/admin/chkcrontab { }; + claws = callPackage ../tools/misc/claws { }; + + cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + + codespell = with python3Packages; toPythonApplication codespell; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -762,7 +864,7 @@ in dgsh = callPackage ../shells/dgsh { }; - dkimpy = with pythonPackages; toPythonApplication dkimpy; + dkimpy = with python3Packages; toPythonApplication dkimpy; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; @@ -772,6 +874,8 @@ in elvish = callPackage ../shells/elvish { }; + emplace = callPackage ../tools/package-management/emplace { }; + encryptr = callPackage ../tools/security/encryptr { gconf = gnome2.GConf; }; @@ -780,14 +884,20 @@ in enpass = callPackage ../tools/security/enpass { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; + esh = callPackage ../tools/text/esh { }; ezstream = callPackage ../tools/audio/ezstream { }; + libfx2 = with python3Packages; toPythonApplication fx2; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genymotion = callPackage ../development/mobile/genymotion { }; + gaia = callPackage ../development/libraries/gaia { }; + gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gams = callPackage ../tools/misc/gams (config.gams or {}); @@ -796,14 +906,22 @@ in git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-revise = with python3Packages; toPythonApplication git-revise; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; - gitless = callPackage ../applications/version-management/gitless { }; + github-commenter = callPackage ../development/tools/github-commenter { }; + + gitless = callPackage ../applications/version-management/gitless { python = python3; }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; + gjs = callPackage ../development/libraries/gjs { }; + + glasgow = with python3Packages; toPythonApplication glasgow; + gucci = callPackage ../tools/text/gucci { }; grc = callPackage ../tools/misc/grc { }; @@ -818,6 +936,8 @@ in glyr = callPackage ../tools/audio/glyr { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; + httperf = callPackage ../tools/networking/httperf { }; ili2c = callPackage ../tools/misc/ili2c { }; @@ -828,10 +948,16 @@ in lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + pacparser = callPackage ../tools/networking/pacparser { }; pass = callPackage ../tools/security/pass { }; + pass-wayland = callPackage ../tools/security/pass { + waylandSupport = true; + }; + passExtensions = recurseIntoAttrs pass.extensions; asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; @@ -858,10 +984,14 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + kjv = callPackage ../applications/misc/kjv { }; + luigi = callPackage ../applications/networking/cluster/luigi { }; m-cli = callPackage ../os-specific/darwin/m-cli { }; + pebble = callPackage ../tools/admin/pebble { }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; skhd = callPackage ../os-specific/darwin/skhd { @@ -908,14 +1038,6 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - arc-theme = callPackage ../misc/themes/arc { }; - - arc-kde-theme = callPackage ../misc/themes/arc-kde { }; - - adapta-gtk-theme = callPackage ../misc/themes/adapta { }; - - adapta-kde-theme = callPackage ../misc/themes/adapta-kde { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; inherit (pythonPackages) sphinx; @@ -956,6 +1078,8 @@ in awstats = callPackage ../tools/system/awstats { }; + awsweeper = callPackage ../tools/admin/awsweeper { }; + axel = callPackage ../tools/networking/axel { libssl = openssl; }; @@ -974,6 +1098,10 @@ in backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + bandwhich = callPackage ../tools/networking/bandwhich { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bar = callPackage ../tools/system/bar {}; base16-shell-preview = callPackage ../misc/base16-shell-preview { }; @@ -1008,34 +1136,14 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/5.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) - filebeat5 - heartbeat5 - metricbeat5 - packetbeat5; - - journalbeat5 = callPackage ../tools/system/journalbeat { }; - - inherit (callPackages ../misc/logging/beats/6.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }) + inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 @@ -1060,9 +1168,11 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + bitbucket-cli = python2Packages.bitbucket-cli; - blink = callPackage ../applications/networking/instant-messengers/blink { }; + blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; blockbook = callPackage ../servers/blockbook { }; @@ -1089,22 +1199,24 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; - libtensorflow = callPackage ../development/libraries/libtensorflow { + libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit_9_0; - cudnn = cudnn_cudatoolkit_9_0; + cudatoolkit = cudatoolkit_10_0; + cudnn = cudnn_cudatoolkit_10_0; }; + libtensorflow = + if python.pkgs.tensorflow ? libtensorflow + then python.pkgs.tensorflow.libtensorflow + else libtensorflow-bin; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; bliss = callPackage ../applications/science/math/bliss { }; - blitz = callPackage ../development/libraries/blitz { - boost = boost160; - }; - blobfuse = callPackage ../tools/filesystems/blobfuse { }; blockdiag = with python3Packages; toPythonApplication blockdiag; @@ -1133,8 +1245,6 @@ in boot = callPackage ../development/tools/build-managers/boot { }; - bootchart = callPackage ../tools/system/bootchart { }; - bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; boxfs = callPackage ../tools/filesystems/boxfs { }; @@ -1147,8 +1257,6 @@ in brltty = callPackage ../tools/misc/brltty { }; - bro = callPackage ../applications/networking/ids/bro { }; - brook = callPackage ../tools/networking/brook { }; broot = callPackage ../tools/misc/broot { }; @@ -1168,6 +1276,8 @@ in asciidoc = asciidoc-full; }; + buildpack = callPackage ../development/tools/buildpack { }; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; @@ -1190,17 +1300,21 @@ in buildah = callPackage ../development/tools/buildah { }; + buildkit = callPackage ../development/tools/buildkit { }; + bukubrow = callPackage ../tools/networking/bukubrow { }; burpsuite = callPackage ../tools/networking/burpsuite {}; + bs-platform = callPackage ../development/compilers/bs-platform {}; + c3d = callPackage ../applications/graphics/c3d { inherit (darwin.apple_sdk.frameworks) Cocoa; }; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix) (drv: { + cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: { isLibrary = false; enableSharedExecutables = false; executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; @@ -1223,6 +1337,7 @@ in }); caddy = callPackage ../servers/caddy { }; + caddy2 = callPackage ../servers/caddy/v2.nix { }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1254,6 +1369,8 @@ in cardpeek = callPackage ../applications/misc/cardpeek { }; + cawbird = callPackage ../applications/networking/cawbird { }; + cde = callPackage ../tools/package-management/cde { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -1261,7 +1378,7 @@ in cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { - google-gflags = null; # only required for examples/tests + gflags = null; # only required for examples/tests }; gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; @@ -1272,6 +1389,10 @@ in ccnet = callPackage ../tools/networking/ccnet { }; + cassowary = callPackage ../tools/networking/cassowary { }; + + croc = callPackage ../tools/networking/croc { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille @@ -1290,6 +1411,8 @@ in clac = callPackage ../tools/misc/clac {}; + clash = callPackage ../tools/networking/clash { }; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -1310,13 +1433,19 @@ in clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { }; + consul = callPackage ../servers/consul { + # Version 1.6.0 fails to build with go 1.13 due to broken dependency: + # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" + buildGoPackage = buildGo112Package; + }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; @@ -1324,7 +1453,19 @@ in copyright-update = callPackage ../tools/text/copyright-update { }; - corebird = callPackage ../applications/networking/corebird { }; + inherit (callPackage ../tools/misc/coreboot-utils { }) + msrtool + cbmem + ifdtool + intelmetool + cbfstool + nvramtool + superiotool + ectool + inteltool + amdfwtool + acpidump-all + coreboot-utils; corosync = callPackage ../servers/corosync { }; @@ -1334,9 +1475,11 @@ in chntpw = callPackage ../tools/security/chntpw { }; + clipman = callPackage ../tools/misc/clipman { }; + clipster = callPackage ../tools/misc/clipster { }; - coprthr = callPackage ../development/libraries/coprthr { }; + contrast = callPackage ../applications/accessibility/contrast { }; cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); @@ -1353,6 +1496,10 @@ in colorls = callPackage ../tools/system/colorls { }; + coloursum = callPackage ../tools/text/coloursum { + inherit (darwin.apple_sdk.frameworks) Security; + }; + compsize = callPackage ../os-specific/linux/compsize { }; coturn = callPackage ../servers/coturn { }; @@ -1367,16 +1514,22 @@ in crip = callPackage ../applications/audio/crip { }; + crosvm = callPackage ../applications/virtualization/crosvm { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; + csv2odf = callPackage ../applications/office/csv2odf { }; + csvkit = callPackage ../tools/text/csvkit { }; csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; cucumber = callPackage ../development/tools/cucumber {}; + dabtools = callPackage ../applications/radio/dabtools { }; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -1391,6 +1544,10 @@ in dateutils = callPackage ../tools/misc/dateutils { }; + datovka = libsForQt5.callPackage ../applications/networking/datovka { }; + + dconf = callPackage ../development/libraries/dconf { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; @@ -1423,6 +1580,10 @@ in dibbler = callPackage ../tools/networking/dibbler { }; + diesel-cli = callPackage ../development/tools/diesel-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ding = callPackage ../applications/misc/ding { aspellDicts_de = aspellDicts.de; aspellDicts_en = aspellDicts.en; @@ -1454,9 +1615,9 @@ in doitlive = callPackage ../tools/misc/doitlive { }; - dosage = callPackage ../applications/graphics/dosage { - pythonPackages = python3Packages; - }; + dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; + + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -1466,16 +1627,27 @@ in gtk = gtk3; }; + dsvpn = callPackage ../applications/networking/dsvpn { }; + dtools = callPackage ../development/tools/dtools { }; dtrx = callPackage ../tools/compression/dtrx { }; dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune; + inherit (ocamlPackages) dune dune_2; duperemove = callPackage ../tools/filesystems/duperemove { }; + dvc = callPackage ../applications/version-management/dvc { }; + + dvc-with-remotes = callPackage ../applications/version-management/dvc { + enableGoogle = true; + enableAWS = true; + enableAzure = true; + enableSSH = true; + }; + dylibbundler = callPackage ../tools/misc/dylibbundler { }; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; @@ -1500,6 +1672,8 @@ in elm-github-install = callPackage ../tools/package-management/elm-github-install { }; + elogind = callPackage ../applications/misc/elogind { }; + enca = callPackage ../tools/text/enca { }; ent = callPackage ../tools/misc/ent { }; @@ -1540,6 +1714,8 @@ in fast-cli = nodePackages.fast-cli; + faudio = callPackage ../development/libraries/faudio { }; + fd = callPackage ../tools/misc/fd { }; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; @@ -1548,10 +1724,18 @@ in bison = bison2; }; + fileshare = callPackage ../servers/fileshare {}; + fileshelter = callPackage ../servers/web-apps/fileshelter { }; firecracker = callPackage ../applications/virtualization/firecracker { }; + firectl = callPackage ../applications/virtualization/firectl { }; + + firestarter = callPackage ../applications/misc/firestarter { }; + + fselect = callPackage ../tools/misc/fselect { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1570,6 +1754,8 @@ in fzf = callPackage ../tools/misc/fzf { }; + fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; + fzy = callPackage ../tools/misc/fzy { }; g2o = callPackage ../development/libraries/g2o { }; @@ -1598,6 +1784,8 @@ in gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; + gir-rs = callPackage ../development/tools/gir { }; + gist = callPackage ../tools/text/gist { }; gixy = callPackage ../tools/admin/gixy { }; @@ -1616,18 +1804,22 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { }; + gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; - goa = callPackage ../development/tools/goa { - buildGoPackage = buildGo110Package; + gmic-qt-krita = gmic-qt.override { + variant = "krita"; }; + goa = callPackage ../development/tools/goa { }; + gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; gosu = callPackage ../tools/misc/gosu { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gping = callPackage ../tools/networking/gping { }; greg = callPackage ../applications/audio/greg { @@ -1642,6 +1834,10 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + + gthree = callPackage ../development/libraries/gthree { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1656,6 +1852,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; + home-manager = callPackage ../tools/package-management/home-manager {}; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -1668,15 +1866,23 @@ in icdiff = callPackage ../tools/text/icdiff {}; + ifm = callPackage ../tools/graphics/ifm {}; + interlock = callPackage ../servers/interlock {}; - jellyfin = callPackage ../servers/jellyfin { }; + jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + + jotta-cli = callPackage ../applications/misc/jotta-cli { }; + + jwt-cli = callPackage ../tools/security/jwt-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = with pythonPackages; toPythonApplication klaus; + klaus = with python3Packages; toPythonApplication klaus; lcdproc = callPackage ../servers/monitoring/lcdproc { }; @@ -1712,7 +1918,7 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = pythonPackages.mathics; + mathics = with python2Packages; toPythonApplication mathics; masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; @@ -1720,7 +1926,7 @@ in massren = callPackage ../tools/misc/massren { }; - megasync = callPackage ../applications/misc/megasync { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; meritous = callPackage ../games/meritous { }; @@ -1728,6 +1934,8 @@ in meson = callPackage ../development/tools/build-managers/meson { }; + meson-tools = callPackage ../misc/meson-tools { }; + metabase = callPackage ../servers/metabase { }; mididings = callPackage ../tools/audio/mididings { }; @@ -1738,6 +1946,8 @@ in mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; + monetdb = callPackage ../servers/sql/monetdb { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { @@ -1756,10 +1966,14 @@ in mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; + mq-cli = callPackage ../tools/system/mq-cli { }; nfdump = callPackage ../tools/networking/nfdump { }; + nfstrace = callPackage ../tools/networking/nfstrace { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -1776,12 +1990,20 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; + xkbd = callPackage ../applications/misc/xkbd { }; optar = callPackage ../tools/graphics/optar {}; + pastel = callPackage ../applications/misc/pastel { + inherit (darwin.apple_sdk.frameworks) Security; + }; + patdiff = callPackage ../tools/misc/patdiff { }; pbpst = callPackage ../applications/misc/pbpst { }; @@ -1802,6 +2024,8 @@ in psstop = callPackage ../tools/system/psstop { }; + precice = callPackage ../development/libraries/precice { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; pyCA = python3Packages.callPackage ../applications/video/pyca {}; @@ -1826,12 +2050,18 @@ in snipes = callPackage ../games/snipes { }; + snippetpixie = callPackage ../tools/text/snippetpixie { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; stagit = callPackage ../development/tools/stagit { }; + step-ca = callPackage ../tools/security/step-ca { }; + + step-cli = callPackage ../tools/security/step-cli { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; @@ -1846,6 +2076,8 @@ in rainloop-community rainloop-standard; + rav1e = callPackage ../tools/video/rav1e { }; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; @@ -1854,6 +2086,10 @@ in conf = config.riot-web.conf or null; }; + ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + roundcube = callPackage ../servers/roundcube { }; roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); @@ -1864,24 +2100,22 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken - czmq = czmq3; }; rsyslog-light = rsyslog.override { libkrb5 = null; systemd = null; jemalloc = null; - mysql = null; + libmysqlclient = null; postgresql = null; libdbi = null; - net_snmp = null; + net-snmp = null; libuuid = null; gnutls = null; libgcrypt = null; liblognorm = null; openssl = null; librelp = null; - libgt = null; libksi = null; liblogging = null; libnet = null; @@ -1899,11 +2133,7 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; moosefs = callPackage ../tools/filesystems/moosefs { }; @@ -1957,6 +2187,8 @@ in epubcheck = null; }; + asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { }; + asunder = callPackage ../applications/audio/asunder { }; autossh = callPackage ../tools/networking/autossh { }; @@ -1981,8 +2213,6 @@ in beanstalkd = callPackage ../servers/beanstalkd { }; - beegfs = callPackage ../os-specific/linux/beegfs { }; - beets = callPackage ../tools/audio/beets { pythonPackages = python3Packages; }; @@ -2040,6 +2270,8 @@ in atool = callPackage ../tools/archivers/atool { }; + bash_unit = callPackage ../tools/misc/bash_unit { }; + bsc = callPackage ../tools/compression/bsc { inherit (llvmPackages) openmp; }; @@ -2048,7 +2280,9 @@ in cabextract = callPackage ../tools/archivers/cabextract { }; - cadaver = callPackage ../tools/networking/cadaver { }; + cadaver = callPackage ../tools/networking/cadaver { + openssl = openssl_1_0_2; + }; davix = callPackage ../tools/networking/davix { }; @@ -2078,14 +2312,22 @@ in cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; + cdrtools = callPackage ../tools/cd-dvd/cdrtools { + inherit (darwin.apple_sdk.frameworks) Carbon IOKit; + }; + + isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { }; + mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; libceph = ceph.lib; - ceph = callPackage ../tools/filesystems/ceph { - boost = boost166.override { enablePython = true; }; - }; + inherit (callPackages ../tools/filesystems/ceph { + boost = boost167.override { enablePython = true; python = python37; }; + }) + ceph + ceph-client; ceph-dev = ceph; inherit (callPackages ../tools/security/certmgr { }) @@ -2124,37 +2366,40 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + # Version 0.1.5879 fails to build with go 1.13 due to: + # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found + buildGoModule = buildGo112Module; + }; - citrix_receiver_unwrapped = callPackage ../applications/networking/remote/citrix-receiver { }; - citrix_receiver_unwrapped_13_10_0 = citrix_receiver_unwrapped.override { version = "13.10.0"; }; - citrix_receiver_unwrapped_13_9_1 = citrix_receiver_unwrapped.override { version = "13.9.1"; }; - citrix_receiver_unwrapped_13_9_0 = citrix_receiver_unwrapped.override { version = "13.9.0"; }; - citrix_receiver_unwrapped_13_8_0 = citrix_receiver_unwrapped.override { version = "13.8.0"; }; + circus = callPackage ../tools/networking/circus { }; - citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped; - }; - citrix_receiver_13_10_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_10_0; - }; - citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_9_1; - }; - citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_9_0; - }; - citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_8_0; - }; + # Cleanup before 20.03: + citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; + citrix_receiver_13_10_0 = citrix_receiver; + citrix_receiver_13_9_1 = citrix_receiver; + citrix_receiver_13_9_0 = citrix_receiver; + citrix_receiver_13_8_0 = citrix_receiver; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; + citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; + citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_12_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_12_0; + }; + citrix_workspace_19_10_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_10_0; + }; + citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_8_0; + }; citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_6_0; }; @@ -2166,7 +2411,9 @@ in cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - codimd = callPackage ../servers/web-apps/codimd { }; + codimd = callPackage ../servers/web-apps/codimd { + nodejs = nodejs-10_x; + }; colord = callPackage ../tools/misc/colord { }; @@ -2225,6 +2472,10 @@ in anthy = callPackage ../tools/inputmethods/anthy { }; + evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; + libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { @@ -2248,9 +2499,7 @@ in libkkc = callPackage ../tools/inputmethods/libkkc { }; - ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf; - }; + ibus = callPackage ../tools/inputmethods/ibus { }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -2265,15 +2514,13 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; - table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { - inherit (gnome3) dconf; - }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { ibus-table = ibus-engines.table; @@ -2292,15 +2539,15 @@ in }; }; - ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { - inherit (gnome3) dconf; - }; + ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { }; interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; + age = callPackage ../tools/security/age { }; + brotli = callPackage ../tools/compression/brotli { }; biosdevname = callPackage ../tools/networking/biosdevname { }; @@ -2375,7 +2622,8 @@ in cron = callPackage ../tools/system/cron { }; - inherit (callPackages ../development/compilers/cudatoolkit { }) + cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); + inherit (cudaPackages) cudatoolkit_6 cudatoolkit_6_5 cudatoolkit_7 @@ -2386,11 +2634,13 @@ in cudatoolkit_9_1 cudatoolkit_9_2 cudatoolkit_10 - cudatoolkit_10_0; + cudatoolkit_10_0 + cudatoolkit_10_1; - cudatoolkit = cudatoolkit_9; + cudatoolkit = cudatoolkit_10; - inherit (callPackages ../development/libraries/science/math/cudnn { }) + cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; + inherit (cudnnPackages) cudnn_cudatoolkit_7 cudnn_cudatoolkit_7_5 cudnn6_cudatoolkit_8 @@ -2400,9 +2650,10 @@ in cudnn_cudatoolkit_9_1 cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_10 - cudnn_cudatoolkit_10_0; + cudnn_cudatoolkit_10_0 + cudnn_cudatoolkit_10_1; - cudnn = cudnn_cudatoolkit_9; + cudnn = cudnn_cudatoolkit_10; curlFull = curl.override { idnSupport = true; @@ -2413,7 +2664,13 @@ in curl = callPackage ../tools/networking/curl { }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; + + curlie = callPackage ../tools/networking/curlie { + # Version 1.2.0 fails to build with go 1.13 due to: + # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused + buildGoModule = buildGo112Module; + }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -2428,6 +2685,8 @@ in dadadodo = callPackage ../tools/text/dadadodo { }; + daemon = callPackage ../tools/system/daemon { }; + daemonize = callPackage ../tools/system/daemonize { }; daq = callPackage ../applications/networking/ids/daq { }; @@ -2496,17 +2755,13 @@ in dev86 = callPackage ../development/compilers/dev86 { }; - diskrsync = callPackage ../tools/backup/diskrsync { - buildGoPackage = buildGo110Package; - }; + diskrsync = callPackage ../tools/backup/diskrsync { }; djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; - dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { - buildGoPackage = buildGo110Package; - }; + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -2514,6 +2769,8 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsperf = callPackage ../tools/networking/dnsperf { }; dnsrecon = callPackage ../tools/security/dnsrecon { }; @@ -2536,6 +2793,10 @@ in jdk = jdk8; }; + diffr = callPackage ../tools/text/diffr { + inherit (darwin.apple_sdk.frameworks) Security; + }; + diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { }; @@ -2564,7 +2825,9 @@ in dmd = callPackage ../development/compilers/dmd { }; - dmg2img = callPackage ../tools/misc/dmg2img { }; + dmg2img = callPackage ../tools/misc/dmg2img { + openssl = openssl_1_0_2; + }; docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; @@ -2587,7 +2850,7 @@ in dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; - dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -2691,19 +2954,33 @@ in mcrcon = callPackage ../tools/networking/mcrcon {}; + rage = callPackage ../tools/security/rage { + inherit (darwin.apple_sdk.frameworks) Security; + }; + s-tar = callPackage ../tools/archivers/s-tar {}; sonota = callPackage ../tools/misc/sonota { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - tealdeer = callPackage ../tools/misc/tealdeer { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + + tealdeer = callPackage ../tools/misc/tealdeer { + inherit (darwin.apple_sdk.frameworks) Security; + }; teamocil = callPackage ../tools/misc/teamocil { }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; + trac = pythonPackages.callPackage ../tools/misc/trac { }; + + tracker = callPackage ../development/libraries/tracker { }; + + tracker-miners = callPackage ../development/libraries/tracker-miners { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -2712,18 +2989,29 @@ in uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { inherit (pythonPackages) sphinx; + inherit (darwin.apple_sdk.frameworks) Security; }; + volctl = callPackage ../tools/audio/volctl { }; + wallutils = callPackage ../tools/graphics/wallutils { }; + wev = callPackage ../tools/misc/wev { }; + wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; + wob = callPackage ../tools/misc/wob { }; + + xob = callPackage ../tools/X11/xob { }; + z-lua = callPackage ../tools/misc/z-lua { }; zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zeek = callPackage ../applications/networking/ids/zeek { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN @@ -2753,13 +3041,10 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.16"; - elk6Version = "6.7.2"; - elk7Version = "7.0.1"; + # When updating make sure to update all plugins or they will break! + elk6Version = "6.8.3"; + elk7Version = "7.5.1"; - elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { - utillinux = utillinuxMinimal; - }; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; }; @@ -2782,9 +3067,6 @@ in elasticsearch = elasticsearch-oss; } ); - elasticsearch5Plugins = elasticsearchPlugins.override { - elasticsearch = elasticsearch5; - }; elasticsearch6Plugins = elasticsearchPlugins.override { elasticsearch = elasticsearch6-oss; }; @@ -2792,24 +3074,9 @@ in elasticsearch = elasticsearch7-oss; }; - elasticsearch-curator = with (python3.override { - packageOverrides = self: super: { - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "6.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; - }; - }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.12"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr"; - }; - }); - }; - }).pkgs; toPythonApplication elasticsearch-curator; + elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { + python = python3; + }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; @@ -2821,9 +3088,7 @@ in endlessh = callPackage ../servers/endlessh { }; - cryfs = callPackage ../tools/filesystems/cryfs { - spdlog = spdlog_0; - }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -2831,11 +3096,9 @@ in enscript = callPackage ../tools/text/enscript { }; - entr = callPackage ../tools/misc/entr { }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; - envoy = callPackage ../tools/networking/envoy { - bazel = bazel_0_4; - }; + entr = callPackage ../tools/misc/entr { }; eot_utilities = callPackage ../tools/misc/eot-utilities { }; @@ -2849,9 +3112,13 @@ in inherit (pythonPackages) buildPythonApplication pygtk numpy; }; + etcher = callPackage ../tools/misc/etcher { }; + ethtool = callPackage ../tools/misc/ethtool { }; - ettercap = callPackage ../applications/networking/sniffers/ettercap { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { + openssl = openssl_1_0_2; + }; euca2ools = callPackage ../tools/virtualization/euca2ools { }; @@ -2861,6 +3128,8 @@ in evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; + eva = callPackage ../tools/misc/eva { }; + exa = callPackage ../tools/misc/exa { }; exempi = callPackage ../development/libraries/exempi { @@ -2869,14 +3138,14 @@ in execline = skawarePackages.execline; + executor = with python3Packages; toPythonApplication executor; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/altcoins/exodus { }; - ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -2928,10 +3197,10 @@ in m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; - mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { + mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; @@ -2947,9 +3216,7 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - fcppt = callPackage ../development/libraries/fcppt { - stdenv = gcc8Stdenv; - }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -2969,7 +3236,9 @@ in flannel = callPackage ../tools/networking/flannel { }; - flare = callPackage ../games/flare { }; + flare = callPackage ../games/flare { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; flashbench = callPackage ../os-specific/linux/flashbench { }; @@ -2978,7 +3247,6 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; fltrdr = callPackage ../tools/misc/fltrdr { - stdenv = gcc8Stdenv; icu = icu63; }; @@ -2986,6 +3254,12 @@ in stdenv = gccStdenv; }; + fluidasserts = with python37Packages; toPythonApplication fluidasserts; + + flux = callPackage ../development/compilers/flux { }; + + fido2luks = callPackage ../tools/security/fido2luks {}; + fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; @@ -3000,6 +3274,10 @@ in filet = callPackage ../applications/misc/filet { }; + findomain = callPackage ../tools/networking/findomain { + inherit (darwin.apple_sdk.frameworks) Security; + }; + findutils = callPackage ../tools/misc/findutils { }; finger_bsd = callPackage ../tools/networking/bsd-finger { }; @@ -3048,6 +3326,8 @@ in fbv = callPackage ../tools/graphics/fbv { }; + fbvnc = callPackage ../tools/admin/fbvnc {}; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -3062,6 +3342,7 @@ in fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + python = python3; }); fontforge-gtk = fontforge.override { withSpiro = true; @@ -3098,9 +3379,6 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-thinkpad = fprintd.override { - thinkpad = true; - }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -3116,7 +3394,7 @@ in freetds = callPackage ../development/libraries/freetds { }; - frescobaldi = callPackage ../misc/frescobaldi {}; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; @@ -3188,6 +3466,11 @@ in inherit (darwin) locale; }; + gawk-with-extensions = callPackage ../tools/text/gawk/gawk-with-extensions.nix { + extensions = gawkextlib.full; + }; + gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; + gawkInteractive = appendToName "interactive" (gawk.override { interactive = true; }); @@ -3221,6 +3504,8 @@ in gdmap = callPackage ../tools/system/gdmap { }; + gelasio = callPackage ../data/fonts/gelasio { }; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -3251,11 +3536,19 @@ in gifski = callPackage ../tools/graphics/gifski { }; + git-backup = callPackage ../applications/version-management/git-backup { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { + # Version 2.8.0 fails with go1.13 + # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; @@ -3265,7 +3558,9 @@ in git-sizer = callPackage ../applications/version-management/git-sizer { }; - git-up = callPackage ../applications/version-management/git-up { }; + git-up = callPackage ../applications/version-management/git-up { + pythonPackages = python3Packages; + }; gitfs = callPackage ../tools/filesystems/gitfs { }; @@ -3316,14 +3611,16 @@ in gnirehtet = callPackage ../tools/networking/gnirehtet { }; - gnome15 = callPackage ../applications/misc/gnome15 { - inherit (gnome2) gnome_python gnome_python_desktop; - }; - gnome-builder = callPackage ../applications/editors/gnome-builder { }; + gnome-keysign = callPackage ../tools/security/gnome-keysign { }; + gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { + gegl = gegl_0_4; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -3346,13 +3643,17 @@ in gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + guiSupport = stdenv.isDarwin; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg22; + gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -3392,17 +3693,23 @@ in google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = python2.pkgs.google-cloud-sdk; - google-cloud-sdk-gce = python2.pkgs.google-cloud-sdk-gce; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; google-fonts = callPackage ../data/fonts/google-fonts { }; + google-clasp = callPackage ../development/misc/google-clasp { }; + google-compute-engine = python2.pkgs.google-compute-engine; google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + + gopro = callPackage ../tools/video/gopro { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -3453,6 +3760,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ripgrep-all = callPackage ../tools/text/ripgrep-all { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -3473,7 +3784,9 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { }; + grpcui = callPackage ../tools/networking/grpcui { + buildGoModule = buildGo112Module; + }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; @@ -3514,6 +3827,8 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; + gsmlib = callPackage ../development/libraries/gsmlib { }; + gssdp = callPackage ../development/libraries/gssdp { }; gt5 = callPackage ../tools/system/gt5 { }; @@ -3537,7 +3852,9 @@ in gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; - gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gtmess = callPackage ../applications/networking/instant-messengers/gtmess { + openssl = openssl_1_0_2; + }; gup = callPackage ../development/tools/build-managers/gup {}; @@ -3551,7 +3868,9 @@ in gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; - gvpe = callPackage ../tools/networking/gvpe { }; + gvpe = callPackage ../tools/networking/gvpe { + openssl = openssl_1_0_2; + }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -3567,12 +3886,16 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; + pgformatter = callPackage ../development/tools/pgformatter { }; + pgloader = callPackage ../development/tools/pgloader { }; pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; + plplot = callPackage ../development/libraries/plplot { }; + pxattr = callPackage ../tools/archivers/pxattr { }; pxz = callPackage ../tools/compression/pxz { }; @@ -3608,13 +3931,15 @@ in hash-slinger = callPackage ../tools/security/hash-slinger { }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; + hal-flash = callPackage ../os-specific/linux/hal-flash { }; half = callPackage ../development/libraries/half { }; halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; }; + halide = callPackage ../development/compilers/halide { }; ham = pkgs.perlPackages.ham; @@ -3697,8 +4022,6 @@ in highlight = callPackage ../tools/text/highlight ({ lua = lua5; - } // lib.optionalAttrs stdenv.isDarwin { - inherit (llvmPackages_38) stdenv; }); holochain-go = callPackage ../servers/holochain-go { }; @@ -3739,19 +4062,23 @@ in hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; + humanfriendly = with python3Packages; toPythonApplication humanfriendly; + hwinfo = callPackage ../tools/system/hwinfo { }; - hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { + stdenv = gcc8Stdenv; + }; hylafaxplus = callPackage ../servers/hylafaxplus { }; + hyphen = callPackage ../development/libraries/hyphen { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd { - boost = boost165; - }; + i2pd = callPackage ../tools/networking/i2pd { }; i-score = libsForQt5.callPackage ../applications/audio/i-score { }; @@ -3781,10 +4108,11 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { - stdenv = llvmPackages_38.libcxxStdenv; - libcxx = llvmPackages_38.libcxx; + stdenv = llvmPackages.libcxxStdenv; + libcxx = llvmPackages.libcxx; boost = boost160.override { inherit stdenv; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; }) @@ -3813,7 +4141,9 @@ in packages = config.ihaskell.packages or (self: []); }; - imapproxy = callPackage ../tools/networking/imapproxy { }; + imapproxy = callPackage ../tools/networking/imapproxy { + openssl = openssl_1_0_2; + }; imapsync = callPackage ../tools/networking/imapsync { }; @@ -3829,8 +4159,6 @@ in inetutils = callPackage ../tools/networking/inetutils { }; - infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; - inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -3843,7 +4171,9 @@ in intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; - intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + intecture-cli = callPackage ../tools/admin/intecture/cli.nix { + openssl = openssl_1_0_2; + }; intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; @@ -3871,15 +4201,20 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + # Version 0.4.22 fails to build with go 1.13 due to version validation: + # 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; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; - ipget = callPackage ../applications/networking/ipget { - buildGoPackage = buildGo110Package; - }; + ipget = callPackage ../applications/networking/ipget { }; - ipmitool = callPackage ../tools/system/ipmitool { }; + ipmitool = callPackage ../tools/system/ipmitool { + openssl = openssl_1_0_2; + }; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -3891,6 +4226,8 @@ in netmask = callPackage ../tools/networking/netmask {}; + ipscan = callPackage ../tools/security/ipscan { }; + ipv6calc = callPackage ../tools/networking/ipv6calc {}; ipxe = callPackage ../tools/misc/ipxe { }; @@ -3909,6 +4246,8 @@ in isync = callPackage ../tools/networking/isync { }; + ix = callPackage ../tools/misc/ix { }; + jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { }; @@ -3966,12 +4305,16 @@ in jpeg-archive = callPackage ../applications/graphics/jpeg-archive { }; + jpegexiforient = callPackage ../tools/graphics/jpegexiforient { }; + jpeginfo = callPackage ../applications/graphics/jpeginfo { }; jpegoptim = callPackage ../applications/graphics/jpegoptim { }; jpegrescan = callPackage ../applications/graphics/jpegrescan { }; + jpylyzer = with python3Packages; toPythonApplication jpylyzer; + jq = callPackage ../development/tools/jq { }; jo = callPackage ../development/tools/jo { }; @@ -3984,6 +4327,8 @@ in jsduck = callPackage ../development/tools/jsduck { }; + jtc = callPackage ../development/tools/jtc { }; + jumpapp = callPackage ../tools/X11/jumpapp {}; jucipp = callPackage ../applications/editors/jucipp { }; @@ -4007,7 +4352,7 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; - kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { }; + kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { }; @@ -4017,12 +4362,12 @@ in kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; - keepalived = callPackage ../tools/networking/keepalived { }; kexectools = callPackage ../os-specific/linux/kexectools { }; + keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; + kexpand = callPackage ../development/tools/kexpand { }; keybase = callPackage ../tools/security/keybase { @@ -4042,7 +4387,6 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -4058,6 +4402,8 @@ in klick = callPackage ../applications/audio/klick { }; + klystrack = callPackage ../applications/audio/klystrack { }; + knockknock = callPackage ../tools/security/knockknock { }; kore = callPackage ../development/web/kore { }; @@ -4098,6 +4444,8 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; + lefthook = gitAndTools.lefthook; + lego = callPackage ../tools/admin/lego { }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4124,6 +4472,8 @@ in libsmi = callPackage ../development/libraries/libsmi { }; + licensor = callPackage ../tools/misc/licensor { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { @@ -4142,7 +4492,6 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; @@ -4175,11 +4524,17 @@ in kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; + ma1sd = callPackage ../servers/ma1sd { }; + mailcatcher = callPackage ../development/web/mailcatcher { }; makebootfat = callPackage ../tools/misc/makebootfat { }; - matrix-synapse = callPackage ../servers/matrix-synapse { }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails + (https://github.com/NixOS/nixpkgs/issues/76093) */ + matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; + + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); @@ -4191,10 +4546,17 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdcat = callPackage ../tools/text/mdcat { + inherit (darwin.apple_sdk.frameworks) Security; + inherit (pythonPackages) ansi2html; + }; + medfile = callPackage ../development/libraries/medfile { }; memtester = callPackage ../tools/system/memtester { }; + mhonarc = perlPackages.MHonArc; + minergate = callPackage ../applications/misc/minergate { }; minergate-cli = callPackage ../applications/misc/minergate-cli { }; @@ -4247,6 +4609,8 @@ in libparserutils = callPackage ../applications/misc/netsurf/libparserutils { }; + libnslog = callPackage ../applications/misc/netsurf/libnslog { }; + libcss = callPackage ../applications/misc/netsurf/libcss { }; libhubbub = callPackage ../applications/misc/netsurf/libhubbub { }; @@ -4261,6 +4625,10 @@ in libnsutils = callPackage ../applications/misc/netsurf/libnsutils { }; + libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { }; + + libnspsl = callPackage ../applications/misc/netsurf/libnspsl { }; + libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { }; browser = callPackage ../applications/misc/netsurf/browser { }; @@ -4271,6 +4639,10 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + next = callPackage ../applications/networking/browsers/next { }; + + nfpm = callPackage ../tools/package-management/nfpm { }; + nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; ninka = callPackage ../development/tools/misc/ninka { }; @@ -4281,34 +4653,27 @@ in nodejs-slim = nodejs-slim-10_x; - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; - nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1; - }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; - openssl = openssl_1_1; }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { - openssl = openssl_1_1; - }; - nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { + nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; + nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; - openssl = openssl_1_1; - }; - nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { - openssl = openssl_1_1; }; - nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { + nodejs-13_x = callPackage ../development/web/nodejs/v13.nix { }; + nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { enableNpm = false; - openssl = openssl_1_1; }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-12_x; - nodejs-slim_latest = nodejs-slim-12_x; + nodejs_latest = nodejs-13_x; + nodejs-slim_latest = nodejs-slim-13_x; + + nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix { + nodejs = pkgs.nodejs-13_x; + }); nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix { nodejs = pkgs.nodejs-12_x; @@ -4318,21 +4683,13 @@ in nodejs = pkgs.nodejs-10_x; }); - nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix { - nodejs = pkgs.nodejs-8_x; - }); - nodePackages = nodePackages_10_x; - npm2nix = nodePackages.npm2nix; - now-cli = callPackage ../development/web/now-cli {}; file-rename = callPackage ../tools/filesystems/file-rename { }; - kea = callPackage ../tools/networking/kea { - boost = boost165; - }; + kea = callPackage ../tools/networking/kea { }; ispell = callPackage ../tools/text/ispell {}; @@ -4348,9 +4705,7 @@ in ldapvi = callPackage ../tools/misc/ldapvi { }; - ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1; - }; + ldns = callPackage ../development/libraries/ldns { }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -4362,6 +4717,8 @@ in lftp = callPackage ../tools/networking/lftp { }; + libck = callPackage ../development/libraries/libck { }; + libconfig = callPackage ../development/libraries/libconfig { }; libcmis = callPackage ../development/libraries/libcmis { }; @@ -4374,6 +4731,8 @@ in libevdev = callPackage ../development/libraries/libevdev { }; + libevdevplus = callPackage ../development/libraries/libevdevplus { }; + libfann = callPackage ../development/libraries/libfann { }; libfsm = callPackage ../development/libraries/libfsm { }; @@ -4388,6 +4747,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libisds = callPackage ../development/libraries/libisds { }; + libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { @@ -4400,8 +4761,12 @@ in libr3 = callPackage ../development/libraries/libr3 { }; + libraspberrypi = callPackage ../development/libraries/libraspberrypi { }; + libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; + libspf2 = callPackage ../development/libraries/libspf2 { }; + libsrs2 = callPackage ../development/libraries/libsrs2 { }; libtermkey = callPackage ../development/libraries/libtermkey { }; @@ -4422,7 +4787,7 @@ in libmongo-client = callPackage ../development/libraries/libmongo-client { }; - libmesode = callPackage ../development/libraries/libmesode { }; + libmesode = callPackage ../development/libraries/libmesode {}; libnabo = callPackage ../development/libraries/libnabo { }; @@ -4454,7 +4819,10 @@ in librest = callPackage ../development/libraries/librest { }; - libwebsockets = callPackage ../development/libraries/libwebsockets { }; + inherit (callPackages ../development/libraries/libwebsockets { }) + libwebsockets_3_1 + libwebsockets_3_2 + libwebsockets; lidarr = callPackage ../servers/lidarr { }; @@ -4496,6 +4864,8 @@ in ltris = callPackage ../games/ltris { }; + lv = callPackage ../tools/text/lv { }; + lxc = callPackage ../os-specific/linux/lxc { }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; @@ -4546,23 +4916,20 @@ in mairix = callPackage ../tools/text/mairix { }; - makemkv = callPackage ../applications/video/makemkv { }; + makemkv = libsForQt5.callPackage ../applications/video/makemkv { }; makerpm = callPackage ../development/tools/makerpm { }; makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; - # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because - # it looks like gnulib is broken on non-linux, so it seems likely that this would cause - # trouble on bsd and/or cygwin as well. - man = if stdenv.isLinux then man-db else man-old; - - man-old = callPackage ../tools/misc/man { }; + man = man-db; man-db = callPackage ../tools/misc/man-db { }; mandoc = callPackage ../tools/misc/mandoc { }; + marktext = callPackage ../applications/misc/marktext { }; + mawk = callPackage ../tools/text/mawk { }; mb2md = callPackage ../tools/text/mb2md { }; @@ -4583,6 +4950,8 @@ in }; }; + mediawiki = callPackage ../servers/web-apps/mediawiki { }; + memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; @@ -4643,9 +5012,7 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoPackage = buildGo110Package; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -4668,11 +5035,7 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + mirrorbits = callPackage ../servers/mirrorbits { }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; @@ -4716,8 +5079,6 @@ in mosh = callPackage ../tools/networking/mosh { }; - motuclient = callPackage ../applications/science/misc/motu-client { }; - mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; @@ -4726,6 +5087,8 @@ in mr = callPackage ../applications/version-management/mr { }; + mrsh = callPackage ../shells/mrsh { }; + mrtg = callPackage ../tools/misc/mrtg { }; mscgen = callPackage ../tools/graphics/mscgen { }; @@ -4740,11 +5103,15 @@ in mtr = callPackage ../tools/networking/mtr {}; + mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; + mtx = callPackage ../tools/backup/mtx {}; mt-st = callPackage ../tools/backup/mt-st {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { + multitime = callPackage ../tools/misc/multitime { }; + + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; libbtree = callPackage ../tools/text/multitran/libbtree { }; @@ -4778,8 +5145,6 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; - nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -4798,6 +5163,12 @@ in ndppd = callPackage ../applications/networking/ndppd { }; + nebula = callPackage ../tools/networking/nebula { }; + + nemiver = callPackage ../development/tools/nemiver { }; + + neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -4895,7 +5266,9 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { + buildGoPackage = buildGo112Package; + }; notable = callPackage ../applications/misc/notable { }; @@ -4903,8 +5276,12 @@ in milu = callPackage ../applications/misc/milu { }; + mkgmap = callPackage ../applications/misc/mkgmap { }; + mpack = callPackage ../tools/networking/mpack { }; + mtm = callPackage ../tools/misc/mtm { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; @@ -4923,7 +5300,7 @@ in niff = callPackage ../tools/package-management/niff { }; - nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { }; + nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; @@ -4953,9 +5330,10 @@ in nnn = callPackage ../applications/misc/nnn { }; - notary = callPackage ../tools/security/notary { - buildGoPackage = buildGo110Package; - }; + + noise-repellent = callPackage ../applications/audio/noise-repellent { }; + + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5032,6 +5410,8 @@ in offlineimap = callPackage ../tools/networking/offlineimap { }; + ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { }; @@ -5042,6 +5422,11 @@ in omping = callPackage ../applications/networking/omping { }; + onefetch = callPackage ../tools/misc/onefetch { + inherit (darwin) libresolv; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; @@ -5096,7 +5481,12 @@ in pam = if stdenv.isLinux then pam else null; }; - openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { + hpnSupport = true; + # the hpn patchset does not yet support openssl>1.0.2 + # https://github.com/rapier1/openssh-portable/issues/14 + openssl = openssl_1_0_2; + }); openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { withGssapiPatches = true; @@ -5108,7 +5498,7 @@ in opentsdb = callPackage ../tools/misc/opentsdb {}; - openvpn = callPackage ../tools/networking/openvpn { }; + openvpn = callPackage ../tools/networking/openvpn {}; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -5116,16 +5506,24 @@ in stdenv = clangStdenv; }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; + oppai-ng = callPackage ../tools/misc/oppai-ng { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; + update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; + opae = callPackage ../development/libraries/opae { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { }; + openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; }; @@ -5136,18 +5534,24 @@ in opn2bankeditor = callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; + orangefs = callPackage ../tools/filesystems/orangefs { }; + os-prober = callPackage ../tools/misc/os-prober {}; osl = callPackage ../development/compilers/osl { }; ossec = callPackage ../tools/security/ossec {}; + osslsigncode = callPackage ../development/tools/osslsigncode {}; + ostree = callPackage ../tools/misc/ostree { }; otfcc = callPackage ../tools/misc/otfcc { }; otpw = callPackage ../os-specific/linux/otpw { }; + overcommit = callPackage ../development/tools/overcommit { }; + overmind = callPackage ../applications/misc/overmind { }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; @@ -5168,7 +5572,7 @@ in pacman = callPackage ../tools/package-management/pacman { }; - padthv1 = callPackage ../applications/audio/padthv1 { }; + padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; pagmo2 = callPackage ../development/libraries/pagmo2 { }; @@ -5183,8 +5587,6 @@ in pamtester = callPackage ../tools/security/pamtester { }; - paper-gtk-theme = callPackage ../misc/themes/paper { }; - paperless = callPackage ../applications/office/paperless { }; paperwork = callPackage ../applications/office/paperwork { }; @@ -5229,7 +5631,10 @@ in pngout = callPackage ../tools/graphics/pngout { }; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; }; + ipsecTools = callPackage ../os-specific/linux/ipsec-tools { + flex = flex_2_5_35; + openssl = openssl_1_0_2; + }; patch = gnupatch; @@ -5280,6 +5685,8 @@ in jbig2enc = callPackage ../tools/graphics/jbig2enc { }; + pdfarranger = callPackage ../applications/misc/pdfarranger { }; + pdfread = callPackage ../tools/graphics/pdfread { inherit (pythonPackages) pillow; }; @@ -5290,7 +5697,9 @@ in libusb = libusb1; }; - bully = callPackage ../tools/networking/bully { }; + bully = callPackage ../tools/networking/bully { + openssl = openssl_1_0_2; + }; pcapc = callPackage ../tools/networking/pcapc { }; @@ -5298,6 +5707,10 @@ in peco = callPackage ../tools/text/peco { }; + pg_checksums = callPackage ../development/tools/database/pg_checksums { }; + + pg_flame = callPackage ../tools/misc/pg_flame { }; + pg_top = callPackage ../tools/misc/pg_top { }; pgcenter = callPackage ../tools/misc/pgcenter { }; @@ -5309,36 +5722,23 @@ in ssh = openssh; }; + pfetch = callPackage ../tools/misc/pfetch { }; + pfstools = callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; phodav = callPackage ../tools/networking/phodav { }; - pinentry = callPackage ../tools/security/pinentry { + pinentry = libsForQt5.callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; - gcr = null; - }; - - pinentry_ncurses = res.pinentry.override { - gtk2 = null; - }; - - pinentry_emacs = res.pinentry.override { - enableEmacs = true; - }; - - pinentry_gnome = res.pinentry.override { - inherit gcr; - }; - - pinentry_qt4 = res.pinentry.override { - qt = qt4; }; - pinentry_qt5 = res.pinentry.override { - qt = qt5.qtbase; - }; + pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); + pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); + pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); + pinentry-gnome = (stdenv.lib.getOutput "gnome3" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -5375,6 +5775,8 @@ in plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; + tab = callPackage ../tools/text/tab { }; + tautulli = callPackage ../servers/tautulli { python = python2; }; ploticus = callPackage ../tools/graphics/ploticus { @@ -5409,6 +5811,8 @@ in podman = callPackage ../applications/virtualization/podman { }; + podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { }; @@ -5417,6 +5821,8 @@ in polkit_gnome = callPackage ../tools/security/polkit-gnome { }; + poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; + polysh = callPackage ../tools/networking/polysh { }; ponysay = callPackage ../tools/misc/ponysay { }; @@ -5431,12 +5837,16 @@ in ppl = callPackage ../development/libraries/ppl { }; + pplatex = callPackage ../tools/typesetting/tex/pplatex { }; + ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp {}; pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -5453,11 +5863,14 @@ in prototypejs = callPackage ../development/libraries/prototypejs { }; - proxmark3 = callPackage ../tools/security/proxmark3 { }; + inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) + proxmark3 proxmark3-unstable; proxychains = callPackage ../tools/networking/proxychains { }; - proxytunnel = callPackage ../tools/misc/proxytunnel { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { + openssl = openssl_1_0_2; + }; pws = callPackage ../tools/misc/pws { }; @@ -5465,6 +5878,8 @@ in pastebinit = callPackage ../tools/misc/pastebinit { }; + pmacct = callPackage ../tools/networking/pmacct { }; + polygraph = callPackage ../tools/networking/polygraph { }; progress = callPackage ../tools/misc/progress { }; @@ -5493,9 +5908,11 @@ in pwgen = callPackage ../tools/security/pwgen { }; + pwgen-secure = callPackage ../tools/security/pwgen-secure { }; + pwnat = callPackage ../tools/networking/pwnat { }; - pwndbg = python3Packages.callPackage ../development/tools/misc/pwndbg { }; + pwndbg = callPackage ../development/tools/misc/pwndbg { }; pycangjie = pythonPackages.pycangjie; @@ -5503,12 +5920,10 @@ in pydf = callPackage ../applications/misc/pydf { }; - pygmentex = callPackage ../tools/typesetting/pygmentex { }; + pympress = callPackage ../applications/office/pympress { }; pythonIRClib = pythonPackages.pythonIRClib; - pythonSexy = pythonPackages.libsexy; - pyditz = callPackage ../applications/misc/pyditz { pythonPackages = python27Packages; }; @@ -5533,7 +5948,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; @@ -5541,15 +5956,18 @@ in ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; + qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; qastools = libsForQt5.callPackage ../tools/audio/qastools { }; qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { }; - qgrep = callPackage ../tools/text/qgrep {}; + qgrep = callPackage ../tools/text/qgrep { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; + }; qhull = callPackage ../development/libraries/qhull { }; @@ -5569,6 +5987,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickjs = callPackage ../development/interpreters/quickjs { }; + quickserve = callPackage ../tools/networking/quickserve { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -5579,6 +5999,8 @@ in qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; @@ -5609,6 +6031,8 @@ in rc = callPackage ../shells/rc { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; + rdma-core = callPackage ../os-specific/linux/rdma-core { }; react-native-debugger = callPackage ../development/tools/react-native-debugger { }; @@ -5617,13 +6041,14 @@ in redir = callPackage ../tools/networking/redir { }; - redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; }; # failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now - redmine_4 = callPackage ../applications/version-management/redmine/4.x { ruby = pkgs.ruby_2_5; }; + redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_5; }; redsocks = callPackage ../tools/networking/redsocks { }; - retext = callPackage ../applications/editors/retext { }; + reredirect = callPackage ../tools/misc/reredirect { }; + + retext = libsForQt5.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -5638,15 +6063,7 @@ in reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; - recordmydesktop = callPackage ../applications/video/recordmydesktop { }; - - gtk-recordmydesktop = callPackage ../applications/video/recordmydesktop/gtk.nix { - jack2 = jack2Full; - }; - - qt-recordmydesktop = callPackage ../applications/video/recordmydesktop/qt.nix { - jack2 = jack2Full; - }; + rx = callPackage ../applications/graphics/rx { }; qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; @@ -5690,7 +6107,7 @@ in reptyr = callPackage ../os-specific/linux/reptyr {}; - rescuetime = callPackage ../applications/misc/rescuetime { }; + rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; reuse = callPackage ../tools/package-management/reuse { }; @@ -5717,6 +6134,8 @@ in rng-tools = callPackage ../tools/security/rng-tools { }; + rnnoise = callPackage ../development/libraries/rnnoise { }; + rnv = callPackage ../tools/text/xml/rnv { }; rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { }; @@ -5725,7 +6144,9 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { }; + rq = callPackage ../development/tools/rq { + inherit (darwin) libiconv; + }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -5765,12 +6186,20 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { }; + runelite = callPackage ../games/runelite { + jre = openjdk11; + }; runningx = callPackage ../tools/X11/runningx { }; + rund = callPackage ../development/tools/rund { }; + runzip = callPackage ../tools/archivers/runzip { }; + ruplacer = callPackage ../tools/text/ruplacer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rw = callPackage ../tools/misc/rw { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -5797,8 +6226,6 @@ in s6-portable-utils = skawarePackages.s6-portable-utils; - sablotron = callPackage ../tools/text/xml/sablotron { }; - safecopy = callPackage ../tools/system/safecopy { }; safe-rm = callPackage ../tools/system/safe-rm { }; @@ -5807,6 +6234,8 @@ in sahel-fonts = callPackage ../data/fonts/sahel-fonts { }; + saldl = callPackage ../tools/networking/saldl { }; + salt = callPackage ../tools/admin/salt {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; @@ -5817,6 +6246,8 @@ in samplicator = callPackage ../tools/networking/samplicator { }; + sasquatch = callPackage ../tools/filesystems/sasquatch { }; + sasview = callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -5825,6 +6256,10 @@ in scdoc = callPackage ../tools/typesetting/scdoc { }; + scream-receivers = callPackage ../misc/scream-receivers { + pulseSupport = config.pulseaudio or false; + }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -5845,7 +6280,7 @@ in qtbase = qt4; }; - scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; scriptaculous = callPackage ../development/libraries/scriptaculous { }; @@ -5881,6 +6316,10 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; + sequoia = callPackage ../tools/security/sequoia { + pythonPackages = python3Packages; + }; + sewer = callPackage ../tools/admin/sewer { }; screenfetch = callPackage ../tools/misc/screenfetch { }; @@ -5891,6 +6330,8 @@ in shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; + go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { }; + shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { @@ -5905,14 +6346,20 @@ in shocco = callPackage ../tools/text/shocco { }; + shorewall = callPackage ../tools/networking/shorewall { }; + shotwell = callPackage ../applications/graphics/shotwell { }; shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { }; + shellinabox = callPackage ../servers/shellinabox { + openssl = openssl_1_0_2; + }; shrikhand = callPackage ../data/fonts/shrikhand { }; + shunit2 = callPackage ../tools/misc/shunit2 { }; + sic = callPackage ../applications/networking/irc/sic { }; siege = callPackage ../tools/networking/siege {}; @@ -5995,6 +6442,8 @@ in smesh = callPackage ../development/libraries/smesh {}; + smu = callPackage ../tools/text/smu { }; + smugline = python3Packages.smugline; snabb = callPackage ../tools/networking/snabb { } ; @@ -6011,6 +6460,12 @@ in sshguard = callPackage ../tools/security/sshguard {}; + sshping = callPackage ../tools/networking/sshping {}; + + suricata = callPackage ../applications/networking/ids/suricata { + python = python3; + }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; @@ -6038,14 +6493,16 @@ in stdman = callPackage ../data/documentation/stdman { }; + stenc = callPackage ../tools/backup/stenc { }; + + stm32loader = with python3Packages; toPythonApplication stm32loader; + storebrowse = callPackage ../tools/system/storebrowse { }; stubby = callPackage ../tools/networking/stubby { }; syntex = callPackage ../tools/graphics/syntex {}; - fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -6062,10 +6519,16 @@ in squashfsTools = callPackage ../tools/filesystems/squashfs { }; + squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; + squashfuse = callPackage ../tools/filesystems/squashfuse { }; srcml = callPackage ../applications/version-management/srcml { }; + srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; + + sourcehut = callPackage ../applications/version-management/sourcehut { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshfs = sshfs-fuse; # added 2017-08-14 @@ -6075,6 +6538,8 @@ in ssldump = callPackage ../tools/networking/ssldump { }; + sslsplit = callPackage ../tools/networking/sslsplit { }; + sstp = callPackage ../tools/networking/sstp {}; strip-nondeterminism = perlPackages.strip-nondeterminism; @@ -6095,6 +6560,8 @@ in sunxi-tools = callPackage ../development/tools/sunxi-tools { }; + sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; + super = callPackage ../tools/security/super { }; supertux-editor = callPackage ../applications/editors/supertux-editor { }; @@ -6105,6 +6572,8 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { }; + ssdeep = callPackage ../tools/security/ssdeep { }; ssh-ident = callPackage ../tools/networking/ssh-ident { }; @@ -6117,6 +6586,8 @@ in sslmate = callPackage ../development/tools/sslmate { }; + sshoogr = callPackage ../tools/networking/sshoogr { }; + ssmtp = callPackage ../tools/networking/ssmtp { }; ssocr = callPackage ../applications/misc/ssocr { }; @@ -6173,13 +6644,14 @@ in system-config-printer = callPackage ../tools/misc/system-config-printer { libxml2 = libxml2Python; - pythonPackages = python3Packages; }; stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + stone-phaser = callPackage ../applications/audio/stone-phaser { }; + systrayhelper = callPackage ../tools/misc/systrayhelper {}; Sylk = callPackage ../applications/networking/Sylk {}; @@ -6226,9 +6698,11 @@ in tcpreplay = callPackage ../tools/networking/tcpreplay { }; + tdns-cli = callPackage ../tools/networking/tdns-cli { }; + ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt56.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -6242,8 +6716,6 @@ in termplay = callPackage ../tools/misc/termplay { }; - testdisk-photorec = callPackage ../tools/system/testdisk-photorec { }; - tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin @@ -6276,6 +6748,8 @@ in tiled = libsForQt5.callPackage ../applications/editors/tiled { }; + tiledb = callPackage ../development/libraries/tiledb { }; + timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; @@ -6294,12 +6768,16 @@ in tilix = callPackage ../applications/misc/tilix { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -6312,6 +6790,8 @@ in tmate = callPackage ../tools/misc/tmate { }; + tmate-ssh-server = callPackage ../servers/tmate-ssh-server { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; @@ -6322,11 +6802,11 @@ in tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); - tmsu = callPackage ../tools/filesystems/tmsu { - go = go_1_10; - }; + tmsu = callPackage ../tools/filesystems/tmsu { }; toilet = callPackage ../tools/misc/toilet { }; @@ -6334,8 +6814,11 @@ in toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + topgrade = callPackage ../tools/misc/topgrade { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + tor = callPackage ../tools/security/tor { - openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -6346,11 +6829,6 @@ in tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; - tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { - stdenv = stdenvNoCC; - tor-browser-unwrapped = firefoxPackages.tor-browser; - }; - touchegg = callPackage ../tools/inputmethods/touchegg { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -6369,16 +6847,24 @@ in tpm-luks = callPackage ../tools/security/tpm-luks { }; + tpm2-abrmd = callPackage ../tools/security/tpm2-abrmd { }; + tpm2-tools = callPackage ../tools/security/tpm2-tools { }; + trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezord = callPackage ../servers/trezord { }; + trezor_agent = with python3Packages; toPythonApplication trezor_agent; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; + kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; + traceroute = callPackage ../tools/networking/traceroute { }; tracebox = callPackage ../tools/networking/tracebox { }; @@ -6391,17 +6877,21 @@ in translate-shell = callPackage ../applications/misc/translate-shell { }; - transporter = callPackage ../applications/networking/transporter { }; - trash-cli = callPackage ../tools/misc/trash-cli { }; + trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; + trickle = callPackage ../tools/networking/trickle {}; inherit (nodePackages) triton; triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; - trilium = callPackage ../applications/office/trilium { }; + inherit (callPackage ../applications/office/trilium {}) + trilium-desktop + trilium-server + ; + trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; @@ -6424,8 +6914,12 @@ in ttyrec = callPackage ../tools/misc/ttyrec { }; + ttygif = callPackage ../tools/misc/ttygif { }; + ttylog = callPackage ../tools/misc/ttylog { }; + tuir = callPackage ../applications/misc/tuir { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; @@ -6434,9 +6928,7 @@ in libX11 = xorg.libX11; }; - twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/3.nix {}; - twitterBootstrap4 = callPackage ../development/web/twitter-bootstrap {}; - twitterBootstrap = twitterBootstrap3; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; @@ -6450,6 +6942,10 @@ in ua = callPackage ../tools/networking/ua { }; + uberwriter = callPackage ../applications/editors/uberwriter { + pythonPackages = python3Packages; + }; + ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -6492,6 +6988,8 @@ in upx = callPackage ../tools/compression/upx { }; + uq = callPackage ../misc/uq { }; + uqmi = callPackage ../tools/networking/uqmi { }; uriparser = callPackage ../development/libraries/uriparser {}; @@ -6506,10 +7004,14 @@ in uwsgi = callPackage ../servers/uwsgi { }; + v2ray = callPackage ../tools/networking/v2ray { }; + vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; vampire = callPackage ../applications/science/logic/vampire {}; + variety = callPackage ../applications/misc/variety {}; + vdmfec = callPackage ../applications/backup/vdmfec {}; vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; @@ -6518,9 +7020,11 @@ in vbetool = callPackage ../tools/system/vbetool { }; - vde2 = callPackage ../tools/networking/vde2 { }; + vde2 = callPackage ../tools/networking/vde2 { + openssl = openssl_1_0_2; + }; - vboot_reference = callPackage ../tools/system/vboot_reference { }; + vboot_reference = callPackage ../tools/system/vboot_reference {}; vcftools = callPackage ../applications/science/biology/vcftools { }; @@ -6534,14 +7038,17 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; - vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; vifm = callPackage ../applications/misc/vifm { }; + vifm-full = callPackage ../applications/misc/vifm { + mediaSupport = true; + inherit lib udisks2 python3; + }; + viking = callPackage ../applications/misc/viking { inherit (gnome2) scrollkeeper; }; @@ -6553,6 +7060,8 @@ in vimpager = callPackage ../tools/misc/vimpager { }; vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { }; + vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { }; + visidata = (newScope python3Packages) ../applications/misc/visidata { }; @@ -6606,7 +7115,9 @@ in inherit (python27Packages) ldap; }; - vtun = callPackage ../tools/networking/vtun { }; + vtun = callPackage ../tools/networking/vtun { + openssl = openssl_1_0_2; + }; waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { }; @@ -6618,8 +7129,6 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; - watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6638,6 +7147,10 @@ in wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen"; wast-refmt = nodePackages."@webassemblyjs/wast-refmt"; + wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + welkin = callPackage ../tools/graphics/welkin {}; wf-recorder = callPackage ../applications/video/wf-recorder { }; @@ -6646,6 +7159,8 @@ in whois = callPackage ../tools/networking/whois { }; + wifite2 = callPackage ../tools/networking/wifite2 { }; + wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; woff2 = callPackage ../development/web/woff2 { }; @@ -6656,6 +7171,9 @@ in wsmancli = callPackage ../tools/system/wsmancli {}; + wstunnel = haskell.lib.justStaticExecutables + (haskellPackages.callPackage ../tools/networking/wstunnel {}); + wolfebin = callPackage ../tools/networking/wolfebin { python = python2; }; @@ -6666,7 +7184,9 @@ in xe = callPackage ../tools/system/xe { }; - testdisk = callPackage ../tools/misc/testdisk { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; + + testdisk-qt = testdisk.override { enableQt = true; }; textql = callPackage ../development/tools/textql { }; @@ -6725,7 +7245,7 @@ in uemacs = callPackage ../applications/editors/uemacs { }; - uftp = callPackage ../servers/uftp { }; + uftp = callPackage ../servers/uftp {}; uhttpmock = callPackage ../development/libraries/uhttpmock { }; @@ -6739,7 +7259,10 @@ in unbound = callPackage ../tools/networking/unbound { }; - units = callPackage ../tools/misc/units { }; + units = callPackage ../tools/misc/units { + enableCurrenciesUpdater = true; + pythonPackages = python3Packages; + }; unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; @@ -6800,13 +7323,13 @@ in valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish4 varnish5 varnish6; + varnish60 varnish62 varnish63; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish4Packages - varnish5Packages - varnish6Packages; + varnish60Packages + varnish62Packages + varnish63Packages; - varnishPackages = varnish5Packages; + varnishPackages = varnish63Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; @@ -6830,6 +7353,8 @@ in waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wafHook = callPackage ../development/tools/build-managers/wafHook { }; + wagyu = callPackage ../tools/misc/wagyu { }; + wakelan = callPackage ../tools/networking/wakelan { }; wavemon = callPackage ../tools/networking/wavemon { }; @@ -6838,6 +7363,8 @@ in wdiff = callPackage ../tools/text/wdiff { }; + wdisplays = callPackage ../tools/graphics/wdisplays { }; + webalizer = callPackage ../tools/networking/webalizer { }; weighttp = callPackage ../tools/networking/weighttp { }; @@ -6860,10 +7387,12 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; + wmc-mpris = callPackage ../applications/misc/web-media-controller { }; + wol = callPackage ../tools/networking/wol { }; wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; @@ -6916,9 +7445,7 @@ in xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; xflux = callPackage ../tools/misc/xflux { }; - xflux-gui = callPackage ../tools/misc/xflux/gui.nix { - gnome_python = gnome2.gnome_python; - }; + xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; @@ -6947,6 +7474,10 @@ in xorriso = callPackage ../tools/cd-dvd/xorriso { }; + xprite-editor = callPackage ../tools/misc/xprite-editor { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + xpf = callPackage ../tools/text/xml/xpf { libxml2 = libxml2Python; }; @@ -6983,6 +7514,13 @@ in yarn = callPackage ../development/tools/yarn { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + + inherit (yarn2nix-moretea) + yarn2nix + mkYarnPackage + fixup_yarn_lock; + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; @@ -6991,6 +7529,8 @@ in yeshup = callPackage ../tools/system/yeshup { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; + # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -7002,7 +7542,7 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -7010,8 +7550,12 @@ in zerofree = callPackage ../tools/filesystems/zerofree { }; + zfsbackup = callPackage ../tools/backup/zfsbackup { }; + zfstools = callPackage ../tools/filesystems/zfstools { }; + zfsnap = callPackage ../tools/backup/zfsnap { }; + zile = callPackage ../applications/editors/zile { }; zinnia = callPackage ../tools/inputmethods/zinnia { }; @@ -7036,14 +7580,20 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; + zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; + zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; + zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; @@ -7105,6 +7655,8 @@ in ksh = callPackage ../shells/ksh { }; + liquidprompt = callPackage ../shells/liquidprompt { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -7154,9 +7706,31 @@ in then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web { + jdk = jdk8; + }; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -7183,6 +7757,9 @@ in colm = callPackage ../development/compilers/colm { }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmapWithCuda = colmap.override { cudaSupport = true; }; + chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; chickenPackages = chickenPackages_5; @@ -7205,6 +7782,14 @@ in inherit (darwin) cctools; }; + chez-srfi = callPackage ../development/chez-modules/chez-srfi { }; + + chez-mit = callPackage ../development/chez-modules/chez-mit { }; + + chez-scmutils = callPackage ../development/chez-modules/chez-scmutils { }; + + chez-matchable = callPackage ../development/chez-modules/chez-matchable { }; + clang = llvmPackages.clang; clang-manpages = llvmPackages.clang-manpages; @@ -7217,13 +7802,13 @@ in llvm-polly = llvmPackages_latest.llvm-polly; clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; }; + clang_9 = llvmPackages_9.clang; clang_8 = llvmPackages_8.clang; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; - clang_38 = llvmPackages_38.clang; clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { @@ -7252,6 +7837,28 @@ in compcert = callPackage ../development/compilers/compcert { }; + computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; + computecpp = wrapCCWith rec { + cc = computecpp-unwrapped; + extraPackages = [ + libstdcxxHook + llvmPackages.compiler-rt + ]; + extraBuildCommands = '' + wrap compute $wrapper $ccPath/compute + wrap compute++ $wrapper $ccPath/compute++ + export named_cc=compute + export named_cxx=compute++ + + rsrc="$out/resource-root" + mkdir -p "$rsrc/lib" + ln -s "${cc}/lib" "$rsrc/include" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && cc ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${cc.gcc}" >> $out/nix-support/cc-cflags + ''; + }; + cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { @@ -7262,15 +7869,20 @@ in crystal_0_26 crystal_0_27 crystal_0_29 - crystal; + crystal_0_30 + crystal_0_31 + crystal + crystal2nix; - icr = callPackage ../development/tools/icr {}; + icr = callPackage ../development/tools/icr { + openssl = openssl_1_0_2; + }; scry = callPackage ../development/tools/scry {}; dbmate = callPackage ../development/tools/database/dbmate { }; - devpi-client = callPackage ../development/tools/devpi-client {}; + devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; devpi-server = callPackage ../development/tools/devpi-server {}; @@ -7303,8 +7915,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/7; - gcc = gcc7; + gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); + gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -7370,7 +7982,7 @@ in ../development/compilers/gcc/libstdc++-hook.sh; crossLibcStdenv = overrideCC stdenv - (if stdenv.targetPlatform.useLLVM or false + (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc else buildPackages.gccCrossStageStatic); @@ -7403,6 +8015,7 @@ in }; bintools = binutils1; libc = libcCross1; + extraPackages = []; }; gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { @@ -7412,6 +8025,7 @@ in profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -7425,6 +8039,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -7438,6 +8053,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -7449,6 +8065,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -7460,6 +8077,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7471,6 +8089,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7482,6 +8101,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7493,11 +8113,12 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = isl_0_17; })); - gfortran = gfortran7; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -7539,6 +8160,22 @@ in profiledCompiler = false; }); + gfortran8 = wrapCC (gcc8.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + + gfortran9 = wrapCC (gcc9.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -7568,48 +8205,27 @@ in gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.7-2013q3-20130916"; - releaseType = "update"; - sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.8-2014q1-20140314"; - releaseType = "update"; - sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.9-2015q1-20150306"; - releaseType = "update"; - sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - dirName = "5.0"; - subdirName = "5-2016-q2-update"; - version = "5.4-2016q2-20160622"; - releaseType = "update"; - sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; - ncurses = pkgsi686Linux.ncurses5; - }; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; - gcc-arm-embedded = gcc-arm-embedded-8; + gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; + gcc-arm-embedded = gcc-arm-embedded-9; gforth = callPackage ../development/compilers/gforth {}; + gleam = callPackage ../development/compilers/gleam { + inherit (darwin.apple_sdk.frameworks) Security; + }; + gtk-server = callPackage ../development/interpreters/gtk-server {}; # Haskell and GHC haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc865.override { - overrides = haskell.packageOverrides; - }); + # Please update doc/languages-frameworks/haskell.section.md, “Our + # current default compiler is”, if you bump this: + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc865; inherit (haskellPackages) ghc; @@ -7626,6 +8242,16 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + purescript-psa = nodePackages.purescript-psa; + + spago = callPackage ../development/tools/purescript/spago { }; + + pulp = nodePackages.pulp; + + pscid = nodePackages.pscid; + + tacacsplus = callPackage ../servers/tacacsplus { }; + tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { # NOTE: do not use the haskell packages 'graphviz' and 'maude' @@ -7633,7 +8259,9 @@ in graphviz = graphviz-nox; }); - inherit (ocaml-ng.ocamlPackages_4_05.haxe) haxe_3_2 haxe_3_4; + inherit (callPackage ../development/compilers/haxe { + ocamlPackages = ocaml-ng.ocamlPackages_4_05; + }) haxe_3_2 haxe_3_4; haxe = haxe_3_4; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; @@ -7646,12 +8274,10 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; }; + fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; fstar = callPackage ../development/compilers/fstar { }; - pyre = callPackage ../development/tools/pyre { }; - dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); glslang = callPackage ../development/compilers/glslang { @@ -7659,16 +8285,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c"; - sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym"; + rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; + sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; }; }); - spirv-headers = spirv-tools.overrideAttrs (_: { + spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + repo = "SPIRV-Headers"; + rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; + sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; }; }); }; @@ -7686,19 +8312,21 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_10 = callPackage ../development/compilers/go/1.10.nix { + go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - - go_1_11 = callPackage ../development/compilers/go/1.11.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); - go_1_12 = callPackage ../development/compilers/go/1.12.nix { + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); - go = go_1_12; + go = go_1_13; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -7714,18 +8342,14 @@ in gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea8_web = callPackage ../development/compilers/icedtea-web { - jdk = jdk8; - }; - - icedtea_web = icedtea8_web; - idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; + intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; + intercal = callPackage ../development/compilers/intercal { }; irony-server = callPackage ../development/tools/irony-server { @@ -7733,30 +8357,43 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackagesNg.melpaStablePackages) irony; + inherit (emacsPackages.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx11 = - if stdenv.isDarwin then - null + openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + + openjdk8-bootstrap = + if adoptopenjdk-hotspot-bin-8.meta.available then + adoptopenjdk-hotspot-bin-8 else - callPackage ../development/compilers/openjdk/openjfx/11.nix { - openjdk = openjdk11; - }; + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; + /* legacy jdk for use as needed by older apps */ openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; + openjdk8_headless = + if stdenv.isDarwin || stdenv.isAarch64 then + openjdk8 + else + openjdk8.override { headless = true; }; + + openjdk11-bootstrap = + if adoptopenjdk-hotspot-bin-11.meta.available then + adoptopenjdk-hotspot-bin-11 + else + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/11.nix { } @@ -7766,37 +8403,49 @@ in inherit (gnome2) GConf gnome_vfs; }; - openjdk = openjdk8; + openjdk11_headless = + if stdenv.isDarwin then + openjdk11 + else + openjdk11.override { headless = true; }; - jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk8.jre // { outputs = [ "jre" ]; })); - jre8_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre8 - else if stdenv.isDarwin then - jre8 + /* current JDK */ + openjdk12 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk/darwin { } else - lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + callPackage ../development/compilers/openjdk { + openjfx = openjfx12; + inherit (gnome2) GConf gnome_vfs; + }; - jdk11 = openjdk11 // { outputs = [ "out" ]; }; - jdk11_headless = + openjdk12_headless = if stdenv.isDarwin then - jdk11 + openjdk12 else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" - (lib.addMetaAttrs {} - ((openjdk11.override { minimal = true; }) // {})); + openjdk12.override { headless = true; }; + + openjdk = openjdk8; + openjdk_headless = openjdk8_headless; + + jdk8 = openjdk8; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; + + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + jdk12 = openjdk12; + jdk12_headless = openjdk12_headless; jdk = jdk8; - jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; + jre = jre8; jre_headless = jre8_headless; inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; + graalvm8-ee = callPackage ../development/compilers/graalvm/enterprise-edition.nix { }; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -7831,9 +8480,11 @@ in inherit installjdk pluginSupport; }); - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; + jasmin = callPackage ../development/compilers/jasmin { }; + + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; - jikes = callPackage ../development/compilers/jikes { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; julia_07 = callPackage ../development/compilers/julia/0.7.nix { gmp = gmp6; @@ -7876,6 +8527,7 @@ in lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; + lld_9 = llvmPackages_9.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; @@ -7883,32 +8535,25 @@ in lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; + lldb_9 = llvmPackages_9.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_9 = llvmPackages_9.llvm; llvm_8 = llvmPackages_8.llvm; llvm_7 = llvmPackages_7.llvm; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; - llvm_38 = llvmPackages_38.llvm; llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = gcc6Stdenv; - }); - - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_38.tools; - targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -7916,7 +8561,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_39.tools; targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -7924,7 +8569,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_4.tools; targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -7932,7 +8577,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -7940,15 +8585,17 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + # with gcc-7 on i686: undefined reference to `__divmoddi4' + # Failing tests with gcc8. + stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7); }); llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -7956,13 +8603,23 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_latest = llvmPackages_8; + llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_9.tools; + targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + }); - lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being."; + llvmPackages_latest = llvmPackages_9; + + lorri = callPackage ../tools/misc/lorri { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; manticore = callPackage ../development/compilers/manticore { }; @@ -8006,12 +8663,20 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; + mono6 = callPackage ../development/compilers/mono/6.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; + msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; + mosml = callPackage ../development/compilers/mosml { }; - mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; - mozart = mozart-binary; + mozart2 = callPackage ../development/compilers/mozart { }; + + mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; nim = callPackage ../development/compilers/nim { }; nrpl = callPackage ../development/tools/nrpl { }; @@ -8019,9 +8684,7 @@ in neko = callPackage ../development/compilers/neko { }; nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { - # QT 5.12 has a weird regression involving the floorplanning window having - # a 'blank' or 'transparent' background, so fall back to 5.11 for now. - qtbase = qt511.qtbase; + inherit (darwin.apple_sdk.frameworks) OpenGL; }; nasm = callPackage ../development/compilers/nasm { }; @@ -8037,6 +8700,8 @@ in ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; + ocaml-crunch = ocamlPackages.crunch.bin; + ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; orc = callPackage ../development/compilers/orc { }; @@ -8076,24 +8741,33 @@ in qbe = callPackage ../development/compilers/qbe { }; + rasm = callPackage ../development/compilers/rasm { }; + rgbds = callPackage ../development/compilers/rgbds { }; rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; - rust = callPackage ../development/compilers/rust { + rust_1_40_0 = callPackage ../development/compilers/rust/1_40_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rustPackages = rust.packages.stable; - inherit (rustPackages) cargo rustc rustPlatform; + rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + rust = rust_1_40_0; + + rustPackages_1_40_0 = rust_1_40_0.packages.stable; + rustPackages_1_38_0 = rust_1_38_0.packages.stable; + rustPackages = rustPackages_1_40_0; + + inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; cratesIO = callPackage ../build-support/rust/crates-io.nix { }; - cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -8101,12 +8775,20 @@ in cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph { inherit (darwin.apple_sdk.frameworks) Security; + inherit (linuxPackages) perf; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; + cargo-audit = callPackage ../tools/package-management/cargo-audit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + cargo-deb = callPackage ../tools/package-management/cargo-deb { + inherit (darwin.apple_sdk.frameworks) Security; + }; + cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; @@ -8122,9 +8804,18 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; + cargo-crev = callPackage ../development/tools/rust/cargo-crev { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { }; + cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { + inherit (darwin) libiconv; + inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; + }; + cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8132,16 +8823,28 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + cargo-watch = callPackage ../development/tools/rust/cargo-watch { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; + cargo-generate = callPackage ../development/tools/rust/cargo-generate { + inherit (darwin.apple_sdk.frameworks) Security; + }; - pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; + maturin = callPackage ../development/tools/rust/maturin { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; - rls = callPackage ../development/tools/rust/rls { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + inherit (rustPackages) rls; + rustfmt = rustPackages.rustfmt; + rustracer = callPackage ../development/tools/rust/racer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rustracerd = callPackage ../development/tools/rust/racerd { + inherit (rustPackages_1_38_0) rustPlatform; + inherit (darwin.apple_sdk.frameworks) Security; }; - rustfmt = callPackage ../development/tools/rust/rustfmt { }; - rustracer = callPackage ../development/tools/rust/racer { }; - rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -8150,6 +8853,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -8159,6 +8864,7 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -8166,19 +8872,21 @@ in gputils = null; }; + serialdv = callPackage ../development/libraries/serialdv { }; + serpent = callPackage ../development/compilers/serpent { }; shmig = callPackage ../development/tools/database/shmig { }; smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; - smlnj = if stdenv.isDarwin - then callPackage ../development/compilers/smlnj { } - else pkgsi686Linux.callPackage ../development/compilers/smlnj { }; + smlnj = callPackage ../development/compilers/smlnj { }; solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { }; + spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; # sqldeveloper_18 needs JavaFX, which currently only is available inside the @@ -8202,7 +8910,11 @@ in swift = callPackage ../development/compilers/swift { }; - swiProlog = callPackage ../development/compilers/swi-prolog { }; + swiProlog = callPackage ../development/compilers/swi-prolog { + openssl = openssl_1_0_2; + inherit (darwin.apple_sdk.frameworks) Security; + }; + swiPrologWithGui = swiProlog.override { withGui = true; }; tbb = callPackage ../development/libraries/tbb { }; @@ -8223,6 +8935,11 @@ in tinycc = callPackage ../development/compilers/tinycc { }; + tinygo = callPackage ../development/compilers/tinygo { + inherit (llvmPackages_9) llvm clang-unwrapped lld; + avrgcc = pkgsCross.avr.buildPackages.gcc; + }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { stdenv = gccStdenv; }; @@ -8235,16 +8952,17 @@ in urweb = callPackage ../development/compilers/urweb { }; + vlang = callPackage ../development/compilers/vlang { }; + + vala-lint = callPackage ../development/tools/vala-lint { }; + inherit (callPackage ../development/compilers/vala { }) vala_0_36 - vala_0_38 vala_0_40 - vala_0_42 vala_0_44 + vala_0_46 vala; - valadoc = callPackage ../development/tools/valadoc { }; - wcc = callPackage ../development/compilers/wcc { }; wla-dx = callPackage ../development/compilers/wla-dx { }; @@ -8257,6 +8975,7 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: callPackage ../build-support/cc-wrapper (let self = { @@ -8268,7 +8987,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc; + inherit cc bintools libc extraPackages; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -8299,6 +9018,8 @@ in z88dk = callPackage ../development/compilers/z88dk { }; + zulip = callPackage ../applications/networking/instant-messengers/zulip { }; + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu = callPackage ../development/compilers/zulu { }; @@ -8321,6 +9042,8 @@ in clojure = callPackage ../development/interpreters/clojure { }; + clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; + clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; dhall = callPackage ../development/interpreters/dhall { }; @@ -8350,9 +9073,9 @@ in lfe lfe_1_2; inherit (beam.packages.erlang) - rebar rebar3-open rebar3 - hexRegistrySnapshot fetchHex beamPackages - hex2nix relxExe; + rebar rebar3 + fetchHex beamPackages + relxExe; inherit (beam.packages.erlangR19) cuter; @@ -8470,6 +9193,8 @@ in metamath = callPackage ../development/interpreters/metamath { }; + minder = callPackage ../applications/misc/minder { }; + mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { @@ -8520,6 +9245,10 @@ in php = php73; }); + php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php74; + }); + phpPackages-unit = php72Packages-unit; php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { @@ -8530,11 +9259,16 @@ in php = php73-unit; }); + php74Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php74-unit; + }); + inherit (callPackages ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }) - php72 - php73; + php74 + php73 + php72; php-embed = php73-embed; @@ -8548,6 +9282,11 @@ in config.php.apxs2 = false; }; + php74-embed = php74.override { + config.php.embed = true; + config.php.apxs2 = false; + }; + php-unit = php73-unit; php72-unit = php72.override { @@ -8568,6 +9307,15 @@ in config.php.fpm = false; }; + php74-unit = php74.override { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.phpdbg = false; + config.php.cgi = false; + config.php.fpm = false; + }; + picoc = callPackage ../development/interpreters/picoc {}; picolisp = callPackage ../development/interpreters/picolisp {}; @@ -8589,7 +9337,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy35; + pypy3 = pypy36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -8601,6 +9349,7 @@ in python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; python38Full = python38.override{x11Support=true;}; + python39Full = python38.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -8608,19 +9357,22 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; - python38Packages = python38.pkgs; + python38Packages = recurseIntoAttrs python38.pkgs; + python39Packages = python39.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; pypy3Packages = pypy3.pkgs; + pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; + update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; # Should eventually be moved inside Python interpreters. @@ -8630,9 +9382,7 @@ in pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - pypi2nix = callPackage ../development/tools/pypi2nix { - pythonPackages = python3Packages; - }; + pypi2nix = callPackage ../development/tools/pypi2nix {}; setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; @@ -8644,8 +9394,15 @@ in svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; - poetry = with python3Packages; toPythonApplication poetry; - pipenv = python3Packages.callPackage ../development/tools/pipenv {}; + + poetry = callPackage ../development/tools/poetry { + python = python3; + }; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { + inherit pkgs lib; + }; + + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -8699,12 +9456,30 @@ in inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; }) - ruby_2_3 ruby_2_4 ruby_2_5 - ruby_2_6; + ruby_2_6 + ruby_2_7; + + rubyMinimal = ruby.override { + # gem support is minimal overhead + rubygemsSupport = true; + useRailsExpress = false; + zlibSupport = false; + opensslSupport = false; + gdbmSupport = false; + cursesSupport = false; + docSupport = false; + yamlSupport = false; + fiddleSupport = false; + }; - ruby = ruby_2_5; + ruby = ruby_2_6; + + rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; + rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; + rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; + rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; mruby = callPackage ../development/compilers/mruby { }; @@ -8714,16 +9489,14 @@ in self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = spark_24; - spark_24 = callPackage ../applications/networking/cluster/spark { version = "2.4.3"; }; + spark = callPackage ../applications/networking/cluster/spark { }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey = spidermonkey_38; @@ -8741,6 +9514,8 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + wasm = ocamlPackages.wasm; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -8768,6 +9543,8 @@ in samples = true; }; + h3 = callPackage ../development/misc/h3 { }; + amtk = callPackage ../development/libraries/amtk { }; avrlibc = callPackage ../development/misc/avr/libc {}; @@ -8831,6 +9608,11 @@ in mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; + resim = callPackage ../misc/emulators/resim {}; + + rappel = callPackage ../development/misc/rappel/default.nix { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -8860,6 +9642,8 @@ in alloy5 alloy; + ameba = callPackage ../development/tools/ameba { }; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackage ../tools/admin/ansible { }) @@ -8882,7 +9666,7 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_2; + apacheKafka = apacheKafka_2_4; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; @@ -8891,9 +9675,13 @@ in apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; + apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; + apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; kt = callPackage ../tools/misc/kt {}; + argbash = callPackage ../development/tools/misc/argbash {}; + arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; @@ -8902,6 +9690,10 @@ in awf = callPackage ../development/tools/misc/awf { }; + aws-adfs = with python3Packages; toPythonApplication aws-adfs; + + electron_6 = callPackage ../development/tools/electron/6.x.nix { }; + electron_5 = callPackage ../development/tools/electron/5.x.nix { }; electron_4 = callPackage ../development/tools/electron { }; @@ -8940,15 +9732,12 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; bazel = callPackage ../development/tools/build-managers/bazel { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; buildJdkName = "jdk8"; - runJdk = jdk11; + runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -8961,7 +9750,9 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + go = go_1_12; + }; bazelisk = callPackage ../development/tools/bazelisk { }; @@ -8971,6 +9762,8 @@ in bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + bingrep = callPackage ../development/tools/analysis/bingrep { }; + binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; @@ -8989,11 +9782,7 @@ in bison = bison3; yacc = bison; # TODO: move to aliases.nix - blackmagic = callPackage ../development/tools/misc/blackmagic { - stdenv = gcc6Stdenv; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -9005,14 +9794,16 @@ in buck = callPackage ../development/tools/build-managers/buck { }; - buildkite-agent = buildkite-agent2; - buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; - buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; + buildkite-agent = buildkite-agent3; + buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; + buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; libbpf = callPackage ../os-specific/linux/libbpf { }; bpftool = callPackage ../os-specific/linux/bpftool { }; + bpm-tools = callPackage ../tools/audio/bpm-tools { }; + byacc = callPackage ../development/tools/parsing/byacc { }; cadre = callPackage ../development/tools/cadre { }; @@ -9047,8 +9838,11 @@ in # }; # You can use a different directory, but whichever directory you choose # should be owned by user root, group nixbld with permissions 0770. - ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }: - wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {}; + ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }: + cc.override { cc = ccache.links { + inherit extraConfig; + unwrappedCC = cc.cc; + }; }) {}; ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; @@ -9067,12 +9861,12 @@ in chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; + chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { }; + chrpath = callPackage ../development/tools/misc/chrpath { }; chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; - cide = callPackage ../development/tools/continuous-integration/cide { }; - cl-launch = callPackage ../development/tools/misc/cl-launch {}; cloud-nuke = callPackage ../development/tools/cloud-nuke { }; @@ -9087,7 +9881,7 @@ in conan = callPackage ../development/tools/build-managers/conan { }; - cookiecutter = pythonPackages.cookiecutter; + cookiecutter = with python3Packages; toPythonApplication cookiecutter; corundum = callPackage ../development/tools/corundum { }; @@ -9110,6 +9904,8 @@ in cmakeWithGui = cmakeCurses.override { withQt5 = true; }; cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; }; + cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; + # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; @@ -9138,8 +9934,8 @@ in ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_7; - stdenv = llvmPackages_7.stdenv; + llvmPackages = llvmPackages_8; + stdenv = llvmPackages_8.stdenv; }; credstash = with python3Packages; toPythonApplication credstash; @@ -9198,6 +9994,8 @@ in lattice-diamond = callPackage ../development/tools/lattice-diamond { }; + direvent = callPackage ../development/tools/misc/direvent { }; + distcc = callPackage ../development/tools/misc/distcc { libiberty_static = libiberty.override { staticBuild = true; }; }; @@ -9236,6 +10034,8 @@ in doit = callPackage ../development/tools/build-managers/doit { }; + dolt = callPackage ../servers/sql/dolt { }; + dot2tex = pythonPackages.dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -9253,6 +10053,8 @@ in drush = callPackage ../development/tools/misc/drush { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; + editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; eggdbus = callPackage ../development/tools/misc/eggdbus { }; @@ -9285,6 +10087,8 @@ in flootty = callPackage ../development/tools/flootty { }; + fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9298,6 +10102,8 @@ in frame = callPackage ../development/libraries/frame { }; + frp = callPackage ../tools/networking/frp { }; + fsatrace = callPackage ../development/tools/misc/fsatrace { }; fswatch = callPackage ../development/tools/misc/fswatch { @@ -9306,7 +10112,7 @@ in funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt59.callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -9321,6 +10127,8 @@ in flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; + flexibee = callPackage ../applications/office/flexibee { }; + flexcpp = callPackage ../development/tools/parsing/flexc++ { }; geis = callPackage ../development/libraries/geis { @@ -9335,10 +10143,20 @@ in gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; + gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {}; + + gnome-hexgl = callPackage ../games/gnome-hexgl {}; + gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; + + gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; + + gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; @@ -9353,16 +10171,19 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; + gotify-server = callPackage ../servers/gotify { }; + gotty = callPackage ../servers/gotty { }; gputils = callPackage ../development/tools/misc/gputils { }; - gradleGen = callPackage ../development/tools/build-managers/gradle { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { + java = jdk; + }; gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; - gradle_2_5 = res.gradleGen.gradle_2_5; - gradle_3_5 = res.gradleGen.gradle_3_5; gradle_4_10 = res.gradleGen.gradle_4_10; + gradle_4 = gradle_4_10; + gradle_5 = res.gradleGen.gradle_5_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9398,6 +10219,8 @@ in nodejs = nodejs-10_x; }; + ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -9417,7 +10240,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_8; }; indent = callPackage ../development/tools/misc/indent { }; @@ -9444,12 +10267,14 @@ in jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; - jenkins-job-builder = pythonPackages.jenkins-job-builder; + jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; }; @@ -9460,12 +10285,16 @@ in kind = callPackage ../development/tools/kind { }; + khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; kube-prompt = callPackage ../development/tools/kube-prompt { }; + kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubicorn = callPackage ../development/tools/kubicorn { }; kustomize = callPackage ../development/tools/kustomize { }; @@ -9515,6 +10344,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; + go-md2man = callPackage ../development/tools/misc/md2man {}; mage = callPackage ../development/tools/build-managers/mage { }; @@ -9581,7 +10412,9 @@ in gconf = pkgs.gnome2.GConf; }; + # 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; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -9620,7 +10453,7 @@ in peg = callPackage ../development/tools/parsing/peg { }; - pgcli = callPackage ../development/tools/database/pgcli {}; + pgcli = pkgs.python3Packages.pgcli; phantomjs = callPackage ../development/tools/phantomjs { }; @@ -9642,7 +10475,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -9658,12 +10491,12 @@ in procodile = callPackage ../tools/system/procodile { }; + pry = callPackage ../development/tools/pry { }; + pup = callPackage ../development/tools/pup { }; puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; - pyflame = callPackage ../development/tools/profiling/pyflame { }; - pyrseas = callPackage ../development/tools/database/pyrseas { }; qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; @@ -9712,6 +10545,8 @@ in rman = callPackage ../development/tools/misc/rman { }; + rnix-lsp = callPackage ../development/tools/rnix-lsp { }; + rolespec = callPackage ../development/tools/misc/rolespec { }; rr = callPackage ../development/tools/analysis/rr { }; @@ -9737,8 +10572,14 @@ in sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; + scc = callPackage ../development/tools/misc/scc { }; + scss-lint = callPackage ../development/tools/scss-lint { }; + shadowenv = callPackage ../tools/misc/shadowenv { + inherit (darwin.apple_sdk.frameworks) Security; + }; + shake = haskell.lib.justStaticExecutables haskellPackages.shake; shallot = callPackage ../tools/misc/shallot { }; @@ -9768,7 +10609,11 @@ in smc = callPackage ../tools/misc/smc { }; - snakemake = callPackage ../applications/science/misc/snakemake { python = python3Packages; }; + snakemake = callPackage ../applications/science/misc/snakemake { }; + + snore = callPackage ../tools/misc/snore { }; + + snzip = callPackage ../tools/archivers/snzip { }; snowman = qt5.callPackage ../development/tools/analysis/snowman { }; @@ -9789,6 +10634,8 @@ in spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spooles = callPackage ../development/libraries/science/math/spooles {}; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -9797,6 +10644,8 @@ in sselp = callPackage ../tools/X11/sselp{ }; + stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32flash = callPackage ../development/tools/misc/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -9806,6 +10655,7 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swig4 = callPackage ../development/tools/misc/swig/4.nix { }; swig = swig3; swigWithJava = swig; @@ -9821,7 +10671,13 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + terracognita = callPackage ../development/tools/misc/terracognita { }; + + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { + # Version 0.0.5 fails to build with go 1.13 due to dependency: + # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found + buildGoModule = buildGo112Module; + }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; @@ -9836,14 +10692,22 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + texlab = callPackage ../development/tools/misc/texlab { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tflint = callPackage ../development/tools/analysis/tflint { }; + tfsec = callPackage ../development/tools/analysis/tfsec { }; + todoist = callPackage ../applications/misc/todoist { }; todolist = callPackage ../applications/misc/todolist { }; travis = callPackage ../development/tools/misc/travis { }; + tree-sitter = callPackage ../development/tools/parsing/tree-sitter { }; + trellis = callPackage ../development/tools/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -9854,6 +10718,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + udis86 = callPackage ../development/tools/udis86 { }; + uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd = callPackage ../applications/radio/uhd { }; @@ -9887,9 +10753,7 @@ in vultr = callPackage ../development/tools/vultr { }; - vulnix = callPackage ../tools/security/vulnix { - pythonPackages = python3Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -9921,10 +10785,9 @@ in xpwn = callPackage ../development/mobile/xpwn {}; - xxdiff = callPackage ../development/tools/misc/xxdiff { - bison = bison2; - }; - xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; @@ -9939,6 +10802,8 @@ in inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; }; + yq-go = callPackage ../development/tools/yq-go { }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -9951,8 +10816,6 @@ in a52dec = callPackage ../development/libraries/a52dec { }; - aacskeys = callPackage ../development/libraries/aacskeys { }; - aalib = callPackage ../development/libraries/aalib { }; abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; @@ -9973,6 +10836,8 @@ in alure = callPackage ../development/libraries/alure { }; + alure2 = callPackage ../development/libraries/alure2 { }; + agg = callPackage ../development/libraries/agg { }; allegro = allegro4; @@ -10009,9 +10874,13 @@ in armadillo = callPackage ../development/libraries/armadillo {}; - arrow-cpp = callPackage ../development/libraries/arrow-cpp { - gtest = gtest.override { static = true; }; - }; + arrayfire = callPackage ../development/libraries/arrayfire {}; + + arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ + inherit (pkgsStatic) gtest; + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' + }); assimp = callPackage ../development/libraries/assimp { }; @@ -10059,9 +10928,9 @@ in bamf = callPackage ../development/libraries/bamf { }; - bctoolbox = callPackage ../development/libraries/bctoolbox { - mbedtls = mbedtls_1_3; - }; + bcg729 = callPackage ../development/libraries/bcg729 { }; + + bctoolbox = callPackage ../development/libraries/bctoolbox { }; beecrypt = callPackage ../development/libraries/beecrypt { }; @@ -10073,7 +10942,9 @@ in inherit (llvmPackages_6) llvm clang-unwrapped; }; - belle-sip = callPackage ../development/libraries/belle-sip { }; + belle-sip = callPackage ../development/libraries/belle-sip { + stdenv = gcc8Stdenv; + }; libbfd = callPackage ../development/libraries/libbfd { }; @@ -10106,18 +10977,21 @@ in boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; - boost16x = boost167; + boost16x = boost169; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost17x = boost170; + boost171 = callPackage ../development/libraries/boost/1.71.nix { }; + boost17x = boost171; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; - botan = callPackage ../development/libraries/botan { }; + botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; }; botan2 = callPackage ../development/libraries/botan/2.0.nix { }; box2d = callPackage ../development/libraries/box2d { }; + boxfort = callPackage ../development/libraries/boxfort { }; + buddy = callPackage ../development/libraries/buddy { }; bulletml = callPackage ../development/libraries/bulletml { }; @@ -10130,7 +11004,12 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = callPackage ../development/tools/cachix { }; + # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + + niv = haskellPackages.niv.bin; + + ormolu = haskellPackages.ormolu.bin; capnproto = callPackage ../development/libraries/capnproto { }; @@ -10142,9 +11021,7 @@ in cdk = callPackage ../development/libraries/cdk {}; - cdo = callPackage ../development/libraries/cdo { - stdenv = gccStdenv; - }; + cdo = callPackage ../development/libraries/cdo { }; cimg = callPackage ../development/libraries/cimg { }; @@ -10152,8 +11029,6 @@ in ccrtp = callPackage ../development/libraries/ccrtp { }; - ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; - cctz = callPackage ../development/libraries/cctz { }; celt = callPackage ../development/libraries/celt {}; @@ -10168,7 +11043,10 @@ in caf = callPackage ../development/libraries/caf {}; - cgal = callPackage ../development/libraries/CGAL {}; + # CGAL 5 has API changes + cgal_4 = callPackage ../development/libraries/CGAL/4.nix {}; + cgal_5 = callPackage ../development/libraries/CGAL {}; + cgal = cgal_4; cgui = callPackage ../development/libraries/cgui {}; @@ -10188,6 +11066,10 @@ in clearsilver = callPackage ../development/libraries/clearsilver { }; + clfft = callPackage ../development/libraries/clfft { }; + + clipp = callPackage ../development/libraries/clipp { }; + clipper = callPackage ../development/libraries/clipper { }; cln = callPackage ../development/libraries/cln { }; @@ -10225,10 +11107,6 @@ in cointop = callPackage ../applications/misc/cointop { }; - commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; - - coredumper = callPackage ../development/libraries/coredumper { }; - ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; @@ -10243,7 +11121,8 @@ in cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; - cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib {}; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -10256,6 +11135,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + criterion = callPackage ../development/libraries/criterion { }; + croaring = callPackage ../development/libraries/croaring { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -10327,8 +11208,6 @@ in fltk = fltk13; }; - dirac = callPackage ../development/libraries/dirac { }; - directfb = callPackage ../development/libraries/directfb { }; discord-rpc = callPackage ../development/libraries/discord-rpc { @@ -10359,7 +11238,9 @@ in easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; - eccodes = callPackage ../development/libraries/eccodes { }; + eccodes = callPackage ../development/libraries/eccodes { + pythonPackages = python3Packages; + }; eclib = callPackage ../development/libraries/eclib {}; @@ -10373,6 +11254,8 @@ in inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; + egl-wayland = callPackage ../development/libraries/egl-wayland {}; + elastix = callPackage ../development/libraries/science/biology/elastix { }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; @@ -10410,7 +11293,6 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; - inherit (pythonPackages) gst-python; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -10423,7 +11305,8 @@ in blas = if stdenv.isDarwin then blas else openblas; }; - fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; + forge = callPackage ../development/libraries/forge { }; + linbox = callPackage ../development/libraries/linbox { # We need to use blas instead of openblas on darwin, see # https://github.com/NixOS/nixpkgs/pull/45013 and @@ -10451,6 +11334,7 @@ in frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; + libvmaf = if stdenv.isDarwin then null else libvmaf; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; @@ -10518,8 +11402,6 @@ in fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; - fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; - folly = callPackage ../development/libraries/folly { }; folks = callPackage ../development/libraries/folks { }; @@ -10577,12 +11459,8 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = res.gtk2; - }; - gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = res.gtk2; + inherit (darwin.apple_sdk.frameworks) OpenCL; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10633,6 +11511,8 @@ in ghp-import = callPackage ../development/tools/ghp-import { }; + ghcid = haskellPackages.ghcid.bin; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { @@ -10688,6 +11568,7 @@ in else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross + else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -10695,10 +11576,16 @@ in else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc + else if stdenv.targetPlatform.isGhcjs then null else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; + threadsCross = + if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) + then targetPackages.windows.mcfgthreads or windows.mcfgthreads + else null; + wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; }; @@ -10767,8 +11654,7 @@ in goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; - google-gflags = callPackage ../development/libraries/google-gflags { }; - gflags = google-gflags; # TODO: move to aliases.nix + gflags = callPackage ../development/libraries/gflags { }; gperftools = callPackage ../development/libraries/gperftools { }; @@ -10776,6 +11662,10 @@ in grib-api = callPackage ../development/libraries/grib-api { }; + grilo = callPackage ../development/libraries/grilo { }; + + grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; + grpc = callPackage ../development/libraries/grpc { }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; @@ -10807,9 +11697,6 @@ in qt-mobility = callPackage ../development/libraries/qt-mobility {}; - qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - - qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; }; qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; @@ -10823,6 +11710,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; + utillinux = utillinuxMinimal; # break the cyclic dependency }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { @@ -10875,6 +11763,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; + gom = callPackage ../development/libraries/gom { }; ace = callPackage ../development/libraries/ace { }; @@ -10889,7 +11779,9 @@ in cairomm = callPackage ../development/libraries/cairomm { }; - pango = callPackage ../development/libraries/pango { }; + pango = callPackage ../development/libraries/pango { + harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + }; pangolin = callPackage ../development/libraries/pangolin { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -10899,19 +11791,17 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; gnome-menus = callPackage ../development/libraries/gnome-menus { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; - gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { + gtk2 = callPackage ../development/libraries/gtk/2.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -10921,7 +11811,7 @@ in gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { + gtk3 = callPackage ../development/libraries/gtk/3.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -10935,6 +11825,12 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; + gtk_engines = callPackage ../development/libraries/gtk-engines { }; + + gtk-engine-bluecurve = callPackage ../development/libraries/gtk-engine-bluecurve { }; + + gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint @@ -10977,13 +11873,13 @@ in gtkspellmm = callPackage ../development/libraries/gtkspellmm { }; + gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; + gts = callPackage ../development/libraries/gts { }; gumbo = callPackage ../development/libraries/gumbo { }; - gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; - }; + gvfs = callPackage ../development/libraries/gvfs { }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11048,6 +11944,8 @@ in hydra = callPackage ../development/tools/misc/hydra { }; + hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; + hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hyena = callPackage ../development/libraries/hyena { }; @@ -11057,27 +11955,27 @@ in icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); @@ -11091,8 +11989,6 @@ in ilmbase = callPackage ../development/libraries/ilmbase { }; - intelmetool = callPackage ../tools/misc/intelmetool { }; - imlib = callPackage ../development/libraries/imlib { libpng = libpng12; }; @@ -11142,7 +12038,11 @@ in isso = callPackage ../servers/isso { }; - itk = callPackage ../development/libraries/itk { }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; + + itk = callPackage ../development/libraries/itk { + stdenv = gcc8Stdenv; + }; jasper = callPackage ../development/libraries/jasper { }; @@ -11203,7 +12103,11 @@ in automake = automake111x; }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; + kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; + + kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { + openssl = openssl_1_0_2; + }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; @@ -11216,7 +12120,9 @@ in stdenv = gccStdenv; }; - languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); + languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { + inherit pkgs; + }); lasem = callPackage ../development/libraries/lasem { }; @@ -11258,6 +12164,8 @@ in libaal = callPackage ../development/libraries/libaal { }; + libabigail = callPackage ../development/libraries/libabigail { }; + libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; libacr38u = callPackage ../tools/security/libacr38u { }; @@ -11309,7 +12217,7 @@ in libb2 = callPackage ../development/libraries/libb2 { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocamlPackages) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages_4_06) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -11342,11 +12250,11 @@ in libcanberra = callPackage ../development/libraries/libcanberra { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - libcanberra-gtk3 = pkgs.libcanberra.override { - gtk = gtk3.override { x11Support = true; }; + libcanberra-gtk2 = pkgs.libcanberra.override { + gtk = gtk2-x11; }; - libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { - gtk = gtk2.override { gdktarget = "x11"; }; + libcanberra-gtk3 = pkgs.libcanberra.override { + gtk = gtk3-x11; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) @@ -11355,7 +12263,10 @@ in libcbor = callPackage ../development/libraries/libcbor { }; - libcec = callPackage ../development/libraries/libcec { }; + libcec = callPackage ../development/libraries/libcec { + libraspberrypi = null; + }; + libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; libcef = callPackage ../development/libraries/libcef { inherit (gnome2) GConf; }; @@ -11402,6 +12313,8 @@ in libclxclient = callPackage ../development/libraries/libclxclient { }; + libco-canonical = callPackage ../development/libraries/libco-canonical { }; + libconfuse = callPackage ../development/libraries/libconfuse { }; libcangjie = callPackage ../development/libraries/libcangjie { }; @@ -11410,6 +12323,8 @@ in libcredis = callPackage ../development/libraries/libcredis { }; + libctb = callPackage ../development/libraries/libctb { }; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcouchbase = callPackage ../development/libraries/libcouchbase { }; @@ -11427,7 +12342,7 @@ in libdbi = callPackage ../development/libraries/libdbi { }; libdbiDriversBase = libdbiDrivers.override { - mysql = null; + libmysqlclient = null; sqlite = null; }; @@ -11529,9 +12444,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -11570,8 +12482,16 @@ in libiio = callPackage ../development/libraries/libiio { }; + libinjection = callPackage ../development/libraries/libinjection { }; + + libnats-c = callPackage ../development/libraries/libnats-c { + openssl = openssl_1_0_2; + }; + liburing = callPackage ../development/libraries/liburing { }; + librseq = callPackage ../development/libraries/librseq { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -11586,6 +12506,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; + libgtop = callPackage ../development/libraries/libgtop {}; libLAS = callPackage ../development/libraries/libLAS { }; @@ -11690,10 +12612,6 @@ in libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; - libindicate-gtk2 = libindicate.override { gtkVersion = "2"; }; - libindicate-gtk3 = libindicate.override { gtkVersion = "3"; }; - libindicate = callPackage ../development/libraries/libindicate { }; - libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; @@ -11704,6 +12622,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + libirecovery = callPackage ../development/libraries/libirecovery { }; + libivykis = callPackage ../development/libraries/libivykis { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -11762,10 +12682,6 @@ in libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -11849,6 +12765,8 @@ in libisoburn = callPackage ../development/libraries/libisoburn { }; + libipt = callPackage ../development/libraries/libipt { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -11864,7 +12782,9 @@ in libksba = callPackage ../development/libraries/libksba { }; - libksi = callPackage ../development/libraries/libksi { }; + libksi = callPackage ../development/libraries/libksi { + openssl = openssl_1_0_2; + }; liblinear = callPackage ../development/libraries/liblinear { }; @@ -11912,6 +12832,8 @@ in libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodule = callPackage ../development/libraries/libmodule { }; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmp3splt = callPackage ../development/libraries/libmp3splt { }; @@ -12008,6 +12930,8 @@ in libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libplacebo = callPackage ../development/libraries/libplacebo { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; @@ -12060,6 +12984,8 @@ in libsoup = callPackage ../development/libraries/libsoup { }; + libspectrum = callPackage ../development/libraries/libspectrum { }; + libspiro = callPackage ../development/libraries/libspiro {}; libssh = callPackage ../development/libraries/libssh { }; @@ -12131,15 +13057,16 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; + libuinputplus = callPackage ../development/libraries/libuinputplus { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; libwhereami = callPackage ../development/libraries/libwhereami { }; - giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; - giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; + giflib = callPackage ../development/libraries/giflib { }; libunarr = callPackage ../development/libraries/libunarr { }; @@ -12171,7 +13098,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (v4l_utils.override { + libv4l = lowPrio (v4l-utils.override { withUtils = false; }); @@ -12184,6 +13111,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libversion = callPackage ../development/libraries/libversion { }; @@ -12196,6 +13126,8 @@ in libvisual = callPackage ../development/libraries/libvisual { }; + libvmaf = callPackage ../development/libraries/libvmaf { }; + libvncserver = callPackage ../development/libraries/libvncserver {}; libviper = callPackage ../development/libraries/libviper { }; @@ -12239,9 +13171,13 @@ in libxmi = callPackage ../development/libraries/libxmi { }; - libxml2 = callPackage ../development/libraries/libxml2 { }; + libxml2 = callPackage ../development/libraries/libxml2 { + python = if stdenv.isDarwin then python2 else python3; + }; - libxml2Python = pkgs.buildEnv { # slightly hacky + libxml2Python = let + libxml2 = python2Packages.libxml2; + in pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; @@ -12259,7 +13195,9 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { }; + libxslt = callPackage ../development/libraries/libxslt { + python = if stdenv.isDarwin then python2 else python3; + }; libixp_hg = callPackage ../development/libraries/libixp-hg { }; @@ -12267,7 +13205,7 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; @@ -12296,6 +13234,8 @@ in lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightspark = callPackage ../misc/lightspark { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; linenoise = callPackage ../development/libraries/linenoise { }; @@ -12326,10 +13266,10 @@ in luabind_luajit = luabind.override { lua = luajit; }; - luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; }; - lzo = callPackage ../development/libraries/lzo { }; + opencl-clang = callPackage ../development/libraries/opencl-clang { }; + mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; @@ -12337,8 +13277,6 @@ in matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; - mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; - polarssl = mbedtls; # TODO: add to aliases.nix mdds = callPackage ../development/libraries/mdds { }; @@ -12365,19 +13303,8 @@ in # Default libGLU libGLU = mesa_glu; - # Combined derivation, contains both libGL and libGLU - # Please, avoid using this attribute. It was meant as transitional hack - # for packages that assume that libGLU and libGL live in the same prefix. - # libGLU_combined propagates both libGL and libGLU - libGLU_combined = buildEnv { - name = "libGLU-combined"; - paths = [ libGL libGLU ]; - extraOutputsToInstall = [ "dev" ]; - }; - mesa = callPackage ../development/libraries/mesa { - # 7 is the default, but only on Linux, so keep this for now - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -12394,6 +13321,12 @@ in microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; + micronucleus = callPackage ../development/tools/misc/micronucleus { }; + + micropython = callPackage ../development/interpreters/micropython { }; + + mimalloc = callPackage ../development/libraries/mimalloc { }; + minizip = callPackage ../development/libraries/minizip { }; mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; @@ -12402,12 +13335,10 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt {}; + mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; mono-addins = callPackage ../development/libraries/mono-addins { }; - mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; - movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -12446,7 +13377,11 @@ in mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { }; + muparser = callPackage ../development/libraries/muparser { + inherit (darwin.stubs) setfile; + }; + + mutest = callPackage ../development/libraries/mutest { }; mygpoclient = pythonPackages.mygpoclient; @@ -12454,7 +13389,9 @@ in ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { }; + mysocketw = callPackage ../development/libraries/mysocketw { + openssl = openssl_1_0_2; + }; mythes = callPackage ../development/libraries/mythes { }; @@ -12479,11 +13416,15 @@ in then null else callPackage ../development/libraries/ncurses { }; + ndi = callPackage ../development/libraries/ndi { }; + neardal = callPackage ../development/libraries/neardal { }; neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { + openssl = openssl_1_0_2; + }; nettle = callPackage ../development/libraries/nettle { }; @@ -12555,6 +13496,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; + oneko = callPackage ../applications/misc/oneko { }; oniguruma = callPackage ../development/libraries/oniguruma { }; @@ -12615,11 +13558,6 @@ in ois = callPackage ../development/libraries/ois {}; - opal = callPackage ../development/libraries/opal { - ffmpeg = ffmpeg_2; - stdenv = gcc6Stdenv; - }; - openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; @@ -12631,23 +13569,25 @@ in opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; - openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { }; openslp = callPackage ../development/libraries/openslp {}; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_8 - libressl_2_9; + libressl_2_9 + libressl_3_0; - libressl = libressl_2_9; + libressl = libressl_3_0; boringssl = callPackage ../development/libraries/boringssl { }; wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_0_2; + openssl = + if stdenv.hostPlatform.isMinGW # Work around broken cross build + then openssl_1_0_2 + else openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 @@ -12655,9 +13595,7 @@ in openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; - opensubdiv = callPackage ../development/libraries/opensubdiv { - cmake = cmake_2_8; - }; + opensubdiv = callPackage ../development/libraries/opensubdiv { }; open-wbo = callPackage ../applications/science/logic/open-wbo {}; @@ -12673,6 +13611,8 @@ in osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; + osmid = callPackage ../applications/audio/osmid {}; + osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; @@ -12699,15 +13639,6 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - phonon = callPackage ../development/libraries/phonon {}; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - - # TODO(@Ma27) get rid of that as soon as QT4 can be dropped - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { - withQt4 = true; - }; - inherit (callPackage ../development/libraries/physfs { }) physfs_2 physfs; @@ -12719,6 +13650,8 @@ in pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; + pkgdiff = callPackage ../tools/misc/pkgdiff { }; + plib = callPackage ../development/libraries/plib { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; @@ -12776,8 +13709,16 @@ in buildPythonApplication click future six; }; + prospector = callPackage ../development/tools/prospector { + python = python37; + }; + protobuf = protobuf3_7; + protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; + protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; + protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; + protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; @@ -12785,6 +13726,8 @@ in protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; + protolock = callPackage ../development/libraries/protolock { }; + protozero = callPackage ../development/libraries/protozero { }; flatbuffers = callPackage ../development/libraries/flatbuffers { }; @@ -12792,18 +13735,15 @@ in gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - ptlib = callPackage ../development/libraries/ptlib {}; + pstreams = callPackage ../development/libraries/pstreams {}; pugixml = callPackage ../development/libraries/pugixml { }; - pybind11 = callPackage ../development/libraries/pybind11 { }; + pybind11 = pythonPackages.pybind11; python-qt = callPackage ../development/libraries/python-qt { python = python27; - qmake = qt59.qmake; - qttools = qt59.qttools; - qtwebengine = qt59.qtwebengine; - qtxmlpatterns = qt59.qtxmlpatterns; + inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -12835,7 +13775,7 @@ in cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 - mysql = if (!stdenv.isFreeBSD) then mysql else null; + libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null; inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; @@ -12854,72 +13794,26 @@ in developerBuild = true; }); - qt56 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.6) { - inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); - - libsForQt56 = lib.makeScope qt56.newScope mkLibsForQt5; - - qt59 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.9) { - inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit gtk3; - inherit (gnome3) dconf; - }); - - libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; - - qt511 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.11) { - inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit gtk3; - inherit (gnome3) dconf; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; - }); - - libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); - qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzzFull; + inherit dconf; + inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; - inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; inherit llvmPackages_5; }); libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + # TODO bump to 5.12 on darwin once it's not broken qt5 = qt512; - libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; + libsForQt5 = libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -12929,7 +13823,7 @@ in inherit (kdeFrameworks.override { libsForQt5 = self; }) attica baloo bluez-qt kactivities kactivities-stats - karchive kauth kbookmarks kcmutils kcodecs kcompletion kconfig + karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews @@ -12982,23 +13876,23 @@ in libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_2; + ffmpeg = ffmpeg_4; }; openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { - withQt5 = true; - }; + phonon = callPackage ../development/libraries/phonon { }; - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { - withQt5 = true; - }; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; @@ -13070,6 +13964,8 @@ in rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + raft-canonical = callPackage ../development/libraries/raft-canonical { }; + range-v3 = callPackage ../development/libraries/range-v3 {}; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; @@ -13125,18 +14021,17 @@ in lilv = callPackage ../development/libraries/audio/lilv { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; - lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lvtk = callPackage ../development/libraries/audio/lvtk { }; - patchwork = callPackage ../applications/networking/ssb/patchwork { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + randomx = callPackage ../development/libraries/randomx { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -13150,6 +14045,8 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; + rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rote = callPackage ../development/libraries/rote { }; ronn = callPackage ../development/tools/ronn { }; @@ -13189,6 +14086,8 @@ in SDL_net = callPackage ../development/libraries/SDL_net { }; + SDL_Pango = callPackage ../development/libraries/SDL_Pango {}; + SDL_sound = callPackage ../development/libraries/SDL_sound { }; SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; @@ -13239,7 +14138,7 @@ in inherit (darwin.apple_sdk.frameworks) GLUT; }; - simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; }; + simgear = callPackage ../development/libraries/simgear { }; simp_le = callPackage ../tools/admin/simp_le { }; @@ -13279,12 +14178,6 @@ in sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; - skydive = callPackage ../tools/networking/skydive { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; - slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { @@ -13308,12 +14201,11 @@ in soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; - soapysdr = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; }; + soapysdr = callPackage ../applications/radio/soapysdr { }; soapyremote = callPackage ../applications/radio/soapyremote { }; soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { - inherit (python3Packages) python numpy; extraPackages = [ limesuite soapyairspy @@ -13463,10 +14355,14 @@ in sundials = callPackage ../development/libraries/sundials { }; + sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { }; + sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; + svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; + swiftclient = python3.pkgs.callPackage ../tools/admin/swiftclient { }; sword = callPackage ../development/libraries/sword { }; @@ -13482,7 +14378,6 @@ in }; taglib = callPackage ../development/libraries/taglib { }; - taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { }; taglib_extras = callPackage ../development/libraries/taglib-extras { }; @@ -13496,7 +14391,9 @@ in tcllib = callPackage ../development/libraries/tcllib { }; - tcltls = callPackage ../development/libraries/tcltls { }; + tcltls = callPackage ../development/libraries/tcltls { + openssl = openssl_1_0_2; + }; tclx = callPackage ../development/libraries/tclx { }; @@ -13536,6 +14433,10 @@ in inherit (pythonPackages) twisted; }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { + inherit (pythonPackages) twisted; + }; + tidyp = callPackage ../development/libraries/tidyp { }; tinyxml = tinyxml2; @@ -13585,9 +14486,7 @@ in uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; - umockdev = callPackage ../development/libraries/umockdev { - vala = vala_0_40; - }; + umockdev = callPackage ../development/libraries/umockdev { }; unconvert = callPackage ../development/tools/unconvert { }; @@ -13601,7 +14500,7 @@ in unixODBC = callPackage ../development/libraries/unixODBC { }; - unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); + unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); ustr = callPackage ../development/libraries/ustr { }; @@ -13617,6 +14516,7 @@ in ucommon_openssl = callPackage ../development/libraries/ucommon { gnutls = null; + openssl = openssl_1_0_2; }; ucommon_gnutls = lowPrio (ucommon.override { @@ -13632,12 +14532,6 @@ in stdenv = gcc5Stdenv; }; - v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { - inherit (python2Packages) python gyp; - cctools = darwin.cctools; - stdenv = if stdenv.isDarwin then stdenv else gcc5Stdenv; - }; - v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 @@ -13690,9 +14584,8 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vte-ng = callPackage ../development/libraries/vte/ng.nix { }; - vtk = callPackage ../development/libraries/vtk { + stdenv = gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -13709,24 +14602,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "5994ae2a045015004cce24802dc47c33736486ea"; - sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6"; + rev = "aa9e8f538041db3055ea443080e0ccc315fa114f"; + sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc"; + sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "5432f0dd8f331f15182681664d7486681e8514e6"; - sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm"; + rev = "333d1c95792692205472c457d7bec915a94c8000"; + sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6"; }; }); }; @@ -13738,12 +14631,12 @@ in stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 }; + wally-cli = callPackage ../development/tools/wally-cli { }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; - wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; waylandpp = callPackage ../development/libraries/waylandpp { }; @@ -13753,20 +14646,7 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = gcc6Stdenv; - }; - - webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { - harfbuzz = harfbuzzFull.override { - icu = icu58; - }; - gst-plugins-base = gst_all_1.gst-plugins-base; - inherit (darwin) libobjc; - }; - - webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { - withGtk2 = true; - enableIntrospection = false; + stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -13821,8 +14701,10 @@ in x265 = callPackage ../development/libraries/x265 { }; + xandikos = callPackage ../servers/xandikos { }; + inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4; + xapian_1_4; xapian = xapian_1_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { @@ -13882,6 +14764,8 @@ in yder = callPackage ../development/libraries/yder { }; + ydotool = callPackage ../tools/wayland/ydotool { }; + yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -13918,18 +14802,12 @@ in cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq3 = callPackage ../development/libraries/czmq/3.x.nix {}; - czmq4 = callPackage ../development/libraries/czmq/4.x.nix {}; - czmq = czmq4; - - czmqpp = callPackage ../development/libraries/czmqpp { - czmq = czmq3; - }; + czmq = callPackage ../development/libraries/czmq/default.nix {}; zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_8; + llvmPackages = llvmPackages_9; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -13946,11 +14824,11 @@ in plugins = []; }; - gsignondPlugins = { + gsignondPlugins = recurseIntoAttrs { sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; - mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { }; + mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { }; }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -14052,27 +14930,24 @@ in ### DEVELOPMENT / GO MODULES - buildGo110Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_10; - }; - buildGo111Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_11; - }; buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; - - buildGoPackage = buildGo112Package; - - buildGo111Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_11; + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; }; + buildGoPackage = buildGo113Package; + buildGo112Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_12; }; - buildGoModule = buildGo112Module; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; + + buildGoModule = buildGo113Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -14130,8 +15005,8 @@ in perl530Packages = recurseIntoAttrs perl530.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl528; - perlPackages = perl528Packages; + perl = perl530; + perlPackages = perl530Packages; ack = perlPackages.ack; @@ -14184,8 +15059,6 @@ in kerberos = libkrb5; }; - rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; @@ -14194,6 +15067,16 @@ in mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; + # Redwax collection + mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; + mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; + mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; @@ -14204,7 +15087,11 @@ in mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; + + mod_wsgi = self.mod_wsgi2; + mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; }; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; }; php = pkgs.php.override { inherit apacheHttpd; }; @@ -14291,7 +15178,7 @@ in dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { - libmaa = callPackage ../servers/dict/libmaa.nix {}; + libmaa = callPackage ../servers/dict/libmaa.nix {}; }; dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {}); @@ -14302,6 +15189,10 @@ in dkimproxy = callPackage ../servers/mail/dkimproxy { }; + do-agent = callPackage ../servers/monitoring/do-agent { }; + + dodgy = with python3Packages; toPythonApplication dodgy; + dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; @@ -14318,6 +15209,7 @@ in prosody = callPackage ../servers/xmpp/prosody { # _compat can probably be removed on next minor version after 0.10.0 lua5 = lua5_2_compat; + withExtraLibs = [ luaPackages.luadbi-sqlite3 ]; inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi; }; @@ -14333,8 +15225,6 @@ in exim = callPackage ../servers/mail/exim { }; - facette = callPackage ../servers/monitoring/facette { }; - fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -14353,7 +15243,6 @@ in freeradius = callPackage ../servers/freeradius { }; freeswitch = callPackage ../servers/sip/freeswitch { - openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -14363,11 +15252,13 @@ in glabels = callPackage ../applications/graphics/glabels { }; - gnatsd = callPackage ../servers/gnatsd { }; + nats-server = callPackage ../servers/nats-server { }; gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoPackage = buildGo113Package; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; @@ -14423,8 +15314,6 @@ in labelImg = callPackage ../applications/science/machine-learning/labelimg { }; - mailman = callPackage ../servers/mail/mailman { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; mattermost = callPackage ../servers/mattermost { }; @@ -14435,14 +15324,14 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { - buildGoPackage = buildGo110Package; - }; + meguca = callPackage ../servers/meguca { }; memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; + micronaut = callPackage ../development/tools/micronaut {}; + minio = callPackage ../servers/minio { }; # Backwards compatibility. @@ -14450,8 +15339,17 @@ in mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - - mpd = callPackage ../servers/mpd (config.mpd or {}); + mod_ca = pkgs.apacheHttpdPackages.mod_ca; + mod_crl = pkgs.apacheHttpdPackages.mod_crl; + mod_csr = pkgs.apacheHttpdPackages.mod_csr; + mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp; + mod_scep = pkgs.apacheHttpdPackages.mod_scep; + mod_spkac = pkgs.apacheHttpdPackages.mod_spkac; + mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; + mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; + + inherit (callPackages ../servers/mpd { }) + mpd mpd-small mpdWithFeatures; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -14465,6 +15363,8 @@ in mlmmj = callPackage ../servers/mail/mlmmj { }; + moodle = callPackage ../servers/web-apps/moodle { }; + morty = callPackage ../servers/web-apps/morty { }; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; @@ -14487,17 +15387,17 @@ in nginx = nginxStable; nginxStable = callPackage ../servers/http/nginx/stable.nix { + perl = null; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { + perl = null; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; - openssl = openssl_1_1; }; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; @@ -14531,6 +15431,8 @@ in openxpki = callPackage ../servers/openxpki { }; + openxr-loader = callPackage ../development/libraries/openxr-loader { }; + osrm-backend = callPackage ../servers/osrm-backend { }; p910nd = callPackage ../servers/p910nd { }; @@ -14543,8 +15445,6 @@ in postsrsd = callPackage ../servers/mail/postsrsd { }; - rmilter = callPackage ../servers/mail/rmilter { }; - rspamd = callPackage ../servers/mail/rspamd { }; pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { @@ -14598,8 +15498,17 @@ in rpcbind = callPackage ../servers/rpcbind { }; - mariadb = callPackage ../servers/sql/mariadb { + libmysqlclient = libmysqlclient_3_1; + libmysqlclient_3_1 = mariadb-connector-c_3_1; + mariadb-connector-c = mariadb-connector-c_3_1; + mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; + + mariadb-galera = mariadb-galera_25; + mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { asio = asio_1_10; + }; + + mariadb = callPackage ../servers/sql/mariadb { # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". # https://jira.mariadb.org/browse/MDEV-15034 jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); @@ -14611,6 +15520,7 @@ in mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; boost = boost160; + openssl = openssl_1_0_2; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14641,6 +15551,12 @@ in boost = boost159; }; + mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { + inherit (darwin) cctools developer_cmds; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost169; # Configure checks for specific version. + }; + mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; @@ -14658,13 +15574,17 @@ in check-nwc-health check-ups-health; + check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { }; + checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; + pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { }; + neo4j = callPackage ../servers/nosql/neo4j { }; check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - net_snmp = callPackage ../servers/monitoring/net-snmp { }; + net-snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -14673,36 +15593,30 @@ in riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; + unpfs = callPackage ../servers/unpfs {}; + oidentd = callPackage ../servers/identd/oidentd { }; openfire = callPackage ../servers/xmpp/openfire { }; oracleXE = callPackage ../servers/sql/oracle-xe { }; - softether_4_25 = callPackage ../servers/softether/4.25.nix { }; + softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; }; softether_4_29 = callPackage ../servers/softether/4.29.nix { }; softether = softether_4_29; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; - OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; - OVMF-CSM = OVMF.override { openssl = null; }; - #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; }; + OVMF = callPackage ../applications/virtualization/OVMF { }; + OVMF-CSM = OVMF.override { csmSupport = true; }; + OVMF-secureBoot = OVMF.override { secureBoot = true; }; seabios = callPackage ../applications/virtualization/seabios { }; - cbfstool = callPackage ../applications/virtualization/cbfstool { }; - - ifdtool = callPackage ../tools/misc/ifdtool { }; - - nvramtool = callPackage ../tools/misc/nvramtool { }; - vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; - pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream @@ -14713,53 +15627,58 @@ in timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_9_4 postgresql_9_5 postgresql_9_6 postgresql_10 postgresql_11 + postgresql_12 ; - postgresql = postgresql_9_6.override { this = postgresql; }; + postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; + postgresql11Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; - inherit (callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo110Package; - }) prometheus_1; - - inherit (callPackage ../servers/monitoring/prometheus { }) - prometheus_2; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = prometheus_1; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; + prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; 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-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 { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; 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-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 { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; + prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; + prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; + prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; - prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { - buildGoPackage = buildGo110Package; - }; + prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { + # 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; + }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -14769,6 +15688,8 @@ in psqlodbc = callPackage ../development/libraries/psqlodbc { }; + public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { }; + pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; @@ -14782,6 +15703,8 @@ in inherit (pythonPackages) buildPythonPackage qpid-python; }; + qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; + quagga = callPackage ../servers/quagga { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { @@ -14801,7 +15724,11 @@ in redstore = callPackage ../servers/http/redstore { }; - restic = callPackage ../tools/backup/restic { }; + restic = callPackage ../tools/backup/restic { + # Version 0.9.5 fails to build with go 1.13 due to dependency: + # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; @@ -14812,7 +15739,7 @@ in }; rippled = callPackage ../servers/rippled { - boost = boost167; + boost = boost17x; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { @@ -14833,28 +15760,13 @@ in deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba3 = callPackage ../servers/samba/3.x.nix { }; - samba4 = callPackage ../servers/samba/4.x.nix { rpcgen = netbsd.rpcgen; python = python3; }; - sambaMaster = callPackage ../servers/samba/master.nix { }; - samba = samba4; - # A lightweight Samba 3, useful for non-Linux-based OSes. - samba3_light = lowPrio (samba3.override { - pam = null; - fam = null; - cups = null; - acl = null; - openldap = null; - # libunwind 1.0.1 is not ported to GNU/Hurd. - libunwind = null; - }); - samba4Full = lowPrio (samba4.override { enableLDAP = true; enablePrinting = true; @@ -14867,6 +15779,8 @@ in sambaFull = samba4Full; + sampler = callPackage ../applications/misc/sampler { }; + shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; shairport-sync = callPackage ../servers/shairport-sync { }; @@ -14886,6 +15800,8 @@ in sensu-go-backend sensu-go-cli; + check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { }; + uchiwa = callPackage ../servers/monitoring/uchiwa { }; shishi = callPackage ../servers/shishi { @@ -14899,8 +15815,6 @@ in sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; - sipcmd = callPackage ../applications/networking/sipcmd { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -14909,8 +15823,9 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + spring-boot = callPackage ../development/tools/spring-boot { }; + squid = callPackage ../servers/squid { }; - squid4 = callPackage ../servers/squid/4.nix { }; sslh = callPackage ../servers/sslh { }; @@ -14926,6 +15841,8 @@ in syncserver = callPackage ../servers/syncserver { }; + thanos = callPackage ../servers/monitoring/thanos { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 @@ -14950,21 +15867,28 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - matomo = callPackage ../servers/web-apps/matomo { }; + shiori = callPackage ../servers/web-apps/shiori { }; + + inherit (callPackages ../servers/web-apps/matomo {}) + matomo + matomo-beta; axis2 = callPackage ../servers/http/tomcat/axis2 { }; inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiTesting; + unifiStable; unifi = unifiStable; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; - virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { + openssl = openssl_1_0_2; + }; - virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; + virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { + openssl = openssl_1_0_2; + }; virtuoso = virtuoso6; @@ -15029,11 +15953,11 @@ in server = server-pgsql; }; - zabbix42 = zabbixFor "v42"; - zabbix40 = zabbixFor "v40"; - zabbix30 = zabbixFor "v30"; + zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); + zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix42; + zabbix = zabbix44; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -15055,7 +15979,7 @@ in alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; - alienfx = callPackage ../os-specific/linux/alienfx { }; + alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; @@ -15071,10 +15995,12 @@ in inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware + armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 + armTrustedFirmwareS905 ; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; @@ -15099,6 +16025,8 @@ in bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; + brillo = callPackage ../os-specific/linux/brillo { }; + broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { }; batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; @@ -15114,12 +16042,6 @@ in bluez = bluez5; - bluezFull = bluez.override { - enableWiimote = true; - enableMidi = true; - enableSixaxis = true; - }; - inherit (python3Packages) bedup; bolt = callPackage ../os-specific/linux/bolt { }; @@ -15127,7 +16049,12 @@ in bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; - busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; + busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { + # musl roadmap has RISC-V support projected for 1.1.20 + busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic" + then pkgsStatic.busybox + else busybox; + }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; @@ -15139,7 +16066,11 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; + + cockroachdb = callPackage ../servers/sql/cockroachdb { + buildGoPackage = buildGo112Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -15150,6 +16081,8 @@ in coredns = callPackage ../servers/dns/coredns { }; + corerad = callPackage ../tools/networking/corerad { }; + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cpuset = callPackage ../os-specific/linux/cpuset { }; @@ -15192,9 +16125,7 @@ in dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { - buildGoPackage = buildGo110Package; - }; + fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -15259,10 +16190,14 @@ in gradm = callPackage ../os-specific/linux/gradm { }; + inherit (nodePackages) gtop; + hd-idle = callPackage ../os-specific/linux/hd-idle { }; hdparm = callPackage ../os-specific/linux/hdparm { }; + health-check = callPackage ../os-specific/linux/health-check { }; + hibernate = callPackage ../os-specific/linux/hibernate { }; hostapd = callPackage ../os-specific/linux/hostapd { }; @@ -15279,10 +16214,14 @@ in pcm = callPackage ../os-specific/linux/pcm { }; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { + openssl = openssl_1_0_2; + }; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; + intel-compute-runtime = callPackage ../os-specific/linux/intel-compute-runtime { }; + intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; iomelt = callPackage ../os-specific/linux/iomelt { }; @@ -15295,7 +16234,9 @@ in iputils = callPackage ../os-specific/linux/iputils { }; - iptables = callPackage ../os-specific/linux/iptables { }; + iptables = iptables-legacy; + iptables-legacy = callPackage ../os-specific/linux/iptables { }; + iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; }; iptstate = callPackage ../os-specific/linux/iptstate { } ; @@ -15326,9 +16267,7 @@ in kmscube = callPackage ../os-specific/linux/kmscube { }; - kmsxx = callPackage ../development/libraries/kmsxx { - stdenv = gcc6Stdenv; - }; + kmsxx = callPackage ../development/libraries/kmsxx { }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -15354,6 +16293,10 @@ in osxfuse = callPackage ../os-specific/darwin/osxfuse { }; + osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; + + power-calibrate = callPackage ../os-specific/linux/power-calibrate { }; + powerstat = callPackage ../os-specific/linux/powerstat { }; smemstat = callPackage ../os-specific/linux/smemstat { }; @@ -15378,6 +16321,7 @@ in linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] @@ -15392,15 +16336,42 @@ in kernelPatches = linux_4_19.kernelPatches; }; - linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 1; + }; + + linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 2; + }; + + linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 3; + }; + + linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; + rpiVersion = 4; }; linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.modinst_arg_list_too_long # https://github.com/NixOS/nixpkgs/issues/42755 @@ -15414,6 +16385,7 @@ in linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long ]; @@ -15422,49 +16394,43 @@ in linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions + kernelPatches.export_kernel_fpu_functions."4.14" ]; }; linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions + kernelPatches.export_kernel_fpu_functions."4.14" ]; }; - linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions - ]; - }; - - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions - ]; + linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; }; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions + kernelPatches.request_key_helper ]; }; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long ]; }; @@ -15472,6 +16438,7 @@ in linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long ]; }; @@ -15507,12 +16474,8 @@ in bbswitch = callPackage ../os-specific/linux/bbswitch {}; - beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { }; - ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - blcr = callPackage ../os-specific/linux/blcr { }; - chipsec = callPackage ../tools/security/chipsec { inherit kernel; withDriver = true; @@ -15522,17 +16485,25 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; + digimend = callPackage ../os-specific/linux/digimend { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; + fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - e1000e = callPackage ../os-specific/linux/e1000e {}; + e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + + intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -15558,6 +16529,8 @@ in nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11 = nvidiaPackages.stable; + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; + ply = callPackage ../os-specific/linux/ply { }; r8168 = callPackage ../os-specific/linux/r8168 { }; @@ -15598,9 +16571,10 @@ in perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - phc-intel = callPackage ../os-specific/linux/phc-intel { }; + phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; - prl-tools = callPackage ../os-specific/linux/prl-tools { }; + # Disable for kernels 4.15 and above due to compatibility issues + prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; sch_cake = callPackage ../os-specific/linux/sch_cake { }; @@ -15612,6 +16586,8 @@ in tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; + turbostat = callPackage ../os-specific/linux/turbostat { }; + usbip = callPackage ../os-specific/linux/usbip { }; v86d = callPackage ../os-specific/linux/v86d { }; @@ -15626,10 +16602,12 @@ in virtualbox = pkgs.virtualboxHardened; }; - wireguard = callPackage ../os-specific/linux/wireguard { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; + zenpower = callPackage ../os-specific/linux/zenpower { }; + inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel; @@ -15645,18 +16623,20 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_2; + linuxPackages_latest = linuxPackages_5_4; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; - linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; + linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; + linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; + linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; + linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); - linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); + linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -15730,17 +16710,26 @@ in linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); # Derive one of the default .config files - linuxConfig = { src, makeTarget ? "defconfig", name ? "kernel.config" }: - stdenv.mkDerivation { - inherit name src; - buildPhase = '' - set -x - make ${makeTarget} - ''; - installPhase = '' - cp .config $out - ''; - }; + linuxConfig = { + src, + version ? (builtins.parseDrvName src.name).version, + makeTarget ? "defconfig", + name ? "kernel.config", + }: stdenvNoCC.mkDerivation { + inherit name src; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + buildPhase = '' + set -x + make \ + ARCH=${stdenv.hostPlatform.kernelArch} \ + HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ + ${makeTarget} + ''; + installPhase = '' + cp .config $out + ''; + }; buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; @@ -15752,9 +16741,13 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; - libselinux = callPackage ../os-specific/linux/libselinux { }; + libselinux = callPackage ../os-specific/linux/libselinux { + python = python3; + }; - libsemanage = callPackage ../os-specific/linux/libsemanage { }; + libsemanage = callPackage ../os-specific/linux/libsemanage { + python = python3; + }; libraw = callPackage ../development/libraries/libraw { }; @@ -15764,8 +16757,6 @@ in libsass = callPackage ../development/libraries/libsass { }; - libsexy = callPackage ../development/libraries/libsexy { }; - libsepol = callPackage ../os-specific/linux/libsepol { }; libsmbios = callPackage ../os-specific/linux/libsmbios { }; @@ -15813,6 +16804,7 @@ in aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { + inherit (buildPackages) kmod; inherit modules; }; @@ -15822,6 +16814,10 @@ in musl = callPackage ../os-specific/linux/musl { }; + nushell = callPackage ../shells/nushell { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -15870,6 +16866,8 @@ in goconvey = callPackage ../development/tools/goconvey { }; + gofumpt = callPackage ../development/tools/gofumpt { }; + gotags = callPackage ../development/tools/gotags { }; golint = callPackage ../development/tools/golint { }; @@ -15900,11 +16898,19 @@ in gotests = callPackage ../development/tools/gotests { }; + gotestsum = callPackage ../development/tools/gotestsum { + # Version 0.3.5 fails to build with go 1.13: + # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain + buildGoModule = buildGo112Module; + }; + impl = callPackage ../development/tools/impl { }; quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { + openssl = openssl_1_0_2; + }; linux-pam = callPackage ../os-specific/linux/pam { }; @@ -15916,6 +16922,8 @@ in ofp = callPackage ../os-specific/linux/ofp { }; + ofono = callPackage ../tools/networking/ofono { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -15936,7 +16944,9 @@ in pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; - pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { + openssl = openssl_1_0_2; + }; pam_u2f = callPackage ../os-specific/linux/pam_u2f { }; @@ -15970,7 +16980,7 @@ in semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -16021,10 +17031,6 @@ in riscv-pk = callPackage ../misc/riscv-pk { }; - riscv-pk-with-kernel = riscv-pk.override { - payload = "${linux_riscv}/vmlinux"; - }; - roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; rtkit = callPackage ../os-specific/linux/rtkit { }; @@ -16049,6 +17055,8 @@ in sdparm = callPackage ../os-specific/linux/sdparm { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sepolgen = callPackage ../os-specific/linux/sepolgen { }; setools = callPackage ../os-specific/linux/setools { }; @@ -16119,6 +17127,8 @@ in tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; + trickster = callPackage ../servers/trickster/trickster.nix {}; + trinity = callPackage ../os-specific/linux/trinity { }; tunctl = callPackage ../os-specific/linux/tunctl { }; @@ -16131,12 +17141,14 @@ in ubootTools ubootA20OlinuxinoLime ubootBananaPi + ubootBananaPim3 ubootBananaPim64 ubootBeagleboneBlack ubootClearfog ubootGuruplug ubootJetsonTK1 ubootNovena + ubootOdroidC2 ubootOdroidXU3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 @@ -16151,6 +17163,8 @@ in ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit ubootRaspberryPiZero + ubootRock64 + ubootRockPro64 ubootSheevaplug ubootSopine ubootUtilite @@ -16160,10 +17174,6 @@ in # Non-upstream U-Boots: ubootNanonote = callPackage ../misc/uboot/nanonote.nix { }; - ubootRock64 = callPackage ../misc/uboot/rock64.nix { }; - - ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { }; - uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = callPackage ../os-specific/linux/uclibc { @@ -16184,10 +17194,12 @@ in upower = callPackage ../os-specific/linux/upower { }; - usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard { + usbguard = callPackage ../os-specific/linux/usbguard { libgcrypt = null; }; + usbtop = callPackage ../os-specific/linux/usbtop { }; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; @@ -16204,7 +17216,7 @@ in systemd = null; }) else utillinux; - v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; + v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -16216,14 +17228,14 @@ in wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; - xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; - - xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { }; + xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; + xilinx-bootgen = callPackage ../tools/misc/xilinx-bootgen { }; + xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; @@ -16238,12 +17250,22 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adapta-gtk-theme = callPackage ../data/themes/adapta { }; + + adapta-kde-theme = callPackage ../data/themes/adapta-kde { }; + adementary-theme = callPackage ../data/themes/adementary { }; + adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; + albatross = callPackage ../data/themes/albatross { }; + + amber-theme = callPackage ../data/themes/amber { }; + amiri = callPackage ../data/fonts/amiri { }; andagii = callPackage ../data/fonts/andagii { }; @@ -16261,6 +17283,10 @@ in arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; + arc-kde-theme = callPackage ../data/themes/arc-kde { }; + + arc-theme = callPackage ../data/themes/arc { }; + arkpandora_ttf = callPackage ../data/fonts/arkpandora { }; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; @@ -16276,6 +17302,10 @@ in bgnet = callPackage ../data/documentation/bgnet { }; bibata-cursors = callPackage ../data/icons/bibata-cursors { }; + bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; + bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; + + blackbird = callPackage ../data/themes/blackbird { }; brise = callPackage ../data/misc/brise { }; @@ -16291,9 +17321,15 @@ in carlito = callPackage ../data/fonts/carlito {}; + cascadia-code = callPackage ../data/fonts/cascadia-code { }; + charis-sil = callPackage ../data/fonts/charis-sil { }; - cherry = callPackage ../data/fonts/cherry { }; + cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + + cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { }; + + clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; @@ -16321,7 +17357,7 @@ in # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 dejavu_fontsEnv = buildEnv { - name = "${dejavu_fonts.name}"; + name = dejavu_fonts.name; paths = [ dejavu_fonts.out ]; }; @@ -16381,10 +17417,14 @@ in dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + e17gtk = callPackage ../data/themes/e17gtk { }; + eb-garamond = callPackage ../data/fonts/eb-garamond { }; elliptic_curves = callPackage ../data/misc/elliptic_curves { }; + equilux-theme = callPackage ../data/themes/equilux-theme { }; + eunomia = callPackage ../data/fonts/eunomia { }; f5_6 = callPackage ../data/fonts/f5_6 { }; @@ -16420,7 +17460,10 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { }; + + font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; + font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -16435,14 +17478,18 @@ in gohufont = callPackage ../data/fonts/gohufont { }; - gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; + gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; + gnome-breeze = callPackage ../data/themes/gnome-breeze { }; + go-font = callPackage ../data/fonts/go-font { }; greybird = callPackage ../data/themes/greybird { }; + gubbi-font = callPackage ../data/fonts/gubbi { }; + gyre-fonts = callPackage ../data/fonts/gyre {}; hack-font = callPackage ../data/fonts/hack { }; @@ -16474,7 +17521,7 @@ in iosevka = callPackage ../data/fonts/iosevka { - nodejs = nodejs-8_x; + nodejs = nodejs-10_x; }; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; @@ -16483,14 +17530,20 @@ in iwona = callPackage ../data/fonts/iwona { }; + jetbrains-mono = callPackage ../data/fonts/jetbrains-mono { }; + jost = callPackage ../data/fonts/jost { }; + joypixels = callPackage ../data/fonts/joypixels { }; + junicode = callPackage ../data/fonts/junicode { }; kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -16511,6 +17564,10 @@ in liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; + libevdevc = callPackage ../os-specific/linux/libevdevc { }; + + libgestures = callPackage ../os-specific/linux/libgestures { }; + liberastika = callPackage ../data/fonts/liberastika { }; libertine = callPackage ../data/fonts/libertine { }; @@ -16541,6 +17598,8 @@ in # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); + lounge-gtk-theme = callPackage ../data/themes/lounge { }; + luculent = callPackage ../data/fonts/luculent { }; maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; @@ -16626,28 +17685,42 @@ in numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { }; + numix-gtk-theme = callPackage ../data/themes/numix { }; + + numix-solarized-gtk-theme = callPackage ../data/themes/numix-solarized { }; + + numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { }; + office-code-pro = callPackage ../data/fonts/office-code-pro { }; oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; + onestepback = callPackage ../data/themes/onestepback { }; + open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; open-sans = callPackage ../data/fonts/open-sans { }; orbitron = callPackage ../data/fonts/orbitron { }; + orion = callPackage ../data/themes/orion {}; + overpass = callPackage ../data/fonts/overpass { }; oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; inherit (kdeFrameworks) oxygen-icons5; + paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; + paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; @@ -16674,6 +17747,8 @@ in polytopes_db = callPackage ../data/misc/polytopes_db { }; + pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -16682,7 +17757,6 @@ in powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { }; @@ -16693,8 +17767,12 @@ in publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; + qogir-theme = callPackage ../data/themes/qogir { }; + qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; route159 = callPackage ../data/fonts/route159 { }; @@ -16711,6 +17789,8 @@ in shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; + sweet = callPackage ../data/themes/sweet { }; + mime-types = callPackage ../data/misc/mime-types { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -16723,10 +17803,18 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + solarc-gtk-theme = callPackage ../data/themes/solarc { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; + starship = callPackage ../tools/misc/starship { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + stig = callPackage ../applications/networking/p2p/stig { }; + stix-otf = callPackage ../data/fonts/stix-otf { }; stix-two = callPackage ../data/fonts/stix-two { }; @@ -16754,6 +17842,10 @@ in raleway = callPackage ../data/fonts/raleway { }; + recursive = callPackage ../data/fonts/recursive { }; + + rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; + rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; roboto = callPackage ../data/fonts/roboto { }; @@ -16794,7 +17886,7 @@ in source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; - spleen = callPackage ../data/fonts/spleen { }; + spleen = callPackage ../data/fonts/spleen { inherit (xorg) mkfontdir; }; stilo-themes = callPackage ../data/themes/stilo { }; @@ -16808,6 +17900,10 @@ in gtk = res.gtk2; }; + theme-jade1 = callPackage ../data/themes/jade1 { }; + + theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; + themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; theano = callPackage ../data/fonts/theano { }; @@ -16828,6 +17924,8 @@ in tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; + theme-vertex = callPackage ../data/themes/vertex { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; @@ -16838,6 +17936,8 @@ in inherit (nodePackages) svgo; }; + twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -16850,12 +17950,20 @@ in uni-vga = callPackage ../data/fonts/uni-vga { }; + unicode-character-database = callPackage ../data/misc/unicode-character-database { }; + + unicode-emoji = callPackage ../data/misc/unicode-emoji { }; + + unihan-database = callPackage ../data/misc/unihan-database { }; + unifont = callPackage ../data/fonts/unifont { }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; unscii = callPackage ../data/fonts/unscii { }; + uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; }; + vanilla-dmz = callPackage ../data/icons/vanilla-dmz { }; vdrsymbols = callPackage ../data/fonts/vdrsymbols { }; @@ -16872,6 +17980,8 @@ in wireless-regdb = callPackage ../data/misc/wireless-regdb { }; + work-sans = callPackage ../data/fonts/work-sans { }; + wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; @@ -16890,6 +18000,8 @@ in yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; + yaru-theme = callPackage ../data/themes/yaru {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { }; zeal = libsForQt5.callPackage ../data/documentation/zeal { }; @@ -16943,6 +18055,8 @@ in airwave = callPackage ../applications/audio/airwave { }; + akira-unstable = callPackage ../applications/graphics/akira { }; + alembic = callPackage ../development/libraries/alembic {}; alchemy = callPackage ../applications/graphics/alchemy { }; @@ -16982,6 +18096,9 @@ in apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + apngasm = callPackage ../applications/graphics/apngasm {}; + apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; + appeditor = callPackage ../applications/misc/appeditor { }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; @@ -16997,6 +18114,8 @@ in ario = callPackage ../applications/audio/ario { }; + arion = callPackage ../applications/virtualization/arion { }; + arora = callPackage ../applications/networking/browsers/arora { }; artha = callPackage ../applications/misc/artha { }; @@ -17029,21 +18148,14 @@ in avocode = callPackage ../applications/graphics/avocode {}; + azpainter = callPackage ../applications/graphics/azpainter { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; - altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); - - bitcoin = altcoins.bitcoin; - clightning = altcoins.clightning; - lnd = altcoins.lnd; - - bitcoin-xt = altcoins.bitcoin-xt; - cryptop = altcoins.cryptop; - jnetmap = callPackage ../applications/networking/jnetmap {}; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { @@ -17056,19 +18168,6 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; - - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; - - polkadot = res.altcoins.polkadot; - - stellar-core = res.altcoins.stellar-core; - - particl-core = res.altcoins.particl-core; - aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -17113,8 +18212,6 @@ in batik = callPackage ../applications/graphics/batik { }; - batti = callPackage ../applications/misc/batti { }; - baudline = callPackage ../applications/audio/baudline { }; @@ -17131,7 +18228,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { ffmpeg = ffmpeg_4; @@ -17153,6 +18250,8 @@ in bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; + bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; bitscope = recurseIntoAttrs @@ -17177,8 +18276,7 @@ in bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - pythonPackages = python35Packages; - stdenv = gcc6Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; bluefish = callPackage ../applications/editors/bluefish { @@ -17193,6 +18291,8 @@ in libXi libXext libXfixes libXcomposite; }; + blugon = callPackage ../applications/misc/blugon { }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -17213,6 +18313,12 @@ in bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; + + bslizr = callPackage ../applications/audio/bslizr { }; + + bshapr = callPackage ../applications/audio/bshapr { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; btops = callPackage ../applications/window-managers/btops { }; @@ -17221,6 +18327,8 @@ in bviplus = callPackage ../applications/editors/bviplus { }; + cage = callPackage ../applications/window-managers/cage { }; + calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; stdenv = gcc5Stdenv; @@ -17228,6 +18336,8 @@ in calcurse = callPackage ../applications/misc/calcurse { }; + calculix = callPackage ../applications/science/math/calculix {}; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { @@ -17236,7 +18346,11 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { }; + perkeep = callPackage ../applications/misc/perkeep { + # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: + # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -17246,10 +18360,10 @@ in carla = qt5.callPackage ../applications/audio/carla { }; - catfish = callPackage ../applications/search/catfish { }; - catimg = callPackage ../tools/misc/catimg { }; + catt = python3Packages.callPackage ../applications/video/catt { }; + cava = callPackage ../applications/audio/cava { }; cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; @@ -17269,10 +18383,6 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; - cdrtools = callPackage ../applications/misc/cdrtools { - inherit (darwin.apple_sdk.frameworks) Carbon IOKit; - }; - centerim = callPackage ../applications/networking/instant-messengers/centerim { }; cgit = callPackage ../applications/version-management/git-and-tools/cgit { @@ -17281,9 +18391,7 @@ in cgminer = callPackage ../applications/misc/cgminer { }; - chirp = callPackage ../applications/radio/chirp { - inherit (pythonPackages) pyserial pygtk; - }; + chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -17303,6 +18411,8 @@ in cinelerra = callPackage ../applications/video/cinelerra { }; + cipher = callPackage ../applications/misc/cipher { }; + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; }; @@ -17313,6 +18423,10 @@ in cligh = python3Packages.callPackage ../development/tools/github/cligh {}; + clight = callPackage ../applications/misc/clight { }; + + clightd = callPackage ../applications/misc/clight/clightd.nix { }; + clipgrab = qt5.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -17359,16 +18473,10 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt59.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; }; - cinepaint = callPackage ../applications/graphics/cinepaint { - fltk = fltk13; - libpng = libpng12; - cmake = cmake_2_8; - }; - codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; @@ -17385,8 +18493,12 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; + crun = callPackage ../applications/virtualization/crun {}; + csdp = callPackage ../applications/science/math/csdp { }; ctop = callPackage ../tools/system/ctop { }; @@ -17401,15 +18513,6 @@ in cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; - cutegram = - let callpkg = libsForQt56.callPackage; - in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec { - libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; - telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml { - inherit libqtelegram-aseman-edition; - }; - }; - cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; @@ -17420,6 +18523,8 @@ in cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + dablin = callPackage ../applications/radio/dablin { }; + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -17466,8 +18571,6 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - diffuse = callPackage ../applications/version-management/diffuse { }; - direwolf = callPackage ../applications/misc/direwolf { }; dirt = callPackage ../applications/audio/dirt {}; @@ -17480,12 +18583,16 @@ in djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; - djview = callPackage ../applications/graphics/djview { }; + djview = libsForQt5.callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; - dmenu2 = callPackage ../applications/misc/dmenu2 { }; + # TODO (@primeos): Remove after the 19.09 branch-off: + dmenu2 = throw '' + The fork "dmenu2" is not maintained by upstream anymore. Please use the + original "dmenu" instead. + ''; dmensamenu = callPackage ../applications/misc/dmensamenu { inherit (python3Packages) buildPythonApplication requests; @@ -17497,10 +18604,11 @@ in }; inherit (callPackage ../applications/virtualization/docker {}) - docker_18_09; + docker_18_09 + docker_19_03; - docker = docker_18_09; - docker-edge = docker_18_09; + docker = docker_19_03; + docker-edge = docker_19_03; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -17511,6 +18619,7 @@ in docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; + inherit (darwin) cctools; }; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; @@ -17519,6 +18628,8 @@ in docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; + docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; + doodle = callPackage ../applications/search/doodle { }; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; @@ -17598,19 +18709,21 @@ in electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; - electrum = callPackage ../applications/misc/electrum { }; + electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elinks = callPackage ../applications/networking/browsers/elinks { + openssl = openssl_1_0_2; + }; elvis = callPackage ../applications/editors/elvis { }; emacs = emacs26; emacsPackages = emacs26Packages; - emacsPackagesNg = emacs26PackagesNg; + emacs-nox = emacs26-nox; emacs26 = callPackage ../applications/editors/emacs { # use override to enable additional features @@ -17626,6 +18739,7 @@ in emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { withX = false; + withNS = false; withGTK2 = false; withGTK3 = false; })); @@ -17655,154 +18769,8 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; - emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { - inherit emacs; - - autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; - - bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; - - cedet = callPackage ../applications/editors/emacs-modes/cedet { }; - - calfw = callPackage ../applications/editors/emacs-modes/calfw { }; - - cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; }; - - coffee = callPackage ../applications/editors/emacs-modes/coffee { }; - - colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; - - colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { }; - - cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; - - cua = callPackage ../applications/editors/emacs-modes/cua { }; - - d = callPackage ../applications/editors/emacs-modes/d { }; - - darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; - - # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; - - emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; - - emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; - - emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; - - emms = callPackage ../applications/editors/emacs-modes/emms { }; - - ensime = callPackage ../applications/editors/emacs-modes/ensime { }; - - erlangMode = callPackage ../applications/editors/emacs-modes/erlang { }; - - ess = callPackage ../applications/editors/emacs-modes/ess { }; - - flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; - - gh = callPackage ../applications/editors/emacs-modes/gh { }; - - graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { }; - - gist = callPackage ../applications/editors/emacs-modes/gist { }; - - haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; - - hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; - - hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; - - htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; - - ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { }; - - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; - - idris = callPackage ../applications/editors/emacs-modes/idris { }; - - jabber = callPackage ../applications/editors/emacs-modes/jabber { }; - - jade = callPackage ../applications/editors/emacs-modes/jade { }; - - jdee = callPackage ../applications/editors/emacs-modes/jdee { }; - - js2 = callPackage ../applications/editors/emacs-modes/js2 { }; - - let-alist = callPackage ../applications/editors/emacs-modes/let-alist { }; - - logito = callPackage ../applications/editors/emacs-modes/logito { }; - - loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - - markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { }; - - maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; - - metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; - - monky = callPackage ../applications/editors/emacs-modes/monky { }; - - notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; - - offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; - - # This is usually a newer version of Org-Mode than that found in GNU Emacs, so - # we want it to have higher precedence. - org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); - - org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; - - pcache = callPackage ../applications/editors/emacs-modes/pcache { }; - - phpMode = callPackage ../applications/editors/emacs-modes/php { }; - - prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix { - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix { - texinfo = texinfo4 ; - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - - quack = callPackage ../applications/editors/emacs-modes/quack { }; - - rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { }; - - rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; - - rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - - s = callPackage ../applications/editors/emacs-modes/s { }; - - sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; - - scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; - scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; - - structuredHaskellMode = haskellPackages.structured-haskell-mode; - - sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; - - tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; - - writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; - - xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; - - cask = callPackage ../applications/editors/emacs-modes/cask { }; - }; - - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages); - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); - - emacsPackagesNgFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv; + emacsPackagesFor = emacs: import ./emacs-packages.nix { + inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; @@ -17816,25 +18784,28 @@ in }; external = { - inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; - inherit (pythonPackages) elpy; + inherit (haskellPackages) + ghc-mod structured-haskell-mode Agda hindent; inherit - autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib - substituteAll rustPlatform cmake llvmPackages libtool zeromq; + autoconf automake editorconfig-core-c git libffi libpng pkgconfig + poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages + libtool zeromq openssl; }; }; - emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25); - emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26); + emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; - emacsWithPackages = emacsPackagesNg.emacsWithPackages; + emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs26WithPackages = emacs26Packages.emacsWithPackages; + emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + envelope = callPackage ../applications/office/envelope { }; + eolie = callPackage ../applications/networking/browsers/eolie { }; epdfview = callPackage ../applications/misc/epdfview { }; @@ -17847,10 +18818,12 @@ in epic5 = callPackage ../applications/networking/irc/epic5 { }; + epr = callPackage ../applications/misc/epr { }; + eq10q = callPackage ../applications/audio/eq10q { }; errbot = callPackage ../applications/networking/errbot { - pythonPackages = python3Packages; + python = python3; }; espeak-classic = callPackage ../applications/audio/espeak { }; @@ -17893,6 +18866,8 @@ in keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; + keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -17909,7 +18884,9 @@ in fehlstart = callPackage ../applications/misc/fehlstart { }; - fetchmail = callPackage ../applications/misc/fetchmail { }; + fetchmail = callPackage ../applications/misc/fetchmail { + openssl = openssl_1_0_2; + }; fff = callPackage ../applications/misc/fff { }; @@ -17917,7 +18894,7 @@ in FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - flacon = callPackage ../applications/audio/flacon { }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -17957,7 +18934,9 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { + openssl = openssl_1_0_2; + }; fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; @@ -17974,6 +18953,8 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -18052,6 +19033,8 @@ in grepm = callPackage ../applications/search/grepm { }; + grip-search = callPackage ../tools/text/grip-search { }; + grip = callPackage ../applications/misc/grip { inherit (gnome2) libgnome libgnomeui vte; }; @@ -18092,7 +19075,7 @@ in wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead."; + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; }; sngrep = callPackage ../applications/networking/sniffers/sngrep {}; @@ -18113,7 +19096,6 @@ in libpng = libpng_apng; python = python2; gnused = gnused_422; - icu = icu63; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; @@ -18125,7 +19107,6 @@ in firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; - tor-browser-unwrapped = firefoxPackages.tor-browser; icecat-unwrapped = firefoxPackages.icecat; firefox = wrapFirefox firefox-unwrapped { }; @@ -18145,8 +19126,7 @@ in firefox-bin = wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; - name = "firefox-bin-" + - (builtins.parseDrvName firefox-bin-unwrapped.name).version; + pname = "firefox-bin"; desktopName = "Firefox"; }; @@ -18159,8 +19139,7 @@ in firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; - name = "firefox-beta-bin-" + - (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; + pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -18174,15 +19153,10 @@ in firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; - name = "firefox-devedition-bin-" + - (builtins.parseDrvName firefox-devedition-bin-unwrapped.name).version; + pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; }; - firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr - { boost = boost155; - }; - flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -18205,14 +19179,18 @@ in fomp = callPackage ../applications/audio/fomp { }; + formatter = callPackage ../applications/misc/formatter { }; + fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; freenet = callPackage ../applications/networking/p2p/freenet { }; + freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; + freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -18227,6 +19205,8 @@ in freerdpUnstable = freerdp; + friture = libsForQt5.callPackage ../applications/audio/friture { }; + fte = callPackage ../applications/editors/fte { }; game-music-emu = callPackage ../applications/audio/game-music-emu { }; @@ -18241,9 +19221,7 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; - getxbook = callPackage ../applications/misc/getxbook {}; - - ghq = gitAndTools.ghq; + getxbook = callPackage ../applications/misc/getxbook { }; gimp = callPackage ../applications/graphics/gimp { gegl = gegl_0_4; @@ -18263,7 +19241,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; gitMinimal = git.override { withManual = false; @@ -18283,13 +19261,9 @@ in inherit (gnome3) gitg; - giv = callPackage ../applications/graphics/giv { }; - gmrun = callPackage ../applications/misc/gmrun {}; - gnucash = callPackage ../applications/office/gnucash { - inherit (gnome3) dconf; - }; + gnucash = callPackage ../applications/office/gnucash { }; goffice = callPackage ../development/libraries/goffice { }; @@ -18307,7 +19281,7 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manuskript = callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; @@ -18317,7 +19291,7 @@ in moe = callPackage ../applications/editors/moe { }; - multibootusb = callPackage ../applications/misc/multibootusb {}; + multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; praat = callPackage ../applications/audio/praat { }; @@ -18332,10 +19306,14 @@ in svox = callPackage ../applications/audio/svox { }; + giada = callPackage ../applications/audio/giada {}; + gkrellm = callPackage ../applications/misc/gkrellm { inherit (darwin) IOKit; }; + glow = callPackage ../applications/editors/glow { }; + glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; gmtk = callPackage ../development/libraries/gmtk { }; @@ -18389,10 +19367,10 @@ in gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-mpv = callPackage ../applications/video/gnome-mpv { }; + celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts gnome-autoar; + inherit (gnome3) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -18425,6 +19403,8 @@ in gpsprune = callPackage ../applications/misc/gpsprune { }; + gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; + gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; gspell = callPackage ../development/libraries/gspell { }; @@ -18441,22 +19421,26 @@ in gv = callPackage ../applications/misc/gv { }; + gvisor = callPackage ../applications/virtualization/gvisor { }; + + gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; + guvcview = callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; + gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { }; + gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; hackrf = callPackage ../applications/radio/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; - hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker { - inherit (gnome2) gnome_python; - }; - hashit = callPackage ../tools/misc/hashit { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; + hello = callPackage ../applications/misc/hello { }; hello-unfree = callPackage ../applications/misc/hello-unfree { }; @@ -18470,6 +19454,8 @@ in hexcurse = callPackage ../applications/editors/hexcurse { }; + hexdino = callPackage ../applications/editors/hexdino { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; @@ -18490,6 +19476,8 @@ in hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; + hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; @@ -18506,6 +19494,8 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; + hydroxide = callPackage ../applications/networking/hydroxide { }; + hyper = callPackage ../applications/misc/hyper { }; hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { @@ -18528,6 +19518,15 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + pinboard-notes-backup = haskell.lib.overrideCabal + (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" + haskellPackages.pinboard-notes-backup) + (drv: { + postInstall = '' + install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 + '' + (drv.postInstall or ""); + }); + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-theme-black = callPackage ../applications/networking/instant-messengers/slack/dark-theme.nix { }; slack-dark = pkgs.slack.override { theme = slack-theme-black; }; @@ -18546,31 +19545,28 @@ in spotifyd = callPackage ../applications/audio/spotifyd { withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or true; + withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; }; super-productivity = callPackage ../applications/networking/super-productivity { }; - wlc = callPackage ../development/libraries/wlc { }; - wlroots = callPackage ../development/libraries/wlroots { }; + wlr-randr = callPackage ../tools/misc/wlr-randr { }; - orbment = callPackage ../applications/window-managers/orbment { }; + wlroots = callPackage ../development/libraries/wlroots { }; - sway = callPackage ../applications/window-managers/sway { }; + sway-unwrapped = callPackage ../applications/window-managers/sway { }; + sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; + waybar = callPackage ../applications/misc/waybar { pulseSupport = config.pulseaudio or false; }; - velox = callPackage ../applications/window-managers/velox { - stConf = config.st.conf or null; - stPatches = config.st.patches or null; - }; - i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -18629,7 +19625,7 @@ in stdenv = gccStdenv; }; - ike = callPackage ../applications/networking/ike { }; + ike = callPackage ../applications/networking/ike { bison = bison2; }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; @@ -18710,7 +19706,6 @@ in inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; - poppler = poppler_0_61; }; inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; @@ -18729,12 +19724,12 @@ in iptraf-ng = callPackage ../applications/networking/iptraf-ng { }; + irccloud = callPackage ../applications/networking/irc/irccloud { }; + irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; - irssi_otr = callPackage ../applications/networking/irc/irssi/otr { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; bip = callPackage ../applications/networking/irc/bip { }; @@ -18764,6 +19759,8 @@ in japa = callPackage ../applications/audio/japa { }; + dupd = callPackage ../tools/misc/dupd { }; + jdupes = callPackage ../tools/misc/jdupes { }; jedit = callPackage ../applications/editors/jedit { }; @@ -18787,7 +19784,7 @@ in k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = gcc6Stdenv; - boost = boost166.override { enablePython = true; }; + boost = boost155.override { enablePython = true; }; }; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; @@ -18811,7 +19808,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole + keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -18847,8 +19844,6 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - keymon = callPackage ../applications/video/key-mon { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -18864,8 +19859,6 @@ in ffmpeg = ffmpeg_2; }; - kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; - kitty = callPackage ../applications/misc/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; @@ -18898,10 +19891,22 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { + go = buildPackages.go_1_12; + }; + + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kubeless = callPackage ../applications/networking/cluster/kubeless { }; + + k9s = callPackage ../applications/networking/cluster/k9s { }; + + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + + linkerd = callPackage ../applications/networking/cluster/linkerd { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; @@ -18946,7 +19951,7 @@ in libowfat = callPackage ../development/libraries/libowfat { }; - librecad = callPackage ../applications/misc/librecad { }; + librecad = libsForQt5.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -18973,13 +19978,15 @@ in libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "fresh"; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = callPackage ../applications/office/libreoffice/still.nix + libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "still"; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -18988,9 +19995,7 @@ in lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) dconf; - }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; lightworks = callPackage ../applications/video/lightworks { portaudio = portaudio2014; @@ -19020,13 +20025,11 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { - polarssl = mbedtls_1_3; - }; + linphone = callPackage ../applications/networking/instant-messengers/linphone { }; linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = ocaml-ng.ocamlPackages_4_07.callPackage ../applications/misc/llpp { }; + llpp = ocamlPackages.callPackage ../applications/misc/llpp { }; lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; @@ -19036,6 +20039,8 @@ in loxodo = callPackage ../applications/misc/loxodo { }; + lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; + lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; @@ -19044,7 +20049,10 @@ in lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { }; + handbrake = callPackage ../applications/video/handbrake { + inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox; + inherit (darwin) libobjc; + }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte; @@ -19071,7 +20079,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk; + inherit (gnome3) gnome-desktop libgnome-keyring; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; @@ -19110,6 +20118,8 @@ in mako = callPackage ../applications/misc/mako { }; + mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; + mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; marathon = callPackage ../applications/networking/cluster/marathon { }; @@ -19119,8 +20129,21 @@ in marp = callPackage ../applications/office/marp { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { + # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum + buildGoModule = buildGo112Module; + }; + matchbox = callPackage ../applications/window-managers/matchbox { }; + matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { + inherit (python3Packages) buildPythonApplication buildPythonPackage + pygobject3 pytestrunner requests responses pytest python-olm + canonicaljson; + }; + + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; + mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; mcpp = callPackage ../development/compilers/mcpp { }; @@ -19131,9 +20154,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - # mediathekview needs JavaFX, which currently only is available inside OracleJRE - # we might be able to get rid of it, as soon as we have an OpenJRE with OpenJFX included - mediathekview = callPackage ../applications/video/mediathekview { jre = oraclejre; }; + mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -19141,23 +20162,22 @@ in meme = callPackage ../applications/graphics/meme { }; - mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; menumaker = callPackage ../applications/misc/menumaker { }; + mercurial_4 = callPackage ../applications/version-management/mercurial/4.9.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { - gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 - }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -19165,6 +20185,8 @@ in mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + michabo = libsForQt5.callPackage ../applications/misc/michabo { }; + mid2key = callPackage ../applications/audio/mid2key { }; midori-unwrapped = callPackage ../applications/networking/browsers/midori { }; @@ -19192,8 +20214,6 @@ in meh = callPackage ../applications/graphics/meh {}; - mirage = callPackage ../applications/graphics/mirage { }; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; }; @@ -19207,22 +20227,18 @@ in MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - wxGTK30 = wxGTK30.override { withWebKit = true ; }; + wxGTK30 = wxGTK30.override { + withWebKit = true; + withGtk2 = false; + }; }; + mmsd = callPackage ../tools/networking/mmsd { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost16x; - }; - - monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - boost = boost16x; - }; - xmr-stak = callPackage ../applications/misc/xmr-stak { stdenvGcc6 = gcc6Stdenv; }; @@ -19241,7 +20257,13 @@ in lua = lua5; }; - inherit (ocaml-ng.ocamlPackages_4_01_0) monotoneViz; + monotoneViz = callPackage ../applications/version-management/monotone-viz { + ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + }; + + monitor = callPackage ../applications/system/monitor { }; + + moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; @@ -19293,16 +20315,20 @@ in mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc_cli = callPackage ../applications/audio/mpc { }; + mpc_cli = callPackage ../applications/audio/mpc { + inherit (python3Packages) sphinx; + }; clerk = callPackage ../applications/audio/clerk { }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; + nbstripout = callPackage ../applications/version-management/nbstripout { python = python3; }; ncmpc = callPackage ../applications/audio/ncmpc { }; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; + ympd = callPackage ../applications/audio/ympd { }; nload = callPackage ../applications/networking/nload { }; @@ -19345,27 +20371,26 @@ in mtpaint = callPackage ../applications/graphics/mtpaint { }; + mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; + mucommander = callPackage ../applications/misc/mucommander { }; multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; multimon-ng = callPackage ../applications/radio/multimon-ng { }; - inherit (callPackages ../applications/networking/mumble { + murmur = (callPackages ../applications/networking/mumble { avahi = avahi-compat; - jackSupport = config.mumble.jackSupport or false; - speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_git murmur; + }).murmur; - inherit (callPackages ../applications/networking/mumble { + mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; - iceSupport = false; - }) murmur_git; + pulseSupport = config.pulseaudio or stdenv.isLinux; + }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux" @@ -19397,13 +20422,19 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; + netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { geoip = geoipWithDatabase; }; notion = callPackage ../applications/window-managers/notion { }; - openshift = callPackage ../applications/networking/cluster/openshift { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + + openshift = callPackage ../applications/networking/cluster/openshift { + buildGoPackage = buildGo112Package; + }; oroborus = callPackage ../applications/window-managers/oroborus {}; @@ -19415,6 +20446,8 @@ in partio = callPackage ../development/libraries/partio {}; + pbis-open = callPackage ../tools/security/pbis { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; @@ -19454,7 +20487,7 @@ in ptex = callPackage ../development/libraries/ptex {}; - qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {}; + qbec = callPackage ../applications/networking/cluster/qbec { }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -19464,7 +20497,9 @@ in libmlt = mlt; }; - shogun = callPackage ../applications/science/machine-learning/shogun { }; + shogun = callPackage ../applications/science/machine-learning/shogun { + stdenv = gcc8Stdenv; + }; sky = callPackage ../applications/networking/instant-messengers/sky {}; @@ -19472,17 +20507,17 @@ in smtube = libsForQt5.callPackage ../applications/video/smtube {}; + softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; + + spacegun = callPackage ../applications/networking/cluster/spacegun {}; + stride = callPackage ../applications/networking/instant-messengers/stride { }; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; speedread = callPackage ../applications/misc/speedread { }; - sup = callPackage ../applications/networking/mailreaders/sup { - bundlerApp = bundlerApp.override{ - ruby = ruby.override { cursesSupport = true; }; - }; - }; + station = callPackage ../applications/networking/station { }; synapse = callPackage ../applications/misc/synapse { }; @@ -19506,6 +20541,8 @@ in sidplayfp = callPackage ../applications/audio/sidplayfp { }; + sndpeek = callPackage ../applications/audio/sndpeek { }; + sxhkd = callPackage ../applications/window-managers/sxhkd { }; mpop = callPackage ../applications/networking/mpop { @@ -19528,6 +20565,8 @@ in pdfdiff = callPackage ../applications/misc/pdfdiff { }; + pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; + mupdf = callPackage ../applications/misc/mupdf { }; mystem = callPackage ../applications/misc/mystem { }; @@ -19542,10 +20581,14 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; micro = callPackage ../applications/editors/micro { }; + mle = callPackage ../applications/editors/mle { }; + nano = callPackage ../applications/editors/nano { }; nanoblogger = callPackage ../applications/misc/nanoblogger { }; @@ -19562,6 +20605,12 @@ in ncdc = callPackage ../applications/networking/p2p/ncdc { }; + ncspot = callPackage ../applications/audio/ncspot { + withALSA = stdenv.isLinux; + withPulseAudio = config.pulseaudio or stdenv.isLinux; + withPortAudio = stdenv.isDarwin; + }; + ncview = callPackage ../tools/X11/ncview { } ; ne = callPackage ../applications/editors/ne { }; @@ -19601,12 +20650,14 @@ in inherit (gnome2) libglade; }; - oblogout = callPackage ../tools/X11/oblogout { }; - obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + + obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; @@ -19633,9 +20684,7 @@ in openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { - stdenv = gcc6Stdenv; - }; + openimageio = callPackage ../applications/graphics/openimageio { }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; @@ -19643,7 +20692,7 @@ in openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - openscad = callPackage ../applications/graphics/openscad {}; + openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; @@ -19656,7 +20705,6 @@ in orca = python3Packages.callPackage ../applications/misc/orca { inherit (pkgs) pkgconfig; - inherit (gnome3) yelp-tools; }; osm2xmap = callPackage ../applications/misc/osm2xmap { @@ -19677,6 +20725,8 @@ in openmpt123 = callPackage ../applications/audio/openmpt123 { }; + openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; + opusfile = callPackage ../applications/audio/opusfile { }; opusTools = callPackage ../applications/audio/opus-tools { }; @@ -19688,11 +20738,9 @@ in osmo = callPackage ../applications/office/osmo { }; - osquery = callPackage ../tools/system/osquery { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 - stdenv = gcc49Stdenv; + # https://www.palemoon.org/sourcecode.shtml + stdenv = gcc7Stdenv; }; pamix = callPackage ../applications/audio/pamix { }; @@ -19725,7 +20773,9 @@ in ffmpeg = ffmpeg_2; }; - pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { }; + pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { + wxGTK = pkgsi686Linux.wxGTK30; + }; pekwm = callPackage ../applications/window-managers/pekwm { }; @@ -19812,6 +20862,8 @@ in purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; + purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; + purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; @@ -19838,14 +20890,12 @@ in gtksharp = gtk-sharp-2_0; }; - plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; - plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; - pmenu = callPackage ../applications/misc/pmenu { }; - polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; @@ -19866,8 +20916,7 @@ in qiv = callPackage ../applications/graphics/qiv { }; - processing = processing3; - processing3 = callPackage ../applications/graphics/processing3 { + processing = callPackage ../applications/graphics/processing { jdk = oraclejdk8; }; @@ -19881,15 +20930,17 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { }; + ps2client = callPackage ../applications/networking/ps2client { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -19913,6 +20964,9 @@ in pythonmagick = callPackage ../applications/graphics/PythonMagick { }; qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; + qbittorrent-nox = qbittorrent.override { + guiSupport = false; + }; qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; @@ -19929,6 +20983,8 @@ in python = python3; }; + qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -19939,13 +20995,19 @@ in qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + + garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; + qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { + boost = boost17x; + }; qmetro = callPackage ../applications/misc/qmetro { }; - qmidinet = callPackage ../applications/audio/qmidinet { }; + qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; @@ -19970,11 +21032,9 @@ in qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { }; - qtchan = callPackage ../applications/networking/browsers/qtchan { - qt = qt5; - }; + qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { }; qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; @@ -19986,9 +21046,7 @@ in quantomatic = callPackage ../applications/science/physics/quantomatic { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - inherit (gnome3) dconf; - }; + quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override { monolithic = false; @@ -19998,7 +21056,7 @@ in quasselDaemon = quassel.override { monolithic = false; - daemon = true; + enableDaemon = true; withKDE = false; tag = "-daemon-qt5"; }; @@ -20056,6 +21114,8 @@ in railcar = callPackage ../applications/virtualization/railcar {}; + raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; + rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; @@ -20086,10 +21146,6 @@ in rdup = callPackage ../tools/backup/rdup { }; - realpine = callPackage ../applications/networking/mailreaders/realpine { - tcl = tcl-8_5; - }; - reaper = callPackage ../applications/audio/reaper { }; recode = callPackage ../tools/text/recode { }; @@ -20124,6 +21180,8 @@ in rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rsclock = callPackage ../applications/misc/rsclock { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; @@ -20156,6 +21214,11 @@ in urxvt_font_size urxvt_theme_switch urxvt_vtwheel + urxvt_bidi + ]; + perlDeps = [ + # This needs the perl module it self provides + urxvt_bidi ]; }; @@ -20167,6 +21230,7 @@ in urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; urxvt_vtwheel = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix { }; + urxvt_bidi = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-bidi { }; uade123 = callPackage ../applications/audio/uade123 {}; @@ -20176,7 +21240,7 @@ in sakura = callPackage ../applications/misc/sakura { }; - sayonara = callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -20200,10 +21264,6 @@ in protobuf = protobuf3_1; }; - seg3d = callPackage ../applications/graphics/seg3d { - wxGTK = wxGTK28.override { unicode = false; }; - }; - sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; @@ -20218,6 +21278,8 @@ in shfmt = callPackage ../tools/text/shfmt { }; + shotgun = callPackage ../tools/graphics/shotgun {}; + shutter = callPackage ../applications/graphics/shutter { }; simple-scan = gnome3.simple-scan; @@ -20252,16 +21314,22 @@ in spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { }; + spike = callPackage ../applications/virtualization/spike { }; + + tensorman = callPackage ../tools/misc/tensorman { }; + spideroak = callPackage ../applications/networking/spideroak { }; split2flac = callPackage ../applications/audio/split2flac { }; + spotify-tui = callPackage ../applications/audio/spotify-tui { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; - ssvnc = callPackage ../applications/networking/remote/ssvnc { }; - stupidterm = callPackage ../applications/misc/stupidterm { gtk = gtk3; }; @@ -20274,8 +21342,8 @@ in wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = callPackage ../applications/audio/sonic-pi { - ruby = ruby_2_3; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { + ruby = ruby_2_4; # sonic-pi build breaks with ruby 2.5 and 2.6 }; st = callPackage ../applications/misc/st { @@ -20310,6 +21378,10 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; + maestral = callPackage ../applications/networking/maestral { }; + + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + insync = callPackage ../applications/networking/insync { }; libstrangle = callPackage ../tools/X11/libstrangle { @@ -20339,14 +21411,13 @@ in curaengine = curaengine_stable; }; - curaengine = callPackage ../applications/misc/curaengine { - inherit (python3.pkgs) libarcus; - }; + curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; + cura = qt5.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -20364,16 +21435,10 @@ in skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; - slim = callPackage ../applications/display-managers/slim { - libpng = libpng12; - }; - smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; }; - slimThemes = recurseIntoAttrs (callPackage ../applications/display-managers/slim/themes.nix {}); - smartdeblur = callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; @@ -20476,12 +21541,15 @@ in surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; + surf-display = callPackage ../desktops/surf-display { }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; + boost = boost168; }; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; @@ -20500,6 +21568,15 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; + syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { }; + syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray { + webviewSupport = false; + jsSupport = false; + kioPluginSupport = false; + plasmoidSupport = false; + systemdSupport = true; + }; + synergy = callPackage ../applications/misc/synergy { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; @@ -20521,13 +21598,19 @@ in tailor = callPackage ../applications/version-management/tailor {}; + taizen = callPackage ../applications/misc/taizen { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tangogps = callPackage ../applications/misc/tangogps { gconf = gnome2.GConf; }; tambura = callPackage ../applications/audio/tambura { }; - teamspeak_client = libsForQt511.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teams = callPackage ../applications/networking/instant-messengers/teams { }; + + teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskell = callPackage ../applications/misc/taskell { }; @@ -20546,10 +21629,14 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }); - tdesktop = tdesktopPackages.stable; - - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; + # TODO (@primeos): Remove after the 19.09 branch-off: + tdesktopPackages = throw '' + The attributes "tdesktopPackages.*" where removed as the preview version + will not be maintained anymore (there are regular stable releases and we + depend on the patches from Arch Linux which only track the stable version + as well). Please switch to "tdesktop" (stable version). + ''; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; @@ -20563,6 +21650,10 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + tendermint = callPackage ../tools/networking/tendermint { + buildGoModule = buildGo112Module; + }; + termdown = (newScope pythonPackages) ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -20590,16 +21681,17 @@ in tetraproc = callPackage ../applications/audio/tetraproc { }; - thinkingRock = callPackage ../applications/misc/thinking-rock { }; + tev = callPackage ../applications/graphics/tev { }; - nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; + inherit (rustPackages_1_38_0) cargo rustc; libpng = libpng_apng; - enableGTK3 = true; + gtk3Support = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; @@ -20627,6 +21719,8 @@ in tint2 = callPackage ../applications/misc/tint2 { }; + tiny = callPackage ../applications/networking/irc/tiny { }; + tixati = callPackage ../applications/networking/p2p/tixati { }; tkcvs = callPackage ../applications/version-management/tkcvs { }; @@ -20639,6 +21733,8 @@ in inherit (linuxPackages) x86_energy_perf_policy; }; + tippecanoe = callPackage ../applications/misc/tippecanoe { }; + tmatrix = callPackage ../applications/misc/tmatrix { }; tnef = callPackage ../applications/misc/tnef { }; @@ -20651,12 +21747,6 @@ in toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; - tomahawk = callPackage ../applications/audio/tomahawk ({ - taglib = taglib_1_9; - quazip = quazip_qt4; - boost = boost155; - } // (config.tomahawk or {})); - topydo = callPackage ../applications/misc/topydo {}; torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { @@ -20704,21 +21794,23 @@ in tdrop = callPackage ../applications/misc/tdrop { }; + tre-command = callPackage ../tools/system/tre-command {}; + tree = callPackage ../tools/system/tree {}; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { + inherit (kdeApplications) akonadi-contacts; + }; tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; - twister = callPackage ../applications/networking/p2p/twister { - boost = boost160; - }; + twister = callPackage ../applications/networking/p2p/twister { }; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; @@ -20726,16 +21818,25 @@ in ulauncher = callPackage ../applications/misc/ulauncher { }; + twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + + ueberzug = with python3Packages; toPythonApplication ueberzug; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); + uefitool = uefitoolPackages.new-engine; + unigine-valley = callPackage ../applications/graphics/unigine-valley { }; inherit (ocaml-ng.ocamlPackages_4_05) unison; unpaper = callPackage ../tools/graphics/unpaper { }; + unison-ucm = callPackage ../development/compilers/unison { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -20746,10 +21847,6 @@ in uwimap = callPackage ../tools/networking/uwimap { }; - uzbl = callPackage ../applications/networking/browsers/uzbl { - webkitgtk = webkitgtk24x-gtk2; - }; - utox = callPackage ../applications/networking/instant-messengers/utox { }; valentina = libsForQt5.callPackage ../applications/misc/valentina { }; @@ -20761,7 +21858,7 @@ in vcv-rack = callPackage ../applications/audio/vcv-rack { }; vdirsyncer = callPackage ../tools/misc/vdirsyncer { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; @@ -20816,6 +21913,12 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { + gtk = pkgs.gtk3; + }; + + gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; vis = callPackage ../applications/editors/vis { @@ -20828,12 +21931,11 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; - virtmanager = callPackage ../applications/virtualization/virt-manager { - dconf = gnome3.dconf; + virt-manager = callPackage ../applications/virtualization/virt-manager { system-libvirt = libvirt; }; - virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -20841,7 +21943,7 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; - virtualbox = callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -20932,6 +22034,8 @@ in vym = qt5.callPackage ../applications/misc/vym { }; + waon = callPackage ../applications/audio/waon { }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features @@ -20961,10 +22065,15 @@ in pythonPackages = python3Packages; }; - way-cooler = callPackage ../applications/window-managers/way-cooler {}; + way-cooler = throw ("way-cooler is abandoned by its author: " + + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); + + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv {}; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -20987,6 +22096,7 @@ in libva = null; libwebp = null; xwayland = null; + pipewire = null; }; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; @@ -21003,8 +22113,6 @@ in wily = callPackage ../applications/editors/wily { }; - winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { erlang = erlangR21; }; @@ -21027,6 +22135,8 @@ in wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; + wofi = callPackage ../applications/misc/wofi { }; + wordnet = callPackage ../applications/misc/wordnet { }; wordgrinder = callPackage ../applications/office/wordgrinder { }; @@ -21053,34 +22163,64 @@ in 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 + ++ optional (cfg.enableBeetleNGP or false) beetle-ngp ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast + ++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx ++ optional (cfg.enableBeetlePSX or false) beetle-psx ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn + ++ 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.enableDesmume or false) desmume + ++ optional (cfg.enableDesmume2015 or false) desmume2015 ++ optional (cfg.enableDolphin or false) dolphin ++ optional (cfg.enableFBA or false) fba ++ optional (cfg.enableFceumm or false) fceumm + ++ optional (cfg.enableFlycast or false) flycast ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx + ++ optional (cfg.enableGpsp or false) gpsp + ++ 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 + ++ optional (cfg.enableMAME2003Plus or false) mame2003-plus + ++ optional (cfg.enableMAME2010 or false) mame2010 + ++ optional (cfg.enableMAME2015 or false) mame2015 + ++ optional (cfg.enableMAME2016 or false) mame2016 + ++ optional (cfg.enableMesen or false) mesen ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia + ++ optional (cfg.enableO2EM or false) o2em ++ optional (cfg.enableParallelN64 or false) parallel-n64 + ++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed ++ optional (cfg.enablePicodrive or false) picodrive - ++ optional (cfg.enablePrboom or false) prboom + ++ optional (cfg.enablePlay or false) play ++ optional (cfg.enablePPSSPP or false) ppsspp + ++ optional (cfg.enablePrboom or false) prboom + ++ optional (cfg.enableProSystem or false) prosystem ++ optional (cfg.enableQuickNES or false) quicknes - ++ optional (cfg.enableReicast or false) reicast ++ optional (cfg.enableScummVM or false) scummvm ++ optional (cfg.enableSnes9x or false) snes9x - ++ optional (cfg.enableSnes9xNext or false) snes9x-next + ++ 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.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") @@ -21140,8 +22280,12 @@ in x11vnc = callPackage ../tools/X11/x11vnc { }; + x11spice = callPackage ../tools/X11/x11spice { }; + x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; + x2goserver = callPackage ../applications/networking/remote/x2goserver { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; @@ -21205,7 +22349,7 @@ in inherit (xorg) xcompmgr; - compton = callPackage ../applications/window-managers/compton {}; + picom = callPackage ../applications/window-managers/picom {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -21381,10 +22525,6 @@ in yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - yakuake = libsForQt5.callPackage ../applications/misc/yakuake { - inherit (kdeApplications) konsole; - }; - yarp = callPackage ../applications/science/robotics/yarp {}; yarssr = callPackage ../applications/misc/yarssr { }; @@ -21395,8 +22535,12 @@ in yed = callPackage ../applications/graphics/yed {}; + yeetgif = callPackage ../applications/graphics/yeetgif { }; + inherit (gnome3) yelp; + yelp-tools = callPackage ../development/misc/yelp-tools { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -21419,7 +22563,13 @@ in zathura = callPackage ../applications/misc/zathura { }; - zeroc_ice = callPackage ../development/libraries/zeroc-ice { + zeroc-ice = callPackage ../development/libraries/zeroc-ice { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; + + zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -21444,7 +22594,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -21452,6 +22602,112 @@ in zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS + + aeon = callPackage ../applications/blockchains/aeon { }; + + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; + + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { + boost = boost165; + mkDerivation = stdenv.mkDerivation; + withGui = false; + }; + + bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; + + bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + + btc1 = callPackage ../applications/blockchains/btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; + + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + + dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + + dcrd = callPackage ../applications/blockchains/dcrd.nix { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + + dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + + dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + + exodus = callPackage ../applications/blockchains/exodus { }; + + 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; + }; + + ledger_agent = with python3Packages; toPythonApplication ledger_agent; + + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; + + litecoin = callPackage ../applications/blockchains/litecoin.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + litecoind = litecoin.override { withGui = false; }; + + lnd = callPackage ../applications/blockchains/lnd.nix { + buildGoModule = buildGo112Module; + }; + + monero = callPackage ../applications/blockchains/monero { + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + }; + + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { + boost = boost16x; + }; + + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + + mist = callPackage ../applications/blockchains/mist.nix { }; + + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; + + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + + ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + + stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; + + sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + + wownero = callPackage ../applications/blockchains/wownero.nix {}; + + zcash = callPackage ../applications/blockchains/zcash { }; + + parity = callPackage ../applications/blockchains/parity { }; + parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; + + polkadot = callPackage ../applications/blockchains/polkadot { }; + + particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -21483,7 +22739,7 @@ in arena = callPackage ../games/arena {}; - arx-libertatis = callPackage ../games/arx-libertatis { + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { stdenv = gcc6Stdenv; }; @@ -21549,13 +22805,17 @@ in chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt59.callPackage ../games/chessx { }; + chessx = libsForQt5.callPackage ../games/chessx { }; + + chiaki = libsForQt5.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o {}; + cri-o = callPackage ../applications/virtualization/cri-o { + buildGoPackage = buildGo112Package; + }; ckan = callPackage ../games/ckan { }; @@ -21569,12 +22829,12 @@ in construoBase = lowPrio (callPackage ../games/construo { libGL = null; + libGLU = null; freeglut = null; }); construo = construoBase.override { - inherit freeglut; - libGL = libGLU_combined; + inherit libGL libGLU freeglut; }; crack_attack = callPackage ../games/crack-attack { }; @@ -21596,18 +22856,21 @@ in cuyo = callPackage ../games/cuyo { }; + devilutionx = callPackage ../games/devilutionx {}; + dhewm3 = callPackage ../games/dhewm3 {}; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; - inherit (kdeApplications) akonadi-contacts kcalcore; + inherit (kdeApplications) akonadi-contacts; + inherit (kdeFrameworks) kcalendarcore; ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; - displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; + displaycal = callPackage ../applications/graphics/displaycal {}; - drumkv1 = callPackage ../applications/audio/drumkv1 { }; + drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; @@ -21637,6 +22900,8 @@ in egoboo = callPackage ../games/egoboo { }; + eidolon = callPackage ../games/eidolon { }; + EmptyEpsilon = callPackage ../games/empty-epsilon { }; endgame-singularity = callPackage ../games/endgame-singularity { }; @@ -21677,7 +22942,7 @@ in fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; flock = callPackage ../development/tools/flock { }; @@ -21705,6 +22970,8 @@ in frogatto = callPackage ../games/frogatto { }; + frozen-bubble = callPackage ../games/frozen-bubble { }; + fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; }; }; @@ -21753,25 +23020,26 @@ in gshogi = python3Packages.callPackage ../games/gshogi {}; + qtads = qt5.callPackage ../games/qtads { }; + gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; gtypist = callPackage ../games/gtypist { }; + gweled = callPackage ../games/gweled {}; + gzdoom = callPackage ../games/gzdoom { }; harmonist = callPackage ../games/harmonist { }; hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = callPackage ../games/hedgewars { + hedgewars = libsForQt5.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; - ffmpeg = ffmpeg_2; }; - hexen = callPackage ../games/hexen { }; - holdingnuts = callPackage ../games/holdingnuts { }; hyperrogue = callPackage ../games/hyperrogue { }; @@ -21782,9 +23050,9 @@ in inherit (pythonPackages) rdflib; }; - instead = callPackage ../games/instead { - lua = lua5; - }; + ideogram = callPackage ../applications/graphics/ideogram { }; + + instead = callPackage ../games/instead { }; instead-launcher = callPackage ../games/instead-launcher { }; @@ -21826,6 +23094,8 @@ in megaglest = callPackage ../games/megaglest {}; + mindustry = callPackage ../games/mindustry { }; + minecraft = callPackage ../games/minecraft { }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -21847,7 +23117,7 @@ in mrrescue = callPackage ../games/mrrescue { }; mudlet = libsForQt5.callPackage ../games/mudlet { - inherit (lua51Packages) luafilesystem lrexlib-pcre luazip luasql-sqlite3; + lua = lua5_1; }; n2048 = callPackage ../games/n2048 {}; @@ -21899,7 +23169,9 @@ in openra = openraPackages.engines.release; - openrw = callPackage ../games/openrw { }; + openrw = callPackage ../games/openrw { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; openspades = callPackage ../games/openspades { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -21915,6 +23187,8 @@ in openxcom = callPackage ../games/openxcom { }; + openxray = callPackage ../games/openxray { }; + orthorobot = callPackage ../games/orthorobot { }; pacvim = callPackage ../games/pacvim { }; @@ -21941,7 +23215,7 @@ in privateer = callPackage ../games/privateer { }; - pysolfc = callPackage ../games/pysolfc { }; + pysolfc = python3Packages.callPackage ../games/pysolfc { }; qweechat = callPackage ../applications/networking/irc/qweechat { }; @@ -21963,6 +23237,7 @@ in vkquake = callPackage ../games/quakespasm/vulkan.nix { }; ioquake3 = callPackage ../games/quake3/ioquake { }; + quake3e = callPackage ../games/quake3/quake3e { }; quantumminigolf = callPackage ../games/quantumminigolf {}; @@ -22009,7 +23284,9 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { + buildGoPackage = buildGo112Package; + }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -22033,12 +23310,12 @@ in scrolls = callPackage ../games/scrolls { }; - sdlmame = callPackage ../games/sdlmame { }; - service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; + shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; + sienna = callPackage ../games/sienna { love = love_0_10; }; sil = callPackage ../games/sil { }; @@ -22098,6 +23375,8 @@ in ffmpeg = ffmpeg_2; }; + streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; + stuntrally = callPackage ../games/stuntrally { ogre = ogre1_9; mygui = mygui.override { @@ -22109,7 +23388,9 @@ in superTuxKart = callPackage ../games/super-tux-kart { }; - synthv1 = callPackage ../applications/audio/synthv1 { }; + synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; + + system-syzygy = callPackage ../games/system-syzygy { }; t4kcommon = callPackage ../games/t4kcommon { }; @@ -22139,6 +23420,8 @@ in tinyfugue = callPackage ../games/tinyfugue { }; + tome2 = callPackage ../games/tome2 { }; + tome4 = callPackage ../games/tome4 { }; toppler = callPackage ../games/toppler { }; @@ -22155,7 +23438,6 @@ in # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC libpng = libpng12; - openscenegraph = openscenegraph_3_4; }; torcs = callPackage ../games/torcs { }; @@ -22311,7 +23593,9 @@ in ### DESKTOP ENVIRONMENTS - clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; + cdesktopenv = callPackage ../desktops/cdesktopenv { }; + + cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); deepin = recurseIntoAttrs (import ../desktops/deepin { inherit pkgs libsForQt5; @@ -22328,17 +23612,20 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; + arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; 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 { }; + 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 { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; - mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; - nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; + mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; + night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; @@ -22347,6 +23634,10 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; + + nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; + mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -22370,55 +23661,23 @@ in plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; - redshift = callPackage ../applications/misc/redshift { + inherit (callPackages ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }; + }) redshift redshift-wlr; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { }; - - orion = callPackage ../misc/themes/orion {}; - - albatross = callPackage ../misc/themes/albatross { }; - - gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; - - gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { }; - - gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; - gnome-themes-extra = gnome3.gnome-themes-extra; - numix-gtk-theme = callPackage ../misc/themes/numix { }; - - numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { }; - - numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; - - onestepback = callPackage ../misc/themes/onestepback { }; - - theme-jade1 = callPackage ../misc/themes/jade1 { }; - - theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; - - theme-vertex = callPackage ../misc/themes/vertex { }; - rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; }; - solarc-gtk-theme = callPackage ../misc/themes/solarc { }; - - xfce = xfce4-12; - xfceUnstable = xfce4-14; - - xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); - xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); + xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -22446,6 +23705,10 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; + + krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + ### SCIENCE ### SCIENCE/CHEMISTY @@ -22498,7 +23761,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + stdenv = gcc8Stdenv; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -22506,12 +23771,18 @@ in stdenv = gcc49Stdenv; }; + bayescan = callPackage ../applications/science/biology/bayescan { }; + bedtools = callPackage ../applications/science/biology/bedtools { }; bcftools = callPackage ../applications/science/biology/bcftools { }; bftools = callPackage ../applications/science/biology/bftools { }; + blast = callPackage ../applications/science/biology/blast { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + cd-hit = callPackage ../applications/science/biology/cd-hit { }; cmtk = callPackage ../applications/science/biology/cmtk { }; @@ -22522,6 +23793,10 @@ in dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; + + delly = callPackage ../applications/science/biology/delly { }; + diamond = callPackage ../applications/science/biology/diamond { }; ecopcr = callPackage ../applications/science/biology/ecopcr { }; @@ -22552,8 +23827,18 @@ in kallisto = callPackage ../applications/science/biology/kallisto { }; + kssd = callPackage ../applications/science/biology/kssd { }; + + last = callPackage ../applications/science/biology/last { }; + + macse = callPackage ../applications/science/biology/macse { }; + migrate = callPackage ../applications/science/biology/migrate { }; + minia = callPackage ../applications/science/biology/minia { + boost = boost159; + }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { }; muscle = callPackage ../applications/science/biology/muscle { }; @@ -22621,6 +23906,8 @@ in somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; + sortmerna = callPackage ../applications/science/biology/sortmerna { }; + stacks = callPackage ../applications/science/biology/stacks { }; star = callPackage ../applications/science/biology/star { }; @@ -22634,6 +23921,16 @@ in seaview = callPackage ../applications/science/biology/seaview { }; + SPAdes = callPackage ../applications/science/biology/spades { }; + + svaba = callPackage ../applications/science/biology/svaba { }; + + tebreak = callPackage ../applications/science/biology/tebreak { }; + + trimal = callPackage ../applications/science/biology/trimal { }; + + truvari = callPackage ../applications/science/biology/truvari { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; @@ -22688,6 +23985,8 @@ in nasc = callPackage ../applications/science/math/nasc { }; + nota = haskellPackages.callPackage ../applications/science/math/nota { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with @@ -22720,6 +24019,7 @@ in lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; + clmagma = callPackage ../development/libraries/science/math/clmagma { }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; @@ -22814,6 +24114,8 @@ in aliza = callPackage ../applications/science/medicine/aliza { }; + dcmtk = callPackage ../applications/science/medicine/dcmtk { }; + ### PHYSICS sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -22857,6 +24159,7 @@ in coqPackages_8_8 coq_8_8 coqPackages_8_9 coq_8_9 coqPackages_8_10 coq_8_10 + coqPackages_8_11 coq_8_11 coqPackages coq ; @@ -22942,7 +24245,6 @@ in mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; minisat = callPackage ../applications/science/logic/minisat {}; - minisatUnstable = callPackage ../applications/science/logic/minisat/unstable.nix {}; monosat = callPackage ../applications/science/logic/monosat {}; @@ -22996,7 +24298,7 @@ in veriT = callPackage ../applications/science/logic/verit {}; - why3 = callPackage ../applications/science/logic/why3 {}; + why3 = callPackage ../applications/science/logic/why3 { }; workcraft = callPackage ../applications/science/logic/workcraft {}; @@ -23032,7 +24334,9 @@ in # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. # This is the last version with the old model. - eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { }; + eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { + openssl = openssl_1_0_2; + }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; @@ -23048,16 +24352,9 @@ in fped = callPackage ../applications/science/electronics/fped { }; - kicad = callPackage ../applications/science/electronics/kicad { - wxGTK = wxGTK30; - boost = boost160; - }; - kicad-with-packages3d = kicad.overrideAttrs (old: { modules = old.modules ++ [ old.passthru.packages3d ]; }); - - kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix { - wxGTK = wxGTK30; - boost = boost160; - }; + kicad = callPackage ../applications/science/electronics/kicad { }; + kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; @@ -23089,8 +24386,10 @@ in caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; cntk = callPackage ../applications/science/math/cntk { + stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. + cudaSupport = pkgs.config.cudaSupport or false; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -23193,16 +24492,16 @@ in netlogo = callPackage ../applications/science/misc/netlogo { }; - ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; + ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; root = callPackage ../applications/science/misc/root { + python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); rink = callPackage ../applications/science/misc/rink { }; @@ -23238,6 +24537,8 @@ in fastjet = callPackage ../development/libraries/physics/fastjet { }; + fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; + fastnlo = callPackage ../development/libraries/physics/fastnlo { }; geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; @@ -23246,7 +24547,7 @@ in g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; @@ -23277,7 +24578,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -23293,6 +24594,8 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; areca = callPackage ../applications/backup/areca { }; @@ -23303,8 +24606,6 @@ in bees = callPackage ../tools/filesystems/bees { }; - blackbird = callPackage ../misc/themes/blackbird { }; - bootil = callPackage ../development/libraries/bootil { }; brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; @@ -23339,15 +24640,10 @@ in cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; - crashplan = callPackage ../applications/backup/crashplan { }; - crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; }; - colort = callPackage ../applications/misc/colort { }; terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; - e17gtk = callPackage ../misc/themes/e17gtk { }; - epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; @@ -23406,18 +24702,12 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; - dumb = callPackage ../misc/dumb { }; - emulationstation = callPackage ../misc/emulators/emulationstation { - stdenv = gcc5Stdenv; - }; + emulationstation = callPackage ../misc/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; - equilux-theme = callPackage ../misc/themes/equilux-theme { }; - flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; @@ -23460,6 +24750,8 @@ in foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; + fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; }; @@ -23477,13 +24769,13 @@ in glava = callPackage ../applications/misc/glava {}; - gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; - gnuk = callPackage ../misc/gnuk { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + gobuster = callPackage ../tools/security/gobuster { }; + guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; @@ -23492,7 +24784,9 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { }; + helm = callPackage ../applications/audio/helm { + stdenv = gcc8Stdenv; + }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; @@ -23518,8 +24812,14 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + vector = callPackage ../tools/misc/vector { + inherit (darwin.apple_sdk.frameworks) Security; + }; + epkowa = callPackage ../misc/drivers/epkowa { }; + utsushi = callPackage ../misc/drivers/utsushi { }; + idsk = callPackage ../tools/filesystems/idsk { }; igraph = callPackage ../development/libraries/igraph { }; @@ -23547,7 +24847,14 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - kops = callPackage ../applications/networking/cluster/kops { }; + inherit (callPackage ../applications/networking/cluster/kops {}) + mkKops + kops_1_12 + kops_1_13 + kops_1_14 + kops_1_15 + ; + kops = kops_1_15; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -23569,11 +24876,9 @@ in icu = icu58; }; - martyr = callPackage ../development/libraries/martyr { }; + mame = libsForQt5.callPackage ../misc/emulators/mame { }; - mess = callPackage ../misc/emulators/mess { - inherit (pkgs.gnome2) GConf; - }; + martyr = callPackage ../development/libraries/martyr { }; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; @@ -23623,6 +24928,8 @@ in initialRamdisk. The result can be extended in the modules by defining extra attributes in system.build. + Alternatively, you may use the result's config and + options attributes to query any option. Example: @@ -23660,10 +24967,13 @@ in Note that you will need to have called Nixpkgs with the system parameter set to the right value for your deployment target. */ - nixos = configuration: - (import (pkgs.path + "/nixos/lib/eval-config.nix") { - inherit (pkgs.stdenv.hostPlatform) system; - modules = [( + nixos = + configuration: + let + c = import (pkgs.path + "/nixos/lib/eval-config.nix") { + inherit (pkgs.stdenv.hostPlatform) system; + modules = + [( { lib, ... }: { config.nixpkgs.pkgs = lib.mkDefault pkgs; } @@ -23672,7 +24982,9 @@ in then configuration else [configuration] ); - }).config.system.build; + }; + in + c.config.system.build // c; /* @@ -23729,6 +25041,10 @@ in in nixosTesting.makeTest calledTest; + nixosOptionsDoc = attrs: + (import ../../nixos/lib/make-options-doc/default.nix) + ({ inherit pkgs lib; } // attrs); + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nixdoc = callPackage ../tools/nix/nixdoc {}; @@ -23748,11 +25064,14 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + nix-linter = haskellPackages.callPackage ../development/tools/analysis/nix-linter { }; + nix-pin = callPackage ../tools/package-management/nix-pin { }; nix-prefetch = callPackage ../tools/package-management/nix-prefetch { }; - nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {}; + nix-prefetch-github = with python3Packages; + toPythonApplication nix-prefetch-github; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr @@ -23780,16 +25099,22 @@ in "Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = callPackage ../tools/package-management/nix-review { }; + nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; + nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt; + + nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { }; nixos-container = callPackage ../tools/virtualization/nixos-container { }; + nixos-generators = callPackage ../tools/nix/nixos-generators { }; + norwester-font = callPackage ../data/fonts/norwester {}; nut = callPackage ../applications/misc/nut { }; @@ -23813,7 +25138,7 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { - gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; + gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; }); @@ -23830,13 +25155,19 @@ in sndio = callPackage ../misc/sndio { }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; + opkg = callPackage ../tools/package-management/opkg { }; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; pgmanage = callPackage ../applications/misc/pgmanage { }; - pgadmin = callPackage ../applications/misc/pgadmin { }; + pgadmin = callPackage ../applications/misc/pgadmin { + openssl = openssl_1_0_2; + }; + + pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; pgf = pgf2; @@ -23854,6 +25185,8 @@ in pjsip = callPackage ../applications/networking/pjsip { }; + pounce = callPackage ../servers/pounce { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; @@ -23874,6 +25207,8 @@ in qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; + redprl = callPackage ../applications/science/logic/redprl { }; retroarchBare = callPackage ../misc/emulators/retroarch { @@ -23891,6 +25226,10 @@ in rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; + pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { + inherit (pkgs) glib gtk3 gobject-introspection wrapGAppsHook; + }; + rpl = callPackage ../tools/text/rpl { pythonPackages = python3Packages; }; @@ -23971,14 +25310,14 @@ in sct = callPackage ../tools/X11/sct {}; + scylladb = callPackage ../servers/scylladb { + thrift = thrift-0_10; + }; + seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; - selinux-python = callPackage ../os-specific/linux/selinux-python { - # needs python3 bindings - libselinux = libselinux.override { python = python3; }; - libsemanage = libsemanage.override { python = python3; }; - }; + selinux-python = callPackage ../os-specific/linux/selinux-python { }; slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; @@ -24008,6 +25347,12 @@ in jx = callPackage ../applications/networking/cluster/jx {}; + 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 (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 terraform_0_11-full @@ -24015,12 +25360,14 @@ in terraform_plugins_test ; - terraform = terraform_0_11; + terraform = terraform_0_12; # deprecated terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers {} + callPackage ../applications/networking/cluster/terraform-providers { + inherit buildGo112Module; + } ); terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; @@ -24059,6 +25406,8 @@ in tup = callPackage ../development/tools/build-managers/tup { }; + tusk = callPackage ../applications/office/tusk { }; + trufflehog = callPackage ../tools/security/trufflehog { }; tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; @@ -24073,6 +25422,8 @@ in inherit (gnome2) GConf; }; + unityhub = callPackage ../development/tools/unityhub { }; + urbit = callPackage ../misc/urbit { }; utf8proc = callPackage ../development/libraries/utf8proc { }; @@ -24083,12 +25434,14 @@ in vault = callPackage ../tools/security/vault { }; + vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; + vaultenv = haskellPackages.vaultenv; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; vbam = callPackage ../misc/emulators/vbam { - ffmpeg = ffmpeg_2; + ffmpeg = ffmpeg_4; }; vice = callPackage ../misc/emulators/vice { @@ -24103,11 +25456,6 @@ in llvmPackages = llvmPackages_6; }); - vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { - webkitgtk = webkitgtk24x-gtk2; - }; - vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; @@ -24124,7 +25472,13 @@ in vttest = callPackage ../tools/misc/vttest { }; - wasm-pack = callPackage ../development/tools/wasm-pack { }; + wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; + + wasmer = callPackage ../development/interpreters/wasmer { }; + + wasm-pack = callPackage ../development/tools/wasm-pack { + inherit (darwin.apple_sdk.frameworks) Security; + }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -24160,6 +25514,8 @@ in inherit (gnome3) zenity; }; + wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; + with-shell = callPackage ../applications/misc/with-shell { }; wmutils-core = callPackage ../tools/X11/wmutils-core { }; @@ -24168,7 +25524,9 @@ in wordpress = callPackage ../servers/web-apps/wordpress { }; - wraith = callPackage ../applications/networking/irc/wraith { }; + wraith = callPackage ../applications/networking/irc/wraith { + openssl = openssl_1_0_2; + }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -24226,11 +25584,7 @@ in xteddy = callPackage ../applications/misc/xteddy { }; - xwiimote = callPackage ../misc/drivers/xwiimote { - bluez = pkgs.bluez5.override { - enableWiimote = true; - }; - }; + xwiimote = callPackage ../misc/drivers/xwiimote { }; xzoom = callPackage ../tools/X11/xzoom {}; @@ -24328,7 +25682,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -24367,12 +25721,12 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; - tw-rs = callPackage ../misc/tw-rs { }; - simplenote = callPackage ../applications/misc/simplenote { }; hy = callPackage ../development/interpreters/hy {}; + wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; + check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; @@ -24421,7 +25775,7 @@ in diceware = callPackage ../tools/security/diceware { }; - xml2rfc = callPackage ../tools/typesetting/xml2rfc { }; + xml2rfc = with python3Packages; toPythonApplication xml2rfc; mmark = callPackage ../tools/typesetting/mmark { }; @@ -24460,6 +25814,8 @@ in tsung = callPackage ../applications/networking/tsung {}; + bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; + qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; avrbinutils = pkgsCross.avr.buildPackages.binutils; @@ -24478,9 +25834,47 @@ in wasmtime = callPackage ../development/interpreters/wasmtime {}; + wfuzz = with python3Packages; toPythonApplication wfuzz; + bemenu = callPackage ../applications/misc/bemenu { }; dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; + + zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + + runwayml = callPackage ../applications/graphics/runwayml {}; + + uhubctl = callPackage ../tools/misc/uhubctl {}; + + kodelife = callPackage ../applications/graphics/kodelife {}; + + _3proxy = callPackage ../applications/networking/3proxy {}; + + pigeon = callPackage ../development/tools/pigeon {}; + + verifpal = callPackage ../tools/security/verifpal {}; + + nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + + wifi-password = callPackage ../os-specific/darwin/wifi-password {}; + + qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; + + coz = callPackage ../development/tools/analysis/coz {}; + + keycard-cli = callPackage ../tools/security/keycard-cli {}; + + sieveshell = with python3.pkgs; toPythonApplication managesieve; + + gortr = callPackage ../servers/gortr {}; + + sentencepiece = callPackage ../development/libraries/sentencepiece {}; + + kcli = callPackage ../development/tools/kcli {}; + + unstick = callPackage ../os-specific/linux/unstick {}; + + quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; } |