diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1328 |
1 files changed, 820 insertions, 508 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c19b98c28d..9cdce402c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -221,6 +221,8 @@ in dispad = callPackage ../tools/X11/dispad { }; + dupeguru = callPackage ../applications/misc/dupeguru { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { }; @@ -250,8 +252,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 {}); @@ -293,8 +293,10 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = makeOverridable (import ../build-support/fetchurl) { - inherit lib stdenvNoCC; + 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; @@ -358,6 +360,8 @@ in fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; + fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; + fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; fetchNuGet = callPackage ../build-support/fetchnuget { }; @@ -456,7 +460,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; @@ -480,6 +484,8 @@ in _1password = callPackage ../applications/misc/1password { }; + _6tunnel = callPackage ../tools/networking/6tunnel { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -535,7 +541,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 { }; @@ -559,6 +565,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 { }; @@ -664,10 +672,12 @@ 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 { }; @@ -708,6 +718,8 @@ in iamy = callPackage ../tools/admin/iamy { }; + azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; @@ -720,6 +732,8 @@ in 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 { }; @@ -777,6 +791,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + calls = callPackage ../applications/networking/calls { }; + certigo = callPackage ../tools/admin/certigo { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -790,6 +806,8 @@ in cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + cloudflare-wrangler = callPackage ../development/tools/cloudflare-wrangler { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; ccextractor = callPackage ../applications/video/ccextractor { }; @@ -802,6 +820,8 @@ in claws = callPackage ../tools/misc/claws { }; + cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + codespell = with python3Packages; toPythonApplication codespell; cozy = callPackage ../applications/audio/cozy-audiobooks { }; @@ -826,7 +846,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 { }; @@ -836,6 +856,8 @@ in elvish = callPackage ../shells/elvish { }; + emplace = callPackage ../tools/package-management/emplace { }; + encryptr = callPackage ../tools/security/encryptr { gconf = gnome2.GConf; }; @@ -844,6 +866,8 @@ in enpass = callPackage ../tools/security/enpass { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; + esh = callPackage ../tools/text/esh { }; ezstream = callPackage ../tools/audio/ezstream { }; @@ -854,6 +878,8 @@ in 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 {}); @@ -874,6 +900,8 @@ in gitter = callPackage ../applications/networking/instant-messengers/gitter { }; + gjs = callPackage ../development/libraries/gjs { }; + glasgow = with python3Packages; toPythonApplication glasgow; gucci = callPackage ../tools/text/gucci { }; @@ -890,6 +918,8 @@ in glyr = callPackage ../tools/audio/glyr { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; + httperf = callPackage ../tools/networking/httperf { }; ili2c = callPackage ../tools/misc/ili2c { }; @@ -990,12 +1020,6 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - 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; @@ -1036,6 +1060,8 @@ in awstats = callPackage ../tools/system/awstats { }; + awsweeper = callPackage ../tools/admin/awsweeper { }; + axel = callPackage ../tools/networking/axel { libssl = openssl; }; @@ -1120,6 +1146,8 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + bitbucket-cli = python2Packages.bitbucket-cli; blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; @@ -1199,8 +1227,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 { }; @@ -1232,6 +1258,8 @@ in asciidoc = asciidoc-full; }; + buildpack = callPackage ../development/tools/buildpack { }; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; @@ -1260,6 +1288,8 @@ in burpsuite = callPackage ../tools/networking/burpsuite {}; + bs-platform = (callPackage ../development/compilers/bs-platform {}).bs-platform-621; + c3d = callPackage ../applications/graphics/c3d { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -1289,6 +1319,7 @@ in }); caddy = callPackage ../servers/caddy { }; + caddy2 = callPackage ../servers/caddy/v2.nix { }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1428,8 +1459,6 @@ in contrast = callPackage ../applications/accessibility/contrast { }; - coprthr = callPackage ../development/libraries/coprthr { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; @@ -1445,7 +1474,9 @@ in colorls = callPackage ../tools/system/colorls { }; - coloursum = callPackage ../tools/text/coloursum { }; + coloursum = callPackage ../tools/text/coloursum { + inherit (darwin.apple_sdk.frameworks) Security; + }; compsize = callPackage ../os-specific/linux/compsize { }; @@ -1461,6 +1492,8 @@ in crip = callPackage ../applications/audio/crip { }; + crosvm = callPackage ../applications/virtualization/crosvm { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -1487,6 +1520,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 { }; @@ -1556,9 +1593,7 @@ in dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; - dosage = callPackage ../applications/graphics/dosage { - pythonPackages = python3Packages; - }; + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -1576,7 +1611,7 @@ in dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune; + inherit (ocamlPackages) dune dune_2; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1675,6 +1710,8 @@ in firestarter = callPackage ../applications/misc/firestarter { }; + fselect = callPackage ../tools/misc/fselect { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1805,9 +1842,11 @@ 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 { }; @@ -1815,7 +1854,7 @@ in kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = with pythonPackages; toPythonApplication klaus; + klaus = with python3Packages; toPythonApplication klaus; lcdproc = callPackage ../servers/monitoring/lcdproc { }; @@ -1851,7 +1890,7 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = pythonPackages.mathics; + mathics = with python2Packages; toPythonApplication mathics; masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; @@ -1903,6 +1942,8 @@ in nfdump = callPackage ../tools/networking/nfdump { }; + nfstrace = callPackage ../tools/networking/nfstrace { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -1953,6 +1994,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 {}; @@ -1977,12 +2020,16 @@ 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-cli = callPackage ../tools/security/step-cli { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; @@ -1997,6 +2044,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 { }; @@ -2005,7 +2054,9 @@ in conf = config.riot-web.conf or null; }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {}; + ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; roundcube = callPackage ../servers/roundcube { }; @@ -2026,7 +2077,7 @@ in libmysqlclient = null; postgresql = null; libdbi = null; - net_snmp = null; + net-snmp = null; libuuid = null; gnutls = null; libgcrypt = null; @@ -2104,6 +2155,8 @@ in epubcheck = null; }; + asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { }; + asunder = callPackage ../applications/audio/asunder { }; autossh = callPackage ../tools/networking/autossh { }; @@ -2128,8 +2181,6 @@ in beanstalkd = callPackage ../servers/beanstalkd { }; - beegfs = callPackage ../os-specific/linux/beegfs { }; - beets = callPackage ../tools/audio/beets { pythonPackages = python3Packages; }; @@ -2287,6 +2338,8 @@ in buildGoModule = buildGo112Module; }; + circus = callPackage ../tools/networking/circus { }; + # 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; @@ -2295,6 +2348,7 @@ in 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"; }; @@ -2303,6 +2357,9 @@ in 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; }; @@ -2322,10 +2379,6 @@ in codimd = callPackage ../servers/web-apps/codimd { nodejs = nodejs-10_x; - yarn2nix = yarn2nix-moretea.override { - nodejs = nodejs-10_x; - yarn = yarn.override { nodejs = nodejs-10_x; }; - }; }; colord = callPackage ../tools/misc/colord { }; @@ -2387,6 +2440,8 @@ in evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; + libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { @@ -2410,9 +2465,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 { }; @@ -2433,9 +2486,7 @@ in 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; @@ -2454,9 +2505,7 @@ 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 = { @@ -2537,7 +2586,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 @@ -2548,11 +2598,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 @@ -2562,9 +2614,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; @@ -2680,6 +2733,8 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsperf = callPackage ../tools/networking/dnsperf { }; dnsrecon = callPackage ../tools/security/dnsrecon { }; @@ -2896,6 +2951,8 @@ in inherit (pythonPackages) sphinx; }; + volctl = callPackage ../tools/audio/volctl { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; @@ -2943,6 +3000,7 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. + # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; elk7Version = "7.3.1"; @@ -2975,18 +3033,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_3; - }; - }).pkgs; toPythonApplication elasticsearch-curator; + elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { + python = python3; + }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; @@ -2998,9 +3047,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; @@ -3008,6 +3055,8 @@ in enscript = callPackage ../tools/text/enscript { }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; + entr = callPackage ../tools/misc/entr { }; eot_utilities = callPackage ../tools/misc/eot-utilities { }; @@ -3022,6 +3071,8 @@ in inherit (pythonPackages) buildPythonApplication pygtk numpy; }; + etcher = callPackage ../tools/misc/etcher { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { @@ -3226,6 +3277,8 @@ in fbv = callPackage ../tools/graphics/fbv { }; + fbvnc = callPackage ../tools/admin/fbvnc {}; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -3276,9 +3329,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 { }; @@ -3366,6 +3416,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; }); @@ -3506,10 +3561,6 @@ 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 { }; @@ -3543,11 +3594,11 @@ in gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { guiSupport = stdenv.isDarwin; - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { guiSupport = stdenv.isDarwin; - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg22; @@ -3967,13 +4018,13 @@ in 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 { }; @@ -4066,7 +4117,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 { }; @@ -4119,6 +4172,8 @@ in netmask = callPackage ../tools/networking/netmask {}; + ipscan = callPackage ../tools/security/ipscan { }; + ipv6calc = callPackage ../tools/networking/ipv6calc {}; ipxe = callPackage ../tools/misc/ipxe { }; @@ -4196,13 +4251,15 @@ 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 pythonPackages; toPythonApplication jpylyzer; + jpylyzer = with python3Packages; toPythonApplication jpylyzer; jq = callPackage ../development/tools/jq { }; @@ -4251,12 +4308,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 { @@ -4361,6 +4418,8 @@ in libsmi = callPackage ../development/libraries/libsmi { }; + licensor = callPackage ../tools/misc/licensor { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { @@ -4417,7 +4476,9 @@ in 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 {}; @@ -4526,8 +4587,6 @@ in next = callPackage ../applications/networking/browsers/next { }; - next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { }; - nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -4576,9 +4635,7 @@ in file-rename = callPackage ../tools/filesystems/file-rename { }; - kea = callPackage ../tools/networking/kea { - boost = boost165; - }; + kea = callPackage ../tools/networking/kea { }; ispell = callPackage ../tools/text/ispell {}; @@ -4636,6 +4693,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libisds = callPackage ../development/libraries/libisds { }; + libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { @@ -4648,6 +4707,8 @@ in libr3 = callPackage ../development/libraries/libr3 { }; + libraspberrypi = callPackage ../development/libraries/libraspberrypi { }; + libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; libspf2 = callPackage ../development/libraries/libspf2 { }; @@ -4990,6 +5051,8 @@ in mt-st = callPackage ../tools/backup/mt-st {}; + multitime = callPackage ../tools/misc/multitime { }; + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; @@ -5042,6 +5105,8 @@ in ndppd = callPackage ../applications/networking/ndppd { }; + nebula = callPackage ../tools/networking/nebula { }; + nemiver = callPackage ../development/tools/nemiver { }; neofetch = callPackage ../tools/misc/neofetch { }; @@ -5175,7 +5240,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 {}; @@ -5205,6 +5270,9 @@ in nnn = callPackage ../applications/misc/nnn { }; + + noise-repellent = callPackage ../applications/audio/noise-repellent { }; + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5294,6 +5362,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 { }; @@ -5381,13 +5454,15 @@ in 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 { - openssl = openssl_1_0_2; - }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; + + openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; @@ -5415,6 +5490,8 @@ in otpw = callPackage ../os-specific/linux/otpw { }; + overcommit = callPackage ../development/tools/overcommit { }; + overmind = callPackage ../applications/misc/overmind { }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; @@ -5450,8 +5527,6 @@ in pamtester = callPackage ../tools/security/pamtester { }; - paper-gtk-theme = callPackage ../misc/themes/paper { }; - paperless = callPackage ../applications/office/paperless { }; paperwork = callPackage ../applications/office/paperwork { }; @@ -5572,6 +5647,8 @@ in peco = callPackage ../tools/text/peco { }; + pg_flame = callPackage ../tools/misc/pg_flame { }; + pg_top = callPackage ../tools/misc/pg_top { }; pgcenter = callPackage ../tools/misc/pgcenter { }; @@ -5583,6 +5660,8 @@ in ssh = openssh; }; + pfetch = callPackage ../tools/misc/pfetch { }; + pfstools = callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; @@ -5670,6 +5749,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 { }; @@ -5694,6 +5775,8 @@ in ppl = callPackage ../development/libraries/ppl { }; + pplatex = callPackage ../tools/typesetting/tex/pplatex { }; + ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp {}; @@ -5732,6 +5815,8 @@ in pastebinit = callPackage ../tools/misc/pastebinit { }; + pmacct = callPackage ../tools/networking/pmacct { }; + polygraph = callPackage ../tools/networking/polygraph { }; progress = callPackage ../tools/misc/progress { }; @@ -5772,14 +5857,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; }; @@ -5841,6 +5922,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickjs = callPackage ../development/interpreters/quickjs { }; + quickserve = callPackage ../tools/networking/quickserve { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -5891,13 +5974,12 @@ 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 { }; + retext = libsForQt5.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -5912,15 +5994,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 { }; @@ -5991,6 +6065,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 { }; @@ -6047,6 +6123,10 @@ in 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 { }; @@ -6073,8 +6153,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 { }; @@ -6287,6 +6365,8 @@ in smesh = callPackage ../development/libraries/smesh {}; + smu = callPackage ../tools/text/smu { }; + smugline = python3Packages.smugline; snabb = callPackage ../tools/networking/snabb { } ; @@ -6303,6 +6383,8 @@ in sshguard = callPackage ../tools/security/sshguard {}; + sshping = callPackage ../tools/networking/sshping {}; + suricata = callPackage ../applications/networking/ids/suricata { python = python3; }; @@ -6344,8 +6426,6 @@ in syntex = callPackage ../tools/graphics/syntex {}; - fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -6362,10 +6442,14 @@ 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 { }; @@ -6377,6 +6461,8 @@ in ssldump = callPackage ../tools/networking/ssldump { }; + sslsplit = callPackage ../tools/networking/sslsplit { }; + sstp = callPackage ../tools/networking/sstp {}; strip-nondeterminism = perlPackages.strip-nondeterminism; @@ -6423,6 +6509,8 @@ in sslmate = callPackage ../development/tools/sslmate { }; + sshoogr = callPackage ../tools/networking/sshoogr { }; + ssmtp = callPackage ../tools/networking/ssmtp { }; ssocr = callPackage ../applications/misc/ssocr { }; @@ -6485,6 +6573,8 @@ in 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 {}; @@ -6531,6 +6621,8 @@ in tcpreplay = callPackage ../tools/networking/tcpreplay { }; + tdns-cli = callPackage ../tools/networking/tdns-cli { }; + ted = callPackage ../tools/typesetting/ted { }; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; @@ -6579,6 +6671,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 { }; @@ -6603,6 +6697,8 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy {}; @@ -6617,6 +6713,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 { }; @@ -6637,6 +6735,8 @@ in toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + topgrade = callPackage ../tools/misc/topgrade { }; + tor = callPackage ../tools/security/tor { # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { @@ -6679,6 +6779,8 @@ in trezord = callPackage ../servers/trezord { }; + trezor_agent = with python3Packages; toPythonApplication trezor_agent; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -6701,17 +6803,21 @@ in 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 { - openssl = openssl_1_0_2; - }; + trousers = callPackage ../tools/security/trousers { }; trx = callPackage ../tools/audio/trx { }; @@ -6732,6 +6838,8 @@ in ttyrec = callPackage ../tools/misc/ttyrec { }; + ttygif = callPackage ../tools/misc/ttygif { }; + ttylog = callPackage ../tools/misc/ttylog { }; turses = callPackage ../applications/networking/instant-messengers/turses { }; @@ -6814,10 +6922,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 {}; @@ -6850,6 +6962,11 @@ in 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; }; @@ -6960,6 +7077,8 @@ in whois = callPackage ../tools/networking/whois { }; + wifite2 = callPackage ../tools/networking/wifite2 { }; + wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; woff2 = callPackage ../development/web/woff2 { }; @@ -7058,7 +7177,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 { }; @@ -7149,6 +7271,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 { }; @@ -7310,6 +7434,11 @@ in 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 { }; @@ -7373,6 +7502,8 @@ in 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-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; @@ -7563,6 +7694,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; @@ -7621,6 +7760,7 @@ in crystal_0_27 crystal_0_29 crystal_0_30 + crystal_0_31 crystal crystal2nix; @@ -7665,8 +7805,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/9; - gcc = gcc9; + 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 { @@ -7732,7 +7872,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); @@ -7765,6 +7905,7 @@ in }; bintools = binutils1; libc = libcCross1; + extraPackages = []; }; gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { @@ -7774,6 +7915,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; @@ -7787,6 +7929,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; @@ -7800,6 +7943,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; })); @@ -7811,6 +7955,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; })); @@ -7822,6 +7967,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; })); @@ -7833,6 +7979,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; })); @@ -7844,6 +7991,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; })); @@ -7855,12 +8003,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; })); - # Version 8.x is marked broken on Darwin: https://gist.github.com/GrahamcOfBorg/bef0231b7129681950f03c4ac06781c8. - gfortran = if stdenv.isDarwin then gfortran7 else gfortran9; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -7980,6 +8128,10 @@ in 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 @@ -8003,6 +8155,14 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + purescript-psa = nodePackages.purescript-psa; + + spago = haskell.lib.justStaticExecutables haskellPackages.spago; + + pulp = nodePackages.pulp; + + pscid = nodePackages.pscid; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -8227,6 +8387,10 @@ in inherit installjdk pluginSupport; }); + jasmin = callPackage ../development/compilers/jasmin { }; + + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; julia_07 = callPackage ../development/compilers/julia/0.7.nix { @@ -8360,7 +8524,10 @@ in llvmPackages_latest = llvmPackages_9; - 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."; + lorri = callPackage ../tools/misc/lorri { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; manticore = callPackage ../development/compilers/manticore { }; @@ -8441,6 +8608,8 @@ in ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; + ocaml-crunch = ocamlPackages.crunch.bin; + ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; orc = callPackage ../development/compilers/orc { }; @@ -8480,16 +8649,26 @@ 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_39_0 = callPackage ../development/compilers/rust/1_39_0.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rustPackages = rust.packages.stable; + rust = rust_1_39_0; + + rustPackages_1_39_0 = rust_1_39_0.packages.stable; + rustPackages_1_38_0 = rust_1_38_0.packages.stable; + rustPackages = rustPackages_1_39_0; + inherit (rustPackages) cargo rustc rustPlatform; inherit (rust) makeRustPlatform; @@ -8513,6 +8692,9 @@ in 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 { }; @@ -8529,10 +8711,14 @@ 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-geiger = callPackage ../development/tools/rust/cargo-geiger { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin) libiconv; + inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; @@ -8544,6 +8730,9 @@ 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; }; @@ -8560,6 +8749,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; rustracerd = callPackage ../development/tools/rust/racerd { + inherit (rustPackages_1_38_0) rustPlatform; inherit (darwin.apple_sdk.frameworks) Security; }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; @@ -8595,9 +8785,7 @@ in 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 { }; @@ -8653,6 +8841,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; }; @@ -8688,6 +8881,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 = { @@ -8699,7 +8893,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 { @@ -8730,6 +8924,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 { }; @@ -8752,6 +8948,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 { }; @@ -8781,9 +8979,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; @@ -8953,6 +9151,10 @@ in php = php73; }); + php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php74; + }); + phpPackages-unit = php72Packages-unit; php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { @@ -8963,11 +9165,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; @@ -8981,6 +9188,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 { @@ -9001,6 +9213,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 {}; @@ -9034,6 +9255,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; @@ -9041,7 +9263,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -9049,11 +9271,14 @@ in python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.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. @@ -9132,7 +9357,23 @@ in }) 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; + # remove gcc from runtime closure + removeReferenceToCC = true; + }; ruby = ruby_2_6; @@ -9265,6 +9506,9 @@ 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 { }; @@ -9296,6 +9540,8 @@ in alloy5 alloy; + ameba = callPackage ../development/tools/ameba { }; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackage ../tools/admin/ansible { }) @@ -9331,6 +9577,8 @@ in kt = callPackage ../tools/misc/kt {}; + argbash = callPackage ../development/tools/misc/argbash {}; + arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; @@ -9386,7 +9634,7 @@ in 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; }; @@ -9643,6 +9891,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; }; }; @@ -9681,6 +9931,8 @@ in doit = callPackage ../development/tools/build-managers/doit { }; + dolt = callPackage ../servers/sql/dolt { }; + dot2tex = pythonPackages.dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -9698,6 +9950,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 { }; @@ -9745,6 +9999,8 @@ in frame = callPackage ../development/libraries/frame { }; + frp = callPackage ../tools/networking/frp { }; + fsatrace = callPackage ../development/tools/misc/fsatrace { }; fswatch = callPackage ../development/tools/misc/fswatch { @@ -9753,7 +10009,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 { }; @@ -9865,6 +10121,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 { }; @@ -9929,12 +10187,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 { }; @@ -9984,6 +10246,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 { }; @@ -10133,8 +10397,6 @@ in 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 { }; @@ -10245,7 +10507,7 @@ 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 { }; @@ -10280,6 +10542,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 { }; @@ -10326,8 +10590,15 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + texlab = callPackage ../development/tools/misc/texlab { + inherit (darwin.apple_sdk.frameworks) Security; + texlab-citeproc-build-deps = nodePackages."texlab-citeproc-build-deps-../tools/misc/texlab/citeproc"; + }; + tflint = callPackage ../development/tools/analysis/tflint { }; + tfsec = callPackage ../development/tools/analysis/tfsec { }; + todoist = callPackage ../applications/misc/todoist { }; todolist = callPackage ../applications/misc/todolist { }; @@ -10381,9 +10652,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 { }; @@ -10502,14 +10771,13 @@ in armadillo = callPackage ../development/libraries/armadillo {}; - arrayfire = callPackage ../development/libraries/arrayfire { - # fails to build with gcc >= 7 - stdenv = gcc6Stdenv; - }; + arrayfire = callPackage ../development/libraries/arrayfire {}; - arrow-cpp = callPackage ../development/libraries/arrow-cpp { + arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ gtest = gtest.override { static = true; }; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' + }); assimp = callPackage ../development/libraries/assimp { }; @@ -10557,9 +10825,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 { }; @@ -10604,9 +10872,10 @@ 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 { }; @@ -10616,6 +10885,8 @@ in box2d = callPackage ../development/libraries/box2d { }; + boxfort = callPackage ../development/libraries/boxfort { }; + buddy = callPackage ../development/libraries/buddy { }; bulletml = callPackage ../development/libraries/bulletml { }; @@ -10669,7 +10940,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 {}; @@ -10732,8 +11006,6 @@ in commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; - coredumper = callPackage ../development/libraries/coredumper { }; - ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; @@ -10763,6 +11035,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + criterion = callPackage ../development/libraries/criterion { }; + croaring = callPackage ../development/libraries/croaring { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -10864,7 +11138,9 @@ in easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; - eccodes = callPackage ../development/libraries/eccodes { }; + eccodes = callPackage ../development/libraries/eccodes { + pythonPackages = python3Packages; + }; eclib = callPackage ../development/libraries/eclib {}; @@ -10878,6 +11154,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 { }; @@ -11025,8 +11303,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 { }; @@ -11193,6 +11469,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 @@ -11205,6 +11482,11 @@ in 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; }; @@ -11396,7 +11678,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; @@ -11406,8 +11690,6 @@ 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 { }; @@ -11442,6 +11724,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 @@ -11872,7 +12160,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; }; @@ -12048,9 +12339,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -12219,10 +12507,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 { }; @@ -12595,6 +12879,8 @@ in libsoup = callPackage ../development/libraries/libsoup { }; + libspectrum = callPackage ../development/libraries/libspectrum { }; + libspiro = callPackage ../development/libraries/libspiro {}; libssh = callPackage ../development/libraries/libssh { }; @@ -12780,9 +13066,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; @@ -12800,7 +13090,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 { }; @@ -12880,8 +13172,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 { }; @@ -12908,16 +13198,6 @@ 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 { llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -12988,7 +13268,9 @@ 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 { }; @@ -13025,6 +13307,8 @@ in then null else callPackage ../development/libraries/ncurses { }; + ndi = callPackage ../development/libraries/ndi { }; + neardal = callPackage ../development/libraries/neardal { }; neon = callPackage ../development/libraries/neon { }; @@ -13196,7 +13480,10 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_1; + 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 @@ -13204,9 +13491,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 {}; @@ -13250,15 +13535,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; @@ -13331,6 +13607,7 @@ in 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 { }; @@ -13356,14 +13633,11 @@ in 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 {}; @@ -13414,50 +13688,17 @@ in developerBuild = true; }); - 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 fetchpatch 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 fetchpatch fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; + inherit dconf; inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; - inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; inherit llvmPackages_5; }); @@ -13465,8 +13706,8 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); # TODO bump to 5.12 on darwin once it's not broken - qt5 = if stdenv.isDarwin then qt511 else qt512; - libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; + qt5 = qt512; + libsForQt5 = libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -13476,7 +13717,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 @@ -13543,13 +13784,9 @@ in 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 { }; @@ -13688,6 +13925,8 @@ in qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + randomx = callPackage ../development/libraries/randomx { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -14285,6 +14524,8 @@ 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 { }; @@ -14301,19 +14542,6 @@ in stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; - 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; - }; - websocketpp = callPackage ../development/libraries/websocket++ { }; webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; @@ -14366,6 +14594,8 @@ in x265 = callPackage ../development/libraries/x265 { }; + xandikos = callPackage ../servers/xandikos { }; + inherit (callPackages ../development/libraries/xapian { }) xapian_1_4; xapian = xapian_1_4; @@ -14487,11 +14717,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 @@ -14722,8 +14952,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; @@ -14742,6 +14970,8 @@ in mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + 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; }; @@ -14910,7 +15140,7 @@ in gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { - buildGoPackage = buildGo112Package; + buildGoPackage = buildGo113Package; }; grafana-loki = callPackage ../servers/monitoring/loki { }; @@ -14993,7 +15223,8 @@ in mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - mpd = callPackage ../servers/mpd (config.mpd or {}); + inherit (callPackages ../servers/mpd { }) + mpd mpd-small mpdWithFeatures; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -15031,12 +15262,14 @@ 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 ]; }; 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 ]; @@ -15224,7 +15457,7 @@ in 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 { }; @@ -15233,6 +15466,8 @@ 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 { }; @@ -15278,11 +15513,7 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - # Version 2.12.0 fails to build with go 1.13 due to an incorrect module file - # compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + 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 { }; @@ -15303,6 +15534,7 @@ in 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 { }; @@ -15329,6 +15561,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 {}; @@ -15342,6 +15576,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 { @@ -15375,9 +15611,7 @@ in libtool = darwin.cctools; }; - rippled = callPackage ../servers/rippled { - boost = boost167; - }; + rippled = callPackage ../servers/rippled { }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { boost = boost167.override { @@ -15397,8 +15631,6 @@ 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; @@ -15406,17 +15638,6 @@ in 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; @@ -15605,12 +15826,11 @@ in server = server-pgsql; }; - zabbix44 = zabbixFor "v44"; - 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 { }; @@ -15632,7 +15852,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 { }; @@ -15693,12 +15913,6 @@ in bluez = bluez5; - bluezFull = bluez.override { - enableWiimote = true; - enableMidi = true; - enableSixaxis = true; - }; - inherit (python3Packages) bedup; bolt = callPackage ../os-specific/linux/bolt { }; @@ -15976,6 +16190,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 ] @@ -15993,6 +16208,7 @@ in linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 1; }; @@ -16000,6 +16216,7 @@ in linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 2; }; @@ -16007,6 +16224,7 @@ in linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 3; }; @@ -16014,6 +16232,7 @@ in linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 4; }; @@ -16021,6 +16240,7 @@ in 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 @@ -16034,6 +16254,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 ]; @@ -16042,6 +16263,7 @@ 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" @@ -16053,14 +16275,7 @@ in linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" - ]; - }; - - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long kernelPatches.export_kernel_fpu_functions."4.14" ]; @@ -16069,19 +16284,29 @@ in linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.export_kernel_fpu_functions."5.3" ]; }; + linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + 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 ]; }; @@ -16089,6 +16314,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 ]; }; @@ -16124,8 +16350,6 @@ 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 { }; chipsec = callPackage ../tools/security/chipsec { @@ -16271,7 +16495,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_3; + linuxPackages_latest = linuxPackages_5_4; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -16284,8 +16508,8 @@ in 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_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3); + linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -16359,17 +16583,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; @@ -16393,8 +16626,6 @@ in libsass = callPackage ../development/libraries/libsass { }; - libsexy = callPackage ../development/libraries/libsexy { }; - libsepol = callPackage ../os-specific/linux/libsepol { }; libsmbios = callPackage ../os-specific/linux/libsmbios { }; @@ -16452,6 +16683,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; @@ -16795,6 +17030,8 @@ in ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit ubootRaspberryPiZero + ubootRock64 + ubootRockPro64 ubootSheevaplug ubootSopine ubootUtilite @@ -16804,10 +17041,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 { @@ -16872,6 +17105,8 @@ in 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 { }; @@ -16886,12 +17121,20 @@ 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 { }; @@ -16911,6 +17154,8 @@ 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 { }; @@ -16931,6 +17176,8 @@ in 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 { }; inherit (kdeFrameworks) breeze-icons; @@ -16951,6 +17198,10 @@ in 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 {}; comfortaa = callPackage ../data/fonts/comfortaa {}; @@ -17037,10 +17288,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 { }; @@ -17076,6 +17331,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; + 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; @@ -17092,14 +17349,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 { }; @@ -17150,6 +17411,8 @@ in 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 {}; @@ -17204,6 +17467,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 { }; @@ -17289,24 +17554,36 @@ 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 { }; @@ -17339,6 +17616,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 { }; @@ -17361,6 +17640,8 @@ in 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 { }; @@ -17377,6 +17658,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 { }; @@ -17389,11 +17672,15 @@ 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 { }; + starship = callPackage ../tools/misc/starship { + inherit (darwin.apple_sdk.frameworks) Security; + }; stig = callPackage ../applications/networking/p2p/stig { }; @@ -17424,6 +17711,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 { }; @@ -17502,6 +17793,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 { }; @@ -17526,12 +17819,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 { }; @@ -17623,6 +17924,8 @@ in airwave = callPackage ../applications/audio/airwave { }; + akira-unstable = callPackage ../applications/graphics/akira { }; + alembic = callPackage ../development/libraries/alembic {}; alchemy = callPackage ../applications/graphics/alchemy { }; @@ -17775,8 +18078,6 @@ in batik = callPackage ../applications/graphics/batik { }; - batti = callPackage ../applications/misc/batti { }; - baudline = callPackage ../applications/audio/baudline { }; @@ -17793,7 +18094,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; @@ -17854,6 +18155,8 @@ in libXi libXext libXfixes libXcomposite; }; + blugon = callPackage ../applications/misc/blugon { }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -17921,8 +18224,6 @@ in carla = qt5.callPackage ../applications/audio/carla { }; - catfish = callPackage ../applications/search/catfish { }; - catimg = callPackage ../tools/misc/catimg { }; catt = python3Packages.callPackage ../applications/video/catt { }; @@ -17954,9 +18255,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 { }; @@ -18038,16 +18337,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; }; @@ -18064,6 +18357,8 @@ 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 {}; @@ -18140,8 +18435,6 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - diffuse = callPackage ../applications/version-management/diffuse { }; - direwolf = callPackage ../applications/misc/direwolf { }; dirt = callPackage ../applications/audio/dirt {}; @@ -18198,6 +18491,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 { }; @@ -18385,10 +18680,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 { }; @@ -18518,6 +18815,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 { }; @@ -18596,6 +18895,8 @@ in grepm = callPackage ../applications/search/grepm { }; + grip-search = callPackage ../tools/text/grip-search { }; + grip = callPackage ../applications/misc/grip { inherit (gnome2) libgnome libgnomeui vte; }; @@ -18636,7 +18937,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 {}; @@ -18661,6 +18962,7 @@ in Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; inherit (darwin) libobjc; + inherit (rustPackages_1_38_0) cargo rustc; }; }); @@ -18688,8 +18990,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"; }; @@ -18702,8 +19003,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"; }; @@ -18717,15 +19017,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 { }; @@ -18832,9 +19127,7 @@ in gmrun = callPackage ../applications/misc/gmrun {}; - gnucash = callPackage ../applications/office/gnucash { - inherit (gnome3) dconf; - }; + gnucash = callPackage ../applications/office/gnucash { }; goffice = callPackage ../development/libraries/goffice { }; @@ -18862,7 +19155,7 @@ in moe = callPackage ../applications/editors/moe { }; - multibootusb = callPackage ../applications/misc/multibootusb {}; + multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; praat = callPackage ../applications/audio/praat { }; @@ -18877,10 +19170,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 { }; @@ -18970,6 +19267,8 @@ in gpsprune = callPackage ../applications/misc/gpsprune { }; + gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; + gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; gspell = callPackage ../development/libraries/gspell { }; @@ -18986,20 +19285,22 @@ 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 { }; hello = callPackage ../applications/misc/hello { }; @@ -19015,6 +19316,8 @@ in hexcurse = callPackage ../applications/editors/hexcurse { }; + hexdino = callPackage ../applications/editors/hexdino { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; @@ -19053,6 +19356,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 { @@ -19112,7 +19417,8 @@ in 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 { }; @@ -19338,7 +19644,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 {}; @@ -19398,8 +19704,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 { }; @@ -19451,6 +19755,8 @@ in go = buildPackages.go_1_12; }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; @@ -19532,13 +19838,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; @@ -19547,9 +19855,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; @@ -19579,9 +19885,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone { - polarssl = mbedtls_1_3; - }; + linphone = callPackage ../applications/networking/instant-messengers/linphone { }; linuxsampler = callPackage ../applications/audio/linuxsampler { }; @@ -19595,6 +19899,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 { }; @@ -19633,7 +19939,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 { }; @@ -19672,6 +19978,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 { }; @@ -19688,6 +19996,14 @@ in 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 { }; @@ -19698,9 +20014,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 { }; @@ -19708,8 +20022,6 @@ in meme = callPackage ../applications/graphics/meme { }; - mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -19722,9 +20034,7 @@ in 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 { }; @@ -19761,8 +20071,6 @@ in meh = callPackage ../applications/graphics/meh {}; - mirage = callPackage ../applications/graphics/mirage { }; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; }; @@ -19776,9 +20084,14 @@ 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 { }; @@ -19805,6 +20118,8 @@ in 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 { }; @@ -19857,7 +20172,9 @@ 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 { }; @@ -19929,7 +20246,7 @@ in avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or stdenv.isLinux; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -19962,12 +20279,16 @@ 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 { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + openshift = callPackage ../applications/networking/cluster/openshift { buildGoPackage = buildGo112Package; }; @@ -19982,6 +20303,8 @@ in partio = callPackage ../development/libraries/partio {}; + pbis-open = callPackage ../tools/security/pbis { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; @@ -20021,8 +20344,6 @@ 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 { }; @@ -20045,6 +20366,8 @@ in 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 { }; @@ -20121,6 +20444,8 @@ in micro = callPackage ../applications/editors/micro { }; + mle = callPackage ../applications/editors/mle { }; + nano = callPackage ../applications/editors/nano { }; nanoblogger = callPackage ../applications/misc/nanoblogger { }; @@ -20182,14 +20507,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 { }; @@ -20237,7 +20562,6 @@ in orca = python3Packages.callPackage ../applications/misc/orca { inherit (pkgs) pkgconfig; - inherit (gnome3) yelp-tools; }; osm2xmap = callPackage ../applications/misc/osm2xmap { @@ -20271,8 +20595,6 @@ 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; @@ -20423,14 +20745,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 (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; @@ -20497,6 +20817,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 { }; @@ -20576,9 +20899,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; @@ -20646,6 +20967,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 { }; @@ -20794,10 +21117,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 { }; @@ -20848,12 +21167,16 @@ 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) Security; + inherit (darwin.apple_sdk.frameworks) AppKit Security; }; squishyball = callPackage ../applications/audio/squishyball { @@ -20872,7 +21195,9 @@ in wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; + 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 { conf = config.st.conf or null; @@ -20963,16 +21288,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 { }; @@ -21083,6 +21402,7 @@ in swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; + boost = boost168; }; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; @@ -21131,12 +21451,16 @@ in tailor = callPackage ../applications/version-management/tailor {}; + taizen = callPackage ../applications/misc/taizen { }; + tangogps = callPackage ../applications/misc/tangogps { gconf = gnome2.GConf; }; tambura = callPackage ../applications/audio/tambura { }; + 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 { }; @@ -21216,8 +21540,9 @@ in 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 {}; @@ -21342,6 +21667,8 @@ in ulauncher = callPackage ../applications/misc/ulauncher { }; + twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; @@ -21364,10 +21691,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 { }; @@ -21379,7 +21702,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 { }; @@ -21453,7 +21776,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virt-manager = callPackage ../applications/virtualization/virt-manager { - dconf = gnome3.dconf; system-libvirt = libvirt; }; @@ -21634,8 +21956,6 @@ in wily = callPackage ../applications/editors/wily { }; - winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { erlang = erlangR21; }; @@ -22060,6 +22380,8 @@ in inherit (gnome3) yelp; + yelp-tools = callPackage ../development/misc/yelp-tools { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -22130,7 +22452,11 @@ in 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; withGui = false; }; + 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; @@ -22170,7 +22496,7 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - jormungandr = callPackage ../applications/blockchains/jormungandr { }; + ledger_agent = with python3Packages; toPythonApplication ledger_agent; ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; @@ -22213,9 +22539,7 @@ in wownero = callPackage ../applications/blockchains/wownero.nix {}; - zcash = callPackage ../applications/blockchains/zcash { - withGui = false; - }; + zcash = callPackage ../applications/blockchains/zcash { }; parity = callPackage ../applications/blockchains/parity { }; parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; @@ -22322,7 +22646,7 @@ in chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt59.callPackage ../games/chessx { }; + chessx = libsForQt5.callPackage ../games/chessx { }; chiaki = libsForQt5.callPackage ../games/chiaki { }; @@ -22346,12 +22670,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 { }; @@ -22379,14 +22703,15 @@ in 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; }; @@ -22416,6 +22741,8 @@ in egoboo = callPackage ../games/egoboo { }; + eidolon = callPackage ../games/eidolon { }; + EmptyEpsilon = callPackage ../games/empty-epsilon { }; endgame-singularity = callPackage ../games/endgame-singularity { }; @@ -22534,6 +22861,8 @@ in gshogi = python3Packages.callPackage ../games/gshogi {}; + qtads = qt5.callPackage ../games/qtads { }; + gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; @@ -22550,8 +22879,6 @@ in inherit (haskellPackages) ghcWithPackages; }; - hexen = callPackage ../games/hexen { }; - holdingnuts = callPackage ../games/holdingnuts { }; hyperrogue = callPackage ../games/hyperrogue { }; @@ -22564,9 +22891,7 @@ in ideogram = callPackage ../applications/graphics/ideogram { }; - instead = callPackage ../games/instead { - lua = lua5; - }; + instead = callPackage ../games/instead { }; instead-launcher = callPackage ../games/instead-launcher { }; @@ -22729,7 +23054,7 @@ in privateer = callPackage ../games/privateer { }; - pysolfc = callPackage ../games/pysolfc { }; + pysolfc = python3Packages.callPackage ../games/pysolfc { }; qweechat = callPackage ../applications/networking/irc/qweechat { }; @@ -22889,6 +23214,8 @@ in ffmpeg = ffmpeg_2; }; + streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; + stuntrally = callPackage ../games/stuntrally { ogre = ogre1_9; mygui = mygui.override { @@ -22900,7 +23227,7 @@ in superTuxKart = callPackage ../games/super-tux-kart { }; - synthv1 = callPackage ../applications/audio/synthv1 { }; + synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; system-syzygy = callPackage ../games/system-syzygy { }; @@ -23105,7 +23432,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; @@ -23144,9 +23473,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 "removed 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; - mediaplayer = throw "deprecated 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + 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 { }; @@ -23170,50 +23500,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-vertex = callPackage ../misc/themes/vertex { }; - rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; }; - solarc-gtk-theme = callPackage ../misc/themes/solarc { }; - - xfce = xfce4-12; - - 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 { }; @@ -23243,6 +23546,8 @@ in kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; + krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + ### SCIENCE ### SCIENCE/CHEMISTY @@ -23353,6 +23658,8 @@ in kallisto = callPackage ../applications/science/biology/kallisto { }; + kssd = callPackage ../applications/science/biology/kssd { }; + macse = callPackage ../applications/science/biology/macse { }; migrate = callPackage ../applications/science/biology/migrate { }; @@ -23441,6 +23748,8 @@ in SPAdes = callPackage ../applications/science/biology/spades { }; + svaba = callPackage ../applications/science/biology/svaba { }; + trimal = callPackage ../applications/science/biology/trimal { }; truvari = callPackage ../applications/science/biology/truvari { }; @@ -23670,6 +23979,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 ; @@ -24013,8 +24323,8 @@ in 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 { @@ -24055,6 +24365,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 { }; @@ -24110,6 +24422,8 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; areca = callPackage ../applications/backup/areca { }; @@ -24120,8 +24434,6 @@ in bees = callPackage ../tools/filesystems/bees { }; - blackbird = callPackage ../misc/themes/blackbird { }; - bootil = callPackage ../development/libraries/bootil { }; brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; @@ -24160,8 +24472,6 @@ in 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 { }; @@ -24230,8 +24540,6 @@ in electricsheep = callPackage ../misc/screensavers/electricsheep { }; - equilux-theme = callPackage ../misc/themes/equilux-theme { }; - flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; @@ -24274,6 +24582,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; }; @@ -24291,13 +24601,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 { }; @@ -24374,8 +24684,9 @@ in kops_1_12 kops_1_13 kops_1_14 + kops_1_15 ; - kops = kops_1_14; + kops = kops_1_15; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -24585,6 +24896,8 @@ 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 { }; @@ -24618,7 +24931,7 @@ 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 { }; @@ -24674,9 +24987,7 @@ in sndio = callPackage ../misc/sndio { }; - # Oclgrind 18.3 does not work with newer LLVMs (but HEAD does, so - # fix this after next release). - oclgrind = callPackage ../development/tools/analysis/oclgrind { llvmPackages = llvmPackages_6; }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; opkg = callPackage ../tools/package-management/opkg { }; @@ -24745,6 +25056,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; }; @@ -24971,11 +25286,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 { }; @@ -25102,11 +25412,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 {}; @@ -25228,9 +25534,7 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - buildGoModule = buildGo112Module; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -25358,6 +25662,8 @@ in wasmtime = callPackage ../development/interpreters/wasmtime {}; + wfuzz = with python3Packages; toPythonApplication wfuzz; + bemenu = callPackage ../applications/misc/bemenu { }; dapper = callPackage ../development/tools/dapper { }; @@ -25372,6 +25678,8 @@ in kodelife = callPackage ../applications/graphics/kodelife {}; + _3proxy = callPackage ../applications/networking/3proxy {}; + pigeon = callPackage ../development/tools/pigeon {}; verifpal = callPackage ../tools/security/verifpal {}; @@ -25388,4 +25696,8 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; + gortr = callPackage ../servers/gortr {}; + + sentencepiece = callPackage ../development/libraries/sentencepiece {}; + } |