diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1483 |
1 files changed, 1123 insertions, 360 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fa384582cb..00735014afb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -94,6 +94,8 @@ in genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + nix-update-script = callPackage ../common-updater/nix-update.nix { }; + ### Push NixOS tests inside the fixed point nixosTests = import ../../nixos/tests/all-tests.nix { @@ -132,6 +134,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + alda = callPackage ../development/interpreters/alda { }; + ankisyncd = callPackage ../servers/ankisyncd { }; avro-tools = callPackage ../development/tools/avro-tools { }; @@ -151,7 +155,10 @@ in buildEnv = callPackage ../build-support/buildenv { }; # not actually a package - buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; + # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap + buildFHSUserEnv = buildFHSUserEnvChroot; + buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; + buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; buildMaven = callPackage ../build-support/build-maven.nix {}; @@ -183,10 +190,14 @@ in deadcode = callPackage ../development/tools/deadcode { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + glade = callPackage ../development/tools/glade { }; hobbes = callPackage ../development/tools/hobbes { }; + html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -215,7 +226,9 @@ in grsync = callPackage ../applications/misc/grsync { }; - dockerTools = callPackage ../build-support/docker { }; + dockerTools = callPackage ../build-support/docker { + writePython3 = writers.writePython3; + }; snapTools = callPackage ../build-support/snap { }; @@ -265,6 +278,8 @@ in etBook = callPackage ../data/fonts/et-book { }; + fet-sh = callPackage ../tools/misc/fet-sh { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -333,6 +348,7 @@ in then buildPackages.fetchurl # No need to do special overrides twice, else makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; + inherit cacert; curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; @@ -499,9 +515,7 @@ in findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = makeSetupHook { - deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ]; - } ../build-support/setup-hooks/wrap-gapps-hook.sh; + wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -520,6 +534,9 @@ in #package writers writers = callPackage ../build-support/writers {}; + # lib functions depending on pkgs + inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; + ### TOOLS _0x0 = callPackage ../tools/misc/0x0 { }; @@ -530,6 +547,10 @@ in _1password = callPackage ../applications/misc/1password { }; + _1password-gui = callPackage ../tools/security/1password-gui { + electron = electron_9; + }; + _6tunnel = callPackage ../tools/networking/6tunnel { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -566,6 +587,8 @@ in adlplug = callPackage ../applications/audio/adlplug { }; + tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; + opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; @@ -601,6 +624,8 @@ in stdenv = clangStdenv; }; + honggfuzz = callPackage ../tools/security/honggfuzz { }; + aflplusplus = callPackage ../tools/security/aflplusplus { clang = clang_9; llvm = llvm_9; @@ -647,6 +672,8 @@ in almanah = callPackage ../applications/misc/almanah { }; + alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; @@ -674,6 +701,10 @@ in apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apk-tools = callPackage ../tools/package-management/apk-tools { + lua = lua5_3; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -703,6 +734,8 @@ in arduino = arduino-core.override { withGui = true; }; + arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-core = callPackage ../development/arduino/arduino-core { }; arduino-mk = callPackage ../development/arduino/arduino-mk {}; @@ -734,6 +767,10 @@ in asciiquarium = callPackage ../applications/misc/asciiquarium {}; + ashuffle = callPackage ../applications/audio/ashuffle {}; + + asls = callPackage ../development/tools/misc/asls { }; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; }; gsl = gsl_1; @@ -759,6 +796,8 @@ in awscli = callPackage ../tools/admin/awscli { }; + awscli2 = callPackage ../tools/admin/awscli2 { }; + awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; @@ -771,8 +810,6 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; @@ -795,6 +832,8 @@ in boxes = callPackage ../tools/text/boxes { }; + chamber = callPackage ../tools/admin/chamber { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -856,6 +895,8 @@ in boulder = callPackage ../tools/admin/boulder { }; + btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; + buildbot = with python3Packages; toPythonApplication buildbot; buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; buildbot-full = with python3Packages; toPythonApplication buildbot-full; @@ -865,6 +906,8 @@ in calls = callPackage ../applications/networking/calls { }; + inherit (nodePackages) castnow; + certigo = callPackage ../tools/admin/certigo { }; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; @@ -884,6 +927,8 @@ in container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { }; + ccextractor = callPackage ../applications/video/ccextractor { }; cconv = callPackage ../tools/text/cconv { }; @@ -898,6 +943,8 @@ in codespell = with python3Packages; toPythonApplication codespell; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; @@ -919,6 +966,8 @@ in detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + diskonaut = callPackage ../tools/misc/diskonaut { }; + diskus = callPackage ../tools/misc/diskus { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -931,6 +980,8 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + doona = callPackage ../tools/security/doona { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; @@ -955,20 +1006,32 @@ in libfx2 = with python3Packages; toPythonApplication fx2; + fastmod = callPackage ../tools/text/fastmod { + inherit (darwin.apple_sdk.frameworks) Security; + }; + fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; - genpass = callPackage ../tools/security/genpass { }; + genpass = callPackage ../tools/security/genpass { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; genymotion = callPackage ../development/mobile/genymotion { }; gaia = callPackage ../development/libraries/gaia { }; + gama = callPackage ../applications/science/geometry/gama { }; + gamecube-tools = callPackage ../development/tools/gamecube-tools { }; + gammy = qt5.callPackage ../tools/misc/gammy { }; + gams = callPackage ../tools/misc/gams (config.gams or {}); + gem = callPackage ../applications/audio/pd-plugins/gem { }; + git-fire = callPackage ../tools/misc/git-fire { }; git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; @@ -1019,6 +1082,8 @@ in httperf = callPackage ../tools/networking/httperf { }; + hwi = with python3Packages; toPythonApplication hwi; + ili2c = callPackage ../tools/misc/ili2c { }; imageworsener = callPackage ../tools/graphics/imageworsener { }; @@ -1085,6 +1150,8 @@ in wiiload = callPackage ../development/tools/wiiload { }; + wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1279,6 +1346,8 @@ in quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + mirage-im = libsForQt5.callPackage ../applications/networking/instant-messengers/mirage {}; + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { @@ -1321,7 +1390,7 @@ in boringtun = callPackage ../tools/networking/boringtun { }; - boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; + boomerang = libsForQt512.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -1331,6 +1400,8 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; + bpytop = callPackage ../tools/system/bpytop { }; + brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -1394,7 +1465,6 @@ in bs-platform = callPackage ../development/compilers/bs-platform {}; c3d = callPackage ../applications/graphics/c3d { - stdenv = gcc8Stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -1420,8 +1490,12 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; + caddy = callPackage ../servers/caddy { + buildGoModule = buildGo114Module; + }; + caddy2 = callPackage ../servers/caddy/v2.nix { + buildGoModule = buildGo114Module; + }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1588,6 +1662,8 @@ in compsize = callPackage ../os-specific/linux/compsize { }; + cot = with python3Packages; toPythonApplication cot; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {}; @@ -1624,6 +1700,8 @@ in dante = callPackage ../servers/dante { }; + dapr-cli = callPackage ../development/tools/dapr/cli {}; + dasher = callPackage ../applications/accessibility/dasher { }; datamash = callPackage ../tools/misc/datamash { }; @@ -1678,6 +1756,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + dijo = callPackage ../tools/misc/dijo { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + ding = callPackage ../applications/misc/ding { aspellDicts_de = aspellDicts.de; aspellDicts_en = aspellDicts.en; @@ -1715,6 +1797,8 @@ in dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; + doppler = callPackage ../tools/security/doppler {}; + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -1733,7 +1817,7 @@ in dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune dune_2; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1764,6 +1848,12 @@ in eksctl = callPackage ../tools/admin/eksctl { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; + + element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { + conf = config.element-web.conf or {}; + }; + elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; ell = callPackage ../os-specific/linux/ell { }; @@ -1784,7 +1874,9 @@ in eschalot = callPackage ../tools/security/eschalot { }; - esphome = callPackage ../servers/home-assistant/esphome.nix { }; + espanso = callPackage ../applications/office/espanso { }; + + esphome = callPackage ../tools/misc/esphome { }; esptool = callPackage ../tools/misc/esptool { }; @@ -1846,6 +1938,16 @@ in futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + tllist = callPackage ../development/libraries/tllist { }; + + fcft = callPackage ../development/libraries/fcft { }; + + fuzzel = callPackage ../applications/misc/fuzzel { }; + + flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + + qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; @@ -1864,6 +1966,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + go-rice = callPackage ../tools/misc/go.rice {}; + go-2fa = callPackage ../tools/security/2fa {}; go-dependency-manager = callPackage ../development/tools/gdm { }; @@ -1932,7 +2036,9 @@ in gringo = callPackage ../tools/misc/gringo { }; - grobi = callPackage ../tools/X11/grobi { }; + grobi = callPackage ../tools/X11/grobi { + buildGoModule = buildGo114Module; + }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; @@ -1940,6 +2046,8 @@ in gthree = callPackage ../development/libraries/gthree { }; + gtg = callPackage ../applications/office/gtg { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1964,6 +2072,8 @@ in hr = callPackage ../applications/misc/hr { }; + humioctl = callPackage ../applications/logging/humioctl {}; + hyx = callPackage ../tools/text/hyx { }; icdiff = callPackage ../tools/text/icdiff {}; @@ -1974,6 +2084,8 @@ in jellyfin = callPackage ../servers/jellyfin { }; + jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jotta-cli = callPackage ../applications/misc/jotta-cli { }; @@ -2016,6 +2128,8 @@ in long-shebang = callPackage ../misc/long-shebang {}; + lowdown = callPackage ../tools/typesetting/lowdown { }; + numatop = callPackage ../os-specific/linux/numatop { }; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; @@ -2024,20 +2138,22 @@ in ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; + kaggle = with python3Packages; toPythonApplication kaggle; + lynis = callPackage ../tools/security/lynis { }; mapproxy = callPackage ../applications/misc/mapproxy { }; marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = with python2Packages; toPythonApplication mathics; - masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; }; massren = callPackage ../tools/misc/massren { }; + maxcso = callPackage ../tools/archivers/maxcso {}; + medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { }; @@ -2072,6 +2188,8 @@ in mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; + molly-brown = callPackage ../servers/gemini/molly-brown { }; + monetdb = callPackage ../servers/sql/monetdb { }; mons = callPackage ../tools/misc/mons {}; @@ -2096,6 +2214,8 @@ in mq-cli = callPackage ../tools/system/mq-cli { }; + nextdns = callPackage ../applications/networking/nextdns { }; + nfdump = callPackage ../tools/networking/nfdump { }; nfstrace = callPackage ../tools/networking/nfstrace { }; @@ -2122,6 +2242,8 @@ in onboard = callPackage ../applications/misc/onboard { }; + oneshot = callPackage ../tools/networking/oneshot { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2142,7 +2264,9 @@ in pbzx = callPackage ../tools/compression/pbzx { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { + wrapQtAppsHook = qt5.wrapQtAppsHook; + }; pev = callPackage ../development/tools/analysis/pev { }; @@ -2178,6 +2302,8 @@ in remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; + ryujinx = callPackage ../misc/emulators/ryujinx { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -2188,6 +2314,8 @@ in simg2img = callPackage ../tools/filesystems/simg2img { }; + simplenes = callPackage ../misc/emulators/simplenes { }; + snipes = callPackage ../games/snipes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -2224,12 +2352,6 @@ in ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; - riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; - - riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { - conf = config.riot-web.conf or {}; - }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -2343,8 +2465,6 @@ in assh = callPackage ../tools/networking/assh { }; - asynk = callPackage ../tools/networking/asynk { }; - b2sum = callPackage ../tools/security/b2sum { inherit (llvmPackages) openmp; }; @@ -2359,6 +2479,8 @@ in bdsync = callPackage ../tools/backup/bdsync { }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; + beanstalkd = callPackage ../servers/beanstalkd { }; beets = callPackage ../tools/audio/beets { @@ -2390,12 +2512,16 @@ in inherit (python27Packages) pillow; }; + blueberry = callPackage ../tools/bluetooth/blueberry { }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; bogofilter = callPackage ../tools/misc/bogofilter { }; + bomutils = callPackage ../tools/archivers/bomutils { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; @@ -2470,6 +2596,8 @@ in cemu = qt5.callPackage ../applications/science/math/cemu { }; + isolyzer = callPackage ../tools/cd-dvd/isolyzer { }; + isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { }; mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; @@ -2478,7 +2606,7 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost167.override { enablePython = true; python = python37; }; + boost = boost16x.override { enablePython = true; python = python38; }; }) ceph ceph-client; @@ -2518,38 +2646,24 @@ in clementineUnfree = clementine.unfree; + mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; - citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; - citrix_workspace_unwrapped_20_04_0 = citrix_workspace_unwrapped.override { version = "20.04.0"; }; - citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; - citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; - citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; - citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; - citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; + citrix_workspace = citrix_workspace_20_06_0; - citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped; - }; - citrix_workspace_19_12_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_12_0; - }; - citrix_workspace_19_10_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_10_0; - }; - citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_8_0; - }; - citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_6_0; - }; - citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { - citrix_workspace = citrix_workspace_unwrapped_19_3_0; - }; + inherit (callPackage ../applications/networking/remote/citrix-workspace { }) + citrix_workspace_19_6_0 + citrix_workspace_19_8_0 + citrix_workspace_19_10_0 + citrix_workspace_19_12_0 + citrix_workspace_20_04_0 + citrix_workspace_20_06_0 + ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2585,8 +2699,6 @@ in connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -2667,7 +2779,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -2716,7 +2828,9 @@ in ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = callPackage ../tools/security/clamav { }; + clamav = callPackage ../tools/security/clamav { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; clex = callPackage ../tools/misc/clex { }; @@ -2746,6 +2860,8 @@ in conda = callPackage ../tools/package-management/conda { }; + console-bridge = callPackage ../development/libraries/console-bridge { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; @@ -2859,6 +2975,8 @@ in dclxvi = callPackage ../development/libraries/dclxvi { }; + dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; + dcraw = callPackage ../tools/graphics/dcraw { }; dcfldd = callPackage ../tools/system/dcfldd { }; @@ -2887,6 +3005,8 @@ in ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; + ddcutil = callPackage ../tools/misc/ddcutil { }; ddclient = callPackage ../tools/networking/ddclient { }; @@ -3019,6 +3139,8 @@ in doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; + slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; }; @@ -3129,6 +3251,10 @@ in mcrcon = callPackage ../tools/networking/mcrcon {}; + mozwire = callPackage ../tools/networking/mozwire { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3179,8 +3305,12 @@ in vorta = python3Packages.callPackage ../applications/backup/vorta { }; + utahfs = callPackage ../applications/networking/utahfs { }; + wallutils = callPackage ../tools/graphics/wallutils { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + wev = callPackage ../tools/misc/wev { }; wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; @@ -3384,7 +3514,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; @@ -3400,6 +3530,8 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -3566,7 +3698,13 @@ in fprintd = callPackage ../tools/security/fprintd { }; - franz = callPackage ../applications/networking/instant-messengers/franz { }; + ferdi = callPackage ../applications/networking/instant-messengers/ferdi { + mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; + }; + + franz = callPackage ../applications/networking/instant-messengers/franz { + mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; + }; freedroidrpg = callPackage ../games/freedroidrpg { }; @@ -3580,6 +3718,10 @@ in freetds = callPackage ../development/libraries/freetds { }; + freqtweak = callPackage ../applications/audio/freqtweak { + wxGTK = wxGTK31-gtk2; + }; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; frostwire = callPackage ../applications/networking/p2p/frostwire { }; @@ -3622,6 +3764,8 @@ in fusee-launcher = callPackage ../development/tools/fusee-launcher { }; + fverb = callPackage ../applications/audio/fverb { }; + fwknop = callPackage ../tools/security/fwknop { }; exfat = callPackage ../tools/filesystems/exfat { }; @@ -3678,6 +3822,8 @@ in genimage = callPackage ../tools/filesystems/genimage { }; + geonkick = callPackage ../applications/audio/geonkick {}; + gerrit = callPackage ../applications/version-management/gerrit { }; geteltorito = callPackage ../tools/misc/geteltorito { }; @@ -3798,10 +3944,6 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; 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; - }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; @@ -3835,6 +3977,10 @@ in gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; godot = callPackage ../development/tools/godot {}; + + godot-headless = callPackage ../development/tools/godot/headless.nix { }; + + godot-server = callPackage ../development/tools/godot/server.nix { }; goklp = callPackage ../tools/networking/goklp {}; @@ -3870,6 +4016,8 @@ in google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gdown = with python3Packages; toPythonApplication gdown; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -4097,6 +4245,8 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; + hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + half = callPackage ../development/libraries/half { }; halibut = callPackage ../tools/typesetting/halibut { }; @@ -4297,6 +4447,8 @@ in packages = config.ihaskell.packages or (self: []); }; + iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; + imapproxy = callPackage ../tools/networking/imapproxy { openssl = openssl_1_0_2; }; @@ -4313,8 +4465,12 @@ in incron = callPackage ../tools/system/incron { }; + industrializer = callPackage ../applications/audio/industrializer { }; + inetutils = callPackage ../tools/networking/inetutils { }; + inform6 = callPackage ../development/compilers/inform6 { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -4359,7 +4515,9 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo114Module; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -4521,6 +4679,10 @@ in kbdd = callPackage ../applications/window-managers/kbdd { }; + kbs2 = callPackage ../tools/security/kbs2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; @@ -4674,6 +4836,8 @@ in lolcat = callPackage ../tools/misc/lolcat { }; + lottieconverter = callPackage ../tools/misc/lottieconverter { }; + lsd = callPackage ../tools/misc/lsd { }; lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; @@ -4700,6 +4864,10 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + martin = callPackage ../servers/martin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + /* 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;*/ }; @@ -4714,9 +4882,7 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mcfly = callPackage ../tools/misc/mcfly { }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -4844,10 +5010,6 @@ in nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; }; - nodejs-13_x = callPackage ../development/web/nodejs/v13.nix { }; - nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { - enableNpm = false; - }; nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false; @@ -5021,6 +5183,8 @@ in libwebsockets_4_0; libwebsockets = libwebsockets_3_2; + licensee = callPackage ../tools/package-management/licensee { }; + lidarr = callPackage ../servers/lidarr { }; limesuite = callPackage ../applications/radio/limesuite { }; @@ -5041,6 +5205,8 @@ in logstalgia = callPackage ../tools/graphics/logstalgia {}; + lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; + loki = callPackage ../development/libraries/loki { }; longview = callPackage ../servers/monitoring/longview { }; @@ -5095,8 +5261,15 @@ in mailhog = callPackage ../servers/mail/mailhog {}; mailnag = callPackage ../applications/networking/mailreaders/mailnag { - pythonPackages = python2Packages; + availablePlugins = { + # More are listed here: https://github.com/pulb/mailnag/#desktop-integration + # Use the attributes here as arguments to `plugins` list + goa = callPackage ../applications/networking/mailreaders/mailnag/goa-plugin.nix { }; + }; }; + mailnagWithPlugins = mailnag.withPlugins( + builtins.attrValues mailnag.availablePlugins + ); mailsend = callPackage ../tools/networking/mailsend { }; @@ -5236,6 +5409,8 @@ in pythonPackages = python3Packages; }; + mirakurun = nodePackages.mirakurun; + miredo = callPackage ../tools/networking/miredo { }; mirrorbits = callPackage ../servers/mirrorbits { }; @@ -5274,6 +5449,8 @@ in molly-guard = callPackage ../os-specific/linux/molly-guard { }; + molotov = callPackage ../applications/video/molotov {}; + moneyplex = callPackage ../applications/office/moneyplex { }; monit = callPackage ../tools/system/monit { }; @@ -5344,6 +5521,8 @@ in mycli = callPackage ../tools/admin/mycli { }; + mycrypto = callPackage ../applications/blockchains/mycrypto { }; + mydumper = callPackage ../tools/backup/mydumper { }; mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; @@ -5362,6 +5541,8 @@ in nat-traverse = callPackage ../tools/networking/nat-traverse { }; + navi = callPackage ../applications/misc/navi { }; + navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; nawk = callPackage ../tools/text/nawk { }; @@ -5466,7 +5647,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18; + nextcloud17 nextcloud18 nextcloud19; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -5474,8 +5655,12 @@ in ndstool = callPackage ../tools/archivers/ndstool { }; + nfs-ganesha = callPackage ../servers/nfs-ganesha { }; + ngrep = callPackage ../tools/networking/ngrep { }; + neuron-notes = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); + ngrok = ngrok-2; ngrok-2 = callPackage ../tools/networking/ngrok-2 { }; @@ -5486,10 +5671,14 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = nomad_0_11; + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; notable = callPackage ../applications/misc/notable { }; + nvchecker = with python3Packages; toPythonApplication nvchecker; + miller = callPackage ../tools/text/miller { }; milu = callPackage ../applications/misc/milu { }; @@ -5504,6 +5693,8 @@ in pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + pasystray = callPackage ../tools/audio/pasystray { }; phash = callPackage ../development/libraries/phash { }; @@ -5522,6 +5713,8 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nimmm = callPackage ../applications/misc/nimmm { }; + nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -5551,6 +5744,8 @@ in noise-repellent = callPackage ../applications/audio/noise-repellent { }; + noisetorch = callPackage ../applications/audio/noisetorch { }; + notary = callPackage ../tools/security/notary { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5574,6 +5769,8 @@ in ntfy = callPackage ../tools/misc/ntfy {}; + ntirpc = callPackage ../development/libraries/ntirpc { }; + ntopng = callPackage ../tools/networking/ntopng { }; ntp = callPackage ../tools/networking/ntp { @@ -5590,6 +5787,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { }; + nyancat = callPackage ../tools/misc/nyancat { }; nylon = callPackage ../tools/networking/nylon { }; @@ -5681,6 +5880,8 @@ in openjade = callPackage ../tools/text/sgml/openjade { }; + openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; + openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; openmvg = callPackage ../applications/science/misc/openmvg { }; @@ -5698,6 +5899,8 @@ in openresolv = callPackage ../tools/networking/openresolv { }; + openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; @@ -5713,9 +5916,6 @@ in openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; - # the hpn patchset does not yet support openssl>1.0.2 - # https://github.com/rapier1/openssh-portable/issues/14 - openssl = openssl_1_0_2; }); openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { @@ -5742,6 +5942,8 @@ in oppai-ng = callPackage ../tools/misc/oppai-ng { }; + operator-sdk = callPackage ../development/tools/operator-sdk { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; @@ -5772,6 +5974,8 @@ in osl = callPackage ../development/compilers/osl { }; + osqp = callPackage ../development/libraries/science/math/osqp { }; + ossec = callPackage ../tools/security/ossec {}; osslsigncode = callPackage ../development/tools/osslsigncode {}; @@ -5854,9 +6058,13 @@ in perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + percona-xtrabackup = percona-xtrabackup_8_0; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { boost = boost159; }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { + boost = boost170; + }; pick = callPackage ../tools/misc/pick { }; @@ -5932,9 +6140,7 @@ in brickd = callPackage ../servers/brickd { }; - bully = callPackage ../tools/networking/bully { - openssl = openssl_1_0_2; - }; + bully = callPackage ../tools/networking/bully { }; pcapc = callPackage ../tools/networking/pcapc { }; @@ -5986,6 +6192,8 @@ in pirate-get = callPackage ../tools/networking/pirate-get { }; + pipr = callPackage ../applications/misc/pipr { }; + pipreqs = callPackage ../tools/misc/pipreqs { }; pius = callPackage ../tools/security/pius { }; @@ -6046,7 +6254,10 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = if stdenv.isDarwin then + callPackage ../applications/virtualization/podman { } + else + callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -6118,6 +6329,8 @@ in pmacct = callPackage ../tools/networking/pmacct { }; + pmix = callPackage ../development/libraries/pmix { }; + polygraph = callPackage ../tools/networking/polygraph { }; progress = callPackage ../tools/misc/progress { }; @@ -6192,7 +6405,7 @@ in qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; qnial = callPackage ../development/interpreters/qnial { }; @@ -6214,6 +6427,8 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -6276,6 +6491,9 @@ in rdma-core = callPackage ../os-specific/linux/rdma-core { }; + + real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; + react-native-debugger = callPackage ../development/tools/react-native-debugger { }; read-edid = callPackage ../os-specific/linux/read-edid { }; @@ -6316,6 +6534,8 @@ in recoll = callPackage ../applications/search/recoll { }; + redoc-cli = nodePackages.redoc-cli; + reflex = callPackage ../development/tools/reflex { }; reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; @@ -6377,6 +6597,8 @@ in rnnoise = callPackage ../development/libraries/rnnoise { }; + rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnv = callPackage ../tools/text/xml/rnv { }; rosie = callPackage ../tools/text/rosie { }; @@ -6531,7 +6753,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { }; + screenkey = callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; @@ -6549,6 +6771,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; + sdate = callPackage ../tools/misc/sdate { }; sdcv = callPackage ../applications/misc/sdcv { }; @@ -6597,6 +6821,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; + sharutils = callPackage ../tools/archivers/sharutils { }; shelldap = callPackage ../tools/misc/shelldap { }; @@ -6688,6 +6914,8 @@ in conf = config.slstatus.conf or null; }; + sm64ex = callPackage ../games/sm64ex { }; + smartdns = callPackage ../tools/networking/smartdns { }; smartmontools = callPackage ../tools/system/smartmontools { @@ -6727,6 +6955,8 @@ in sshping = callPackage ../tools/networking/sshping {}; + ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + suricata = callPackage ../applications/networking/ids/suricata { python = python3; }; @@ -6756,18 +6986,20 @@ in spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; + spigot = callPackage ../tools/misc/spigot { }; + spiped = callPackage ../tools/networking/spiped { }; sqliteman = callPackage ../applications/misc/sqliteman { }; stdman = callPackage ../data/documentation/stdman { }; + steck = callPackage ../servers/pinnwand/steck.nix { }; + stenc = callPackage ../tools/backup/stenc { }; stm32loader = with python3Packages; toPythonApplication stm32loader; - storebrowse = callPackage ../tools/system/storebrowse { }; - stubby = callPackage ../tools/networking/stubby { }; syntex = callPackage ../tools/graphics/syntex {}; @@ -6791,6 +7023,8 @@ in speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; + splot = haskell.lib.justStaticExecutables haskellPackages.splot; + squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; @@ -6840,8 +7074,6 @@ in supertux-editor = callPackage ../applications/editors/supertux-editor { }; - super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; @@ -7041,6 +7273,8 @@ in timetable = callPackage ../applications/office/timetable { }; + timezonemap = callPackage ../development/libraries/timezonemap { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; tinc = callPackage ../tools/networking/tinc { }; @@ -7053,6 +7287,8 @@ in tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinycbor = callPackage ../development/libraries/tinycbor { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -7101,12 +7337,7 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; - tor = callPackage ../tools/security/tor { - # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. - libevent = libevent.override { - sslSupport = false; - }; - }; + tor = callPackage ../tools/security/tor { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; @@ -7183,7 +7414,7 @@ in tryton = callPackage ../applications/office/tryton { }; - trytond = callPackage ../applications/office/trytond { }; + trytond = with python3Packages; toPythonApplication trytond; omapd = callPackage ../tools/security/omapd { }; @@ -7258,6 +7489,8 @@ in uget-integrator = callPackage ../tools/networking/uget-integrator { }; + ugrep = callPackage ../tools/text/ugrep { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; @@ -7276,6 +7509,8 @@ in untrunc = callPackage ../tools/video/untrunc { }; + untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + up = callPackage ../tools/misc/up { }; upx = callPackage ../tools/compression/upx { }; @@ -7284,6 +7519,10 @@ in uqmi = callPackage ../tools/networking/uqmi { }; + urdfdom = callPackage ../development/libraries/urdfdom {}; + + urdfdom-headers = callPackage ../development/libraries/urdfdom-headers {}; + uriparser = callPackage ../development/libraries/uriparser {}; urlscan = callPackage ../applications/misc/urlscan { }; @@ -7326,10 +7565,14 @@ in vcstool = callPackage ../development/tools/vcstool { }; + vend = callPackage ../development/tools/vend { }; + verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog {}; + vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; + video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; @@ -7461,7 +7704,11 @@ in woof = callPackage ../tools/misc/woof { }; - wootility = callPackage ../tools/misc/wootility { }; + wootility = callPackage ../tools/misc/wootility { + inherit (xorg) libxkbfile; + }; + + wormhole-william = callPackage ../tools/networking/wormhole-william { }; wpscan = callPackage ../tools/security/wpscan { }; @@ -7679,10 +7926,14 @@ in libpsl = null; }; + wg-bond = callPackage ../applications/networking/wg-bond { }; + which = callPackage ../tools/system/which { }; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wiiuse = callPackage ../development/libraries/wiiuse { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -7735,6 +7986,8 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; + x3270 = callPackage ../applications/misc/x3270 { }; + xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -7792,9 +8045,7 @@ in libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { - xset = xorg.xset; - }; + xsecurelock = callPackage ../tools/X11/xsecurelock { }; xsel = callPackage ../tools/misc/xsel { }; @@ -7835,6 +8086,8 @@ in yank = callPackage ../tools/misc/yank { }; + yamllint = with python3Packages; toPythonApplication yamllint; + yaml-merge = callPackage ../tools/text/yaml-merge { }; yeshup = callPackage ../tools/system/yeshup { }; @@ -7843,6 +8096,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + ytree = callPackage ../tools/misc/ytree { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. @@ -7927,8 +8182,8 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = cmake.override { - libarchive = libarchive.override { zstd = null; }; + cmake = buildPackages.cmake.override { + libarchive = buildPackages.libarchive.override { zstd = null; }; }; }; @@ -8011,6 +8266,7 @@ in grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; + powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS @@ -8180,13 +8436,14 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert { }; + compcert = callPackage ../development/compilers/compcert { + inherit (coqPackages_8_10) coq; + }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ - libstdcxxHook llvmPackages.compiler-rt ]; extraBuildCommands = '' @@ -8199,13 +8456,11 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && cc ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${cc.gcc}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; - inherit (callPackages ../development/compilers/crystal { inherit (llvmPackages_10) stdenv clang llvm; }) @@ -8266,8 +8521,12 @@ in gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries - 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; + gccFun = callPackage (if (with stdenv.targetPlatform; isVc4 || libc == "relibc") + then ../development/compilers/gcc/6 + else ../development/compilers/gcc/9); + gcc = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") + then gcc6 else gcc9; + gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -8328,14 +8587,6 @@ in stripped = false; })); - libstdcxxHook = makeSetupHook - { substitutions = { - gcc = gcc-unwrapped; - targetConfig = stdenv.targetPlatform.config; - }; - } - ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc @@ -8410,7 +8661,11 @@ in 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; + isl = if stdenv.isDarwin + then null + else if stdenv.targetPlatform.isRedox + then isl_0_17 + else isl_0_14; })); gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 { @@ -8465,6 +8720,8 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc_latest = gcc10; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8632,7 +8889,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc883; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc884; inherit (haskellPackages) ghc; @@ -8724,21 +8981,21 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ + go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ + go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go = go_1_14; + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -8908,6 +9165,10 @@ in inherit installjdk pluginSupport; }); + oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; + + oraclejdk14 = callPackage ../development/compilers/oraclejdk/jdk14-linux.nix { }; + jasmin = callPackage ../development/compilers/jasmin { }; java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; @@ -8979,58 +9240,46 @@ in llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ + llvmPackages_5 = callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ + llvmPackages_6 = callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - # with gcc-7 on i686: undefined reference to `__divmoddi4' - # Failing tests with gcc8. - stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7); - }); + }; - llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ + llvmPackages_7 = callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({ + llvmPackages_8 = callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({ + llvmPackages_9 = callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_10 = callPackage ../development/compilers/llvm/10 ({ + llvmPackages_10 = callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc7Stdenv; - }); + }; llvmPackages_latest = llvmPackages_10; + llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; + lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -9057,6 +9306,8 @@ in mkcl = callPackage ../development/compilers/mkcl {}; + mlkit = callPackage ../development/compilers/mlkit {}; + inherit (callPackage ../development/compilers/mlton {}) mlton20130715 mlton20180207Binary @@ -9088,7 +9339,9 @@ in mosml = callPackage ../development/compilers/mosml { }; - mozart2 = callPackage ../development/compilers/mozart { }; + mozart2 = callPackage ../development/compilers/mozart { + emacs = emacs-nox; + }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -9161,21 +9414,51 @@ in rgbds = callPackage ../development/compilers/rgbds { }; + rocclr = callPackage ../development/libraries/rocclr { + inherit (llvmPackages_rocm) clang; + }; + + rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; + + rocm-comgr = callPackage ../development/libraries/rocm-comgr { + inherit (llvmPackages_rocm) clang lld llvm; + device-libs = rocm-device-libs; + }; + + rocm-device-libs = callPackage ../development/libraries/rocm-device-libs { + inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + }; + + rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { }; + + rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { + inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + }; + + rocm-runtime = callPackage ../development/libraries/rocm-runtime { + inherit (llvmPackages_rocm) clang-unwrapped llvm; + }; + + # Python >= 3.8 still gives a bunch of warnings. + rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; + + rocm-thunk = callPackage ../development/libraries/rocm-thunk { }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; - rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { + rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_43 = callPackage ../development/compilers/rust/1_43.nix { + rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_43; + rust = rust_1_45; - rustPackages_1_42 = rust_1_42.packages.stable; - rustPackages_1_43 = rust_1_43.packages.stable; - rustPackages = rustPackages_1_43; + rustPackages_1_44 = rust_1_44.packages.stable; + rustPackages_1_45 = rust_1_45.packages.stable; + rustPackages = rustPackages_1_45; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; @@ -9202,6 +9485,9 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-c = callPackage ../development/tools/rust/cargo-c { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9215,13 +9501,17 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; - cargo-tree = callPackage ../tools/package-management/cargo-tree { }; - cargo-update = callPackage ../tools/package-management/cargo-update { }; + cargo-update = callPackage ../tools/package-management/cargo-update { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; + cargo-cache = callPackage ../development/tools/rust/cargo-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9229,6 +9519,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-fund = callPackage ../development/tools/rust/cargo-fund { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { inherit (darwin) libiconv; @@ -9239,7 +9532,7 @@ in }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-make = callPackage ../development/tools/rust/cargo-make { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; @@ -9287,6 +9580,8 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + scas = callPackage ../development/compilers/scas { }; + metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; @@ -9392,6 +9687,10 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , # libc++ from the default LLVM version is bound at the top level, but we + # want the C++ library to be explicitly chosen by the caller, and null by + # default. + libcxx ? null , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: @@ -9404,7 +9703,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages zlib; + inherit cc bintools libc libcxx extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -9445,6 +9744,7 @@ in ### DEVELOPMENT / INTERPRETERS acl2 = callPackage ../development/interpreters/acl2 { }; + acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; angelscript = callPackage ../development/interpreters/angelscript {}; @@ -9475,6 +9775,8 @@ in dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; dhallPackages = callPackages ./dhall-packages.nix { }; @@ -9488,7 +9790,7 @@ in beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 + erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; @@ -9539,7 +9841,7 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; lumo = callPackage ../development/interpreters/clojurescript/lumo { - nodejs = nodejs-13_x; + nodejs = nodejs_latest; }; lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; @@ -9605,13 +9907,6 @@ in me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; - mesos = callPackage ../applications/networking/cluster/mesos { - sasl = cyrus_sasl; - inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; }; - perf = linuxPackages.perf; - }; - mesos-dns = callPackage ../servers/mesos-dns { }; metamath = callPackage ../development/interpreters/metamath { }; @@ -9644,18 +9939,16 @@ in php = php74; phpPackages = php74Packages; - php72Packages = recurseIntoAttrs php72.packages; php73Packages = recurseIntoAttrs php73.packages; php74Packages = recurseIntoAttrs php74.packages; phpExtensions = php74Extensions; - php72Extensions = recurseIntoAttrs php72.extensions; php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72; + }) php74 php73; picoc = callPackage ../development/interpreters/picoc {}; @@ -9682,15 +9975,43 @@ in # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override{x11Support=true;}; - python2Full = python2.override{x11Support=true;}; - python27Full = python27.override{x11Support=true;}; - python3Full = python3.override{x11Support=true;}; - python35Full = python35.override{x11Support=true;}; - python36Full = python36.override{x11Support=true;}; - python37Full = python37.override{x11Support=true;}; - python38Full = python38.override{x11Support=true;}; - python39Full = python39.override{x11Support=true;}; + pythonFull = python.override { + self = pythonFull; + x11Support = true; + }; + python2Full = python2.override { + self = python2Full; + x11Support = true; + }; + python27Full = python27.override { + self = python27Full; + x11Support = true; + }; + python3Full = python3.override { + self = python3Full; + bluezSupport = true; + x11Support = true; + }; + python36Full = python36.override { + self = python36Full; + bluezSupport = true; + x11Support = true; + }; + python37Full = python37.override { + self = python37Full; + bluezSupport = true; + x11Support = true; + }; + python38Full = python38.override { + self = python38Full; + bluezSupport = true; + x11Support = true; + }; + python39Full = python39.override { + self = python39Full; + bluezSupport = true; + x11Support = true; + }; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -9698,11 +10019,10 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; @@ -9802,7 +10122,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; - bison = bison_3_5; + bison = buildPackages.bison_3_5; }) ruby_2_5 ruby_2_6 @@ -9975,9 +10295,9 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_7 ansible_2_8 - ansible_2_9; + ansible_2_9 + ansible_2_10; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; @@ -10022,7 +10342,7 @@ in inherit (callPackages ../development/tools/electron { }) electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - electron = electron_4; + electron = electron_9; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -10105,8 +10425,12 @@ in bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; + bazel-kazel = callPackage ../development/tools/bazel-kazel { }; + bazelisk = callPackage ../development/tools/bazelisk { }; + rebazel = callPackage ../development/tools/rebazel { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -10174,6 +10498,8 @@ in cbrowser = callPackage ../development/tools/misc/cbrowser { }; + cc-tool = callPackage ../development/tools/misc/cc-tool { }; + ccache = callPackage ../development/tools/misc/ccache { }; # Wrapper that works as gcc or g++ @@ -10229,6 +10555,8 @@ in cloud-nuke = callPackage ../development/tools/cloud-nuke { }; + cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; @@ -10264,7 +10592,9 @@ in cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { }; + cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { + inherit (pkgs) cmake; + }; # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; @@ -10313,6 +10643,17 @@ in stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems }; + # This is for e.g. LLVM libraries on linux. + gccForLibs = + # with gcc-7: undefined reference to `__divmoddi4' + if stdenv.targetPlatform.isi686 + then gcc6.cc + else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU + # Can only do this is in the native case, otherwise we might get infinite + # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. + then targetPackages.stdenv.cc.cc + else gcc.cc; + libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -10407,12 +10748,16 @@ in drush = callPackage ../development/tools/misc/drush { }; + easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; eggdbus = callPackage ../development/tools/misc/eggdbus { }; + effitask = callPackage ../applications/misc/effitask { }; + egypt = callPackage ../development/tools/analysis/egypt { }; elfinfo = callPackage ../development/tools/misc/elfinfo { }; @@ -10421,6 +10766,8 @@ in elfutils = callPackage ../development/tools/misc/elfutils { }; + eliot-tree = callPackage ../development/tools/eliot-tree { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; @@ -10465,6 +10812,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fujprog = callPackage ../development/tools/misc/fujprog { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -10515,8 +10864,8 @@ in gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; + gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -10539,6 +10888,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; + gradle_6 = res.gradleGen.gradle_6_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -10597,7 +10947,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_8; + llvmPackages = llvmPackages_10; }; indent = callPackage ../development/tools/misc/indent { }; @@ -10656,6 +11006,8 @@ in kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubespy = callPackage ../applications/networking/cluster/kubespy { }; + kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { @@ -10732,8 +11084,14 @@ in mkcert = callPackage ../development/tools/misc/mkcert { }; + mkrom = callPackage ../development/tools/misc/mkrom { + asciidoc = asciidoc-full; + }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mockgen = callPackage ../development/tools/mockgen { }; + modd = callPackage ../development/tools/modd { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -10815,6 +11173,7 @@ in parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); @@ -10912,6 +11271,8 @@ in redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-c = callPackage ../development/tools/build-managers/redo-c { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; @@ -10920,6 +11281,8 @@ in remake = callPackage ../development/tools/build-managers/remake { }; + replacement = callPackage ../development/tools/misc/replacement { }; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; @@ -11046,6 +11409,8 @@ in strace = callPackage ../development/tools/misc/strace { }; + summon = callPackage ../development/tools/summon { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; @@ -11195,6 +11560,8 @@ in xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + xxe-pe = callPackage ../applications/editors/xxe-pe { }; + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; @@ -11202,12 +11569,15 @@ in ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; + # currently broken + rustracerd = null; }; yodl = callPackage ../development/tools/misc/yodl { }; yq = callPackage ../development/tools/yq { - inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; + inherit (python3Packages) + buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; }; yq-go = callPackage ../development/tools/yq-go { }; @@ -11252,6 +11622,10 @@ in allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + amdvlk = callPackage ../development/libraries/amdvlk {}; + + aml = callPackage ../development/libraries/aml { }; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; @@ -11291,9 +11665,8 @@ in assimp = callPackage ../development/libraries/assimp { }; - asio = asio_1_12; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio_1_12 = callPackage ../development/libraries/asio/1.12.nix { }; + asio = callPackage ../development/libraries/asio/default.nix { }; aspell = callPackage ../development/libraries/aspell { }; @@ -11329,6 +11702,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; + ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -11412,6 +11787,8 @@ in # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; + niv = haskellPackages.niv.bin; ormolu = haskellPackages.ormolu.bin; @@ -11444,7 +11821,13 @@ in ogre = ogre1_10; }; - certbot = python3Packages.callPackage ../tools/admin/certbot { }; + certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot; + + certbot-full = certbot.withPlugins (cp: with cp; [ + certbot-dns-cloudflare + certbot-dns-rfc2136 + certbot-dns-route53 + ]); caf = callPackage ../development/libraries/caf {}; @@ -11631,6 +12014,8 @@ in dotconf = callPackage ../development/libraries/dotconf { }; + draco = callPackage ../development/libraries/draco { }; + # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) @@ -11803,12 +12188,8 @@ in cfitsio = callPackage ../development/libraries/cfitsio { }; - fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { }; - fontconfig = callPackage ../development/libraries/fontconfig { }; - fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; - folly = callPackage ../development/libraries/folly { }; folks = callPackage ../development/libraries/folks { }; @@ -11896,6 +12277,7 @@ in gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { + automake = automake115x; libtiff = null; libXpm = null; }; @@ -11997,6 +12379,7 @@ in else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc + else if name == "relibc" then targetPackages.relibc or relibc else if stdenv.targetPlatform.isGhcjs then null else throw "Unknown libc ${name}"; @@ -12011,6 +12394,8 @@ in stdenv = crossLibcStdenv; }; + relibc = callPackage ../development/libraries/relibc { }; + # Only supported on Linux, using glibc glibcLocales = if stdenv.hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null; @@ -12079,7 +12464,9 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { }; + grab-site = callPackage ../tools/backup/grab-site { + python3Packages = python37Packages; + }; grib-api = callPackage ../development/libraries/grib-api { }; @@ -12431,7 +12818,7 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - icu = icu64; + icu = icu67; id3lib = callPackage ../development/libraries/id3lib { }; @@ -12456,6 +12843,8 @@ in imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; + impy = callPackage ../development/libraries/impy { }; + ineffassign = callPackage ../development/tools/ineffassign { }; ijs = callPackage ../development/libraries/ijs { }; @@ -12495,7 +12884,9 @@ in isso = callPackage ../servers/isso { }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; itk = callPackage ../development/libraries/itk { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -12584,6 +12975,7 @@ in lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; + LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; lcms = lcms1; @@ -12647,6 +13039,10 @@ in libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libappindicator = callPackage ../development/libraries/libappindicator { }; + libayatana-appindicator-gtk2 = libayatana-appindicator.override { gtkVersion = "2"; }; + libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; + libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libarchive = callPackage ../development/libraries/libarchive { }; libasr = callPackage ../development/libraries/libasr { }; @@ -12832,7 +13228,9 @@ in libGL = null; }; - libdigidoc = callPackage ../development/libraries/libdigidoc { }; + libdigidoc = callPackage ../development/libraries/libdigidoc { + inherit (darwin.apple_sdk.frameworks) Security; + }; libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; @@ -12869,6 +13267,8 @@ in inherit (callPackage ../development/libraries/libdwarf { }) libdwarf dwarfdump; + libe57format = callPackage ../development/libraries/libe57format { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; libeb = callPackage ../development/libraries/libeb { }; @@ -12895,7 +13295,9 @@ in libfido2 = callPackage ../development/libraries/libfido2 { }; - libfilezilla = callPackage ../development/libraries/libfilezilla { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; libfishsound = callPackage ../development/libraries/libfishsound { }; @@ -13063,6 +13465,8 @@ in libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; + libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libHX = callPackage ../development/libraries/libHX { }; libibmad = callPackage ../development/libraries/libibmad { }; @@ -13081,6 +13485,10 @@ in libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libayatana-indicator-gtk2 = libayatana-indicator.override { gtkVersion = "2"; }; + libayatana-indicator-gtk3 = libayatana-indicator.override { gtkVersion = "3"; }; + libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { @@ -13144,6 +13552,9 @@ in libplist = callPackage ../development/libraries/libplist { }; libre = callPackage ../development/libraries/libre {}; + + libredwg = callPackage ../development/libraries/libredwg {}; + librem = callPackage ../development/libraries/librem {}; librelp = callPackage ../development/libraries/librelp { }; @@ -13415,6 +13826,10 @@ in libpqxx = callPackage ../development/libraries/libpqxx { }; + inherit (callPackages ../development/libraries/prometheus-client-c { + stdenv = gccStdenv; # Required for darwin + }) libprom libpromhttp; + libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; @@ -13583,7 +13998,7 @@ in libva = callPackage ../development/libraries/libva { }; libva-minimal = libva.override { minimal = true; }; - libva-utils = callPackage ../development/libraries/libva-utils { }; + libva-utils = callPackage ../development/libraries/libva/utils.nix { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; libva1-minimal = libva1.override { minimal = true; }; @@ -13687,6 +14102,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + rang = callPackage ../development/libraries/rang { }; + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; @@ -13944,6 +14361,7 @@ in }; nss = lowPrio (callPackage ../development/libraries/nss { }); + nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { }); nssTools = nss.tools; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; @@ -14048,6 +14466,8 @@ in opencolorio = callPackage ../development/libraries/opencolorio { }; + opendmarc = callPackage ../development/libraries/opendmarc { }; + ois = callPackage ../development/libraries/ois {}; openh264 = callPackage ../development/libraries/openh264 { }; @@ -14131,6 +14551,8 @@ in pcre2 = callPackage ../development/libraries/pcre2 { }; + pdal = callPackage ../development/libraries/pdal { } ; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; inherit (callPackage ../development/libraries/physfs { }) @@ -14207,7 +14629,7 @@ in python = python37; }; - protobuf = protobuf3_8; + protobuf = protobuf3_12; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; @@ -14308,9 +14730,26 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - # TODO bump to 5.12 on darwin once it's not broken - qt5 = qt512; - libsForQt5 = libsForQt512; + qt514 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.14) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + + # TODO bump to 5.14 on darwin once it's not broken; see #95199 + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt514; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt514; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -14357,6 +14796,8 @@ in kdiagram = callPackage ../development/libraries/kdiagram { }; + kdsoap = callPackage ../development/libraries/kdsoap { }; + kproperty = callPackage ../development/libraries/kproperty { }; kreport = callPackage ../development/libraries/kreport { }; @@ -14530,6 +14971,8 @@ in randomx = callPackage ../development/libraries/randomx { }; + redkite = callPackage ../development/libraries/redkite { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -14539,6 +14982,8 @@ in rlog = callPackage ../development/libraries/rlog { }; + rlottie = callPackage ../development/libraries/rlottie { }; + rocksdb = callPackage ../development/libraries/rocksdb { }; rocksdb_lite = rocksdb.override { enableLite = true; }; @@ -14555,7 +15000,13 @@ in rubberband = callPackage ../development/libraries/rubberband { }; + /* This package references ghc844, which we no longer have. Unfortunately, I + have been unable to mark it as "broken" in a way that the ofBorg bot + recognizes. Since I don't want to merge code into master that generates + evaluation errors, I have no other idea but to comment it out entirely. + sad = callPackage ../applications/science/logic/sad { }; + */ safefile = callPackage ../development/libraries/safefile {}; @@ -14640,7 +15091,6 @@ in simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; - stdenv = gcc8Stdenv; }; sfml = callPackage ../development/libraries/sfml { @@ -14835,6 +15285,7 @@ in stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; + streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; @@ -14919,8 +15370,6 @@ in telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; - termbox = callPackage ../development/libraries/termbox { }; tevent = callPackage ../development/libraries/tevent { }; @@ -15090,6 +15539,14 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; + vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; @@ -15302,6 +15759,8 @@ in yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; + yubikey-agent = callPackage ../tools/security/yubikey-agent { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -15312,7 +15771,6 @@ in zlog = callPackage ../development/libraries/zlog { }; - zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; @@ -15392,8 +15850,6 @@ in junixsocket = callPackage ../development/libraries/java/junixsocket { }; - jzmq = callPackage ../development/libraries/java/jzmq { }; - lombok = callPackage ../development/libraries/java/lombok { }; lucene = callPackage ../development/libraries/java/lucene { }; @@ -15427,23 +15883,23 @@ in ### DEVELOPMENT / GO MODULES - buildGo113Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_13; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; + buildGo115Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_15; + }; - buildGoPackage = buildGo114Package; + buildGoPackage = buildGo115Package; - buildGo113Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_13; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; + buildGo115Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_15; + }; - buildGoModule = buildGo114Module; + buildGoModule = buildGo115Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -15648,7 +16104,7 @@ in clickhouse = callPackage ../servers/clickhouse { # clickhouse doesn't build on llvm8. - inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm; + inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -15759,9 +16215,13 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoModule = buildGo114Module; + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoPackage = buildGo114Package; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -15773,9 +16233,17 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; + /* This package duplicates a lot of functionality from haskellPackages + instead of using the packages we maintain there. Now, a recent update to + haskellPackages causes these tools to fail evaluation, and I have been + unable to mark them as "broken" in a way that ofBorg bot recognizes. Since + I don't want to merge code into master that generates evaluation errors, I + have no other idea but to comment them out entirely. + inherit (callPackage ../servers/hasura { }) hasura-cli hasura-graphql-engine; + */ heapster = callPackage ../servers/monitoring/heapster { }; @@ -15785,9 +16253,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { - python3 = python37; - }; + home-assistant = callPackage ../servers/home-assistant { }; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; @@ -15814,6 +16280,12 @@ in jetty = callPackage ../servers/http/jetty { }; + jicofo = callPackage ../servers/jicofo { }; + + jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; + + jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kapow = callPackage ../servers/kapow { }; keycloak = callPackage ../servers/keycloak { }; @@ -15847,8 +16319,6 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -15890,6 +16360,8 @@ in moodle = callPackage ../servers/web-apps/moodle { }; + moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { }; + morty = callPackage ../servers/web-apps/morty { }; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; @@ -15906,17 +16378,21 @@ in unit = callPackage ../servers/http/unit { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoPackage = buildGo114Package; + }; + nginx = nginxStable; nginxStable = callPackage ../servers/http/nginx/stable.nix { - perl = null; + withPerl = false; # 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; + withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; @@ -15946,7 +16422,9 @@ in openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; - openresty = callPackage ../servers/http/openresty { }; + openresty = callPackage ../servers/http/openresty { + withPerl = false; + }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; @@ -15957,6 +16435,8 @@ in osrm-backend = callPackage ../servers/osrm-backend { }; + oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; + p910nd = callPackage ../servers/p910nd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -16069,6 +16549,13 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + mongodb-4_2 = callPackage ../servers/nosql/mongodb/v4_2.nix { + sasl = cyrus_sasl; + boost = boost169; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + nginx-sso = callPackage ../servers/nginx-sso { }; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; @@ -16177,6 +16664,8 @@ in asciidoc = asciidoc-full; }; + timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { }; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; @@ -16195,7 +16684,10 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo114Package; + go = go_1_14; + }; 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 { }; @@ -16216,6 +16708,7 @@ in prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; + prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; 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 { }; @@ -16272,9 +16765,10 @@ in }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; - radicale2 = callPackage ../servers/radicale { }; + radicale2 = callPackage ../servers/radicale/2.x.nix { }; + radicale3 = callPackage ../servers/radicale/3.x.nix { }; - radicale = radicale2; + radicale = radicale3; rake = callPackage ../development/tools/build-managers/rake { }; @@ -16289,6 +16783,7 @@ in restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { + stdenv = clangStdenv; libtool = darwin.cctools; }; @@ -16417,6 +16912,8 @@ in tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { }; tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { }; + rss-bridge = callPackage ../servers/web-apps/rss-bridge { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; @@ -16438,6 +16935,8 @@ in unifiStable; unifi = unifiStable; + urserver = callPackage ../servers/urserver { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16513,11 +17012,11 @@ in server = server-pgsql; }; - zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix44; + zabbix = zabbix50; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -16628,6 +17127,8 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cm-rgb = python3Packages.callPackage ../tools/system/cm-rgb { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; cockroachdb = callPackage ../servers/sql/cockroachdb { }; @@ -16651,6 +17152,8 @@ in cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; + cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; crda = callPackage ../os-specific/linux/crda { }; @@ -16674,14 +17177,14 @@ in directvnc = callPackage ../os-specific/linux/directvnc { }; - dmraid = callPackage ../os-specific/linux/dmraid { - lvm2 = lvm2.override {enable_dmeventd = true;}; - }; + dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; }; drbd = callPackage ../os-specific/linux/drbd { }; dropwatch = callPackage ../os-specific/linux/dropwatch { }; + dsd = callPackage ../applications/radio/dsd { }; + dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release @@ -16692,6 +17195,8 @@ in fwts = callPackage ../os-specific/linux/fwts { }; + gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = if stdenv.isLinux @@ -16774,6 +17279,8 @@ in pcm = callPackage ../os-specific/linux/pcm { }; + ifmetric = callPackage ../os-specific/linux/ifmetric {}; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { openssl = openssl_1_0_2; }; @@ -16805,6 +17312,8 @@ in irqbalance = callPackage ../os-specific/linux/irqbalance { }; + itpp = callPackage ../development/libraries/science/math/itpp { }; + iw = callPackage ../os-specific/linux/iw { }; iwd = callPackage ../os-specific/linux/iwd { }; @@ -16978,14 +17487,6 @@ in ]; }; - linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17016,6 +17517,14 @@ in ]; }; + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -17128,6 +17637,8 @@ in rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; @@ -17189,6 +17700,8 @@ in x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; + xpadneo = callPackage ../os-specific/linux/xpadneo { }; + zenpower = callPackage ../os-specific/linux/zenpower { }; inherit (callPackages ../os-specific/linux/zfs { @@ -17221,7 +17734,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); # When adding to this list: @@ -17260,7 +17772,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest + linux_latest_for_hardened = pkgs.linux_5_7; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -17295,6 +17807,9 @@ in linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); linux_latest-libre = linux-libre.override { linux = linux_latest; }; + # zen-kernel + linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -17344,6 +17859,14 @@ in librealsense = callPackage ../development/libraries/librealsense { }; + librealsenseWithCuda = callPackage ../development/libraries/librealsense { + cudaSupport = true; + }; + + librealsenseWithoutCuda = callPackage ../development/libraries/librealsense { + cudaSupport = false; + }; + libsass = callPackage ../development/libraries/libsass { }; libsepol = callPackage ../os-specific/linux/libsepol { }; @@ -17377,6 +17900,12 @@ in lsscsi = callPackage ../os-specific/linux/lsscsi { }; lvm2 = callPackage ../os-specific/linux/lvm2 { }; + lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { + enableDmeventd = true; + enableCmdlib = true; + }; + + mbelib = callPackage ../development/libraries/audio/mbelib { }; mbpfan = callPackage ../os-specific/linux/mbpfan { }; @@ -17463,6 +17992,8 @@ in gotags = callPackage ../development/tools/gotags { }; + go-task = callPackage ../development/tools/go-task { }; + golint = callPackage ../development/tools/golint { }; golangci-lint = callPackage ../development/tools/golangci-lint { }; @@ -17485,6 +18016,8 @@ in gotop = callPackage ../tools/system/gotop { }; + go-migrate = callPackage ../development/tools/go-migrate { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -17535,6 +18068,8 @@ in pam_mount = callPackage ../os-specific/linux/pam_mount { }; + pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; + pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; @@ -17646,7 +18181,7 @@ in sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt512.callPackage ../applications/radio/sdrangel { }; sepolgen = callPackage ../os-specific/linux/sepolgen { }; @@ -17695,14 +18230,6 @@ in # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; - # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get - # LVM2 working in systemd. - systemd_with_lvm2 = pkgs.appendToName "with-lvm2" (pkgs.lib.overrideDerivation pkgs.systemd (p: { - postInstall = p.postInstall + '' - cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators - ''; - })); - systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; sysvinit = callPackage ../os-specific/linux/sysvinit { }; @@ -17844,6 +18371,8 @@ in ### DATA + _3270font = callPackage ../data/fonts/3270font { }; + adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; adapta-gtk-theme = callPackage ../data/themes/adapta { }; @@ -17860,10 +18389,16 @@ in albatross = callPackage ../data/themes/albatross { }; + alegreya = callPackage ../data/fonts/alegreya { }; + + alegreya-sans = callPackage ../data/fonts/alegreya-sans { }; + amber-theme = callPackage ../data/themes/amber { }; amiri = callPackage ../data/fonts/amiri { }; + anarchism = callPackage ../data/documentation/anarchism { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -17901,6 +18436,8 @@ in bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; + barlow = callPackage ../data/fonts/barlow { }; + bgnet = callPackage ../data/documentation/bgnet { }; bibata-cursors = callPackage ../data/icons/bibata-cursors { }; @@ -17927,7 +18464,7 @@ in cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cde-motif-theme { }; + cde-gtk-theme = callPackage ../data/themes/cdetheme { }; charis-sil = callPackage ../data/fonts/charis-sil { }; @@ -18030,6 +18567,14 @@ in eb-garamond = callPackage ../data/fonts/eb-garamond { }; + edukai = callPackage ../data/fonts/edukai { }; + + eduli = callPackage ../data/fonts/eduli { }; + + moeli = eduli; + + edusong = callPackage ../data/fonts/edusong { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; @@ -18143,10 +18688,7 @@ in inriafonts = callPackage ../data/fonts/inriafonts { }; - - iosevka = callPackage ../data/fonts/iosevka { - nodejs = nodejs-10_x; - }; + iosevka = callPackage ../data/fonts/iosevka {}; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; ipafont = callPackage ../data/fonts/ipafont {}; @@ -18172,6 +18714,8 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + kopia = callPackage ../tools/backup/kopia { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -18226,6 +18770,8 @@ in luculent = callPackage ../data/fonts/luculent { }; + luna-icons = callPackage ../data/icons/luna-icons { }; + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -18236,6 +18782,8 @@ in manrope = callPackage ../data/fonts/manrope { }; + marwaita = callPackage ../data/themes/marwaita { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18434,6 +18982,8 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + snap7 = callPackage ../development/libraries/snap7 {}; + snowblind = callPackage ../data/themes/snowblind { }; solarc-gtk-theme = callPackage ../data/themes/solarc { }; @@ -18722,6 +19272,8 @@ in amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility + amfora = callPackage ../applications/networking/browsers/amfora { }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; @@ -18729,7 +19281,9 @@ in amsn = callPackage ../applications/networking/instant-messengers/amsn { }; androidStudioPackages = recurseIntoAttrs - (callPackage ../applications/editors/android-studio { }); + (callPackage ../applications/editors/android-studio { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); android-studio = androidStudioPackages.stable; animbar = callPackage ../applications/graphics/animbar { }; @@ -18771,6 +19325,10 @@ in arora = callPackage ../applications/networking/browsers/arora { }; + asuka = callPackage ../applications/networking/browsers/asuka { + inherit (darwin.apple_sdk.frameworks) Security; + }; + artha = callPackage ../applications/misc/artha { }; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; @@ -18790,8 +19348,8 @@ in aucatctl = callPackage ../applications/audio/aucatctl { }; - audacious = callPackage ../applications/audio/audacious { }; - audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { }; + audacious = libsForQt5.callPackage ../applications/audio/audacious { }; + audaciousQt5 = audacious; audacity = callPackage ../applications/audio/audacity { }; @@ -18803,10 +19361,14 @@ in autotrace = callPackage ../applications/graphics/autotrace {}; + av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avocode = callPackage ../applications/graphics/avocode {}; azpainter = callPackage ../applications/graphics/azpainter { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + cadence = qt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -18873,10 +19435,14 @@ in batik = callPackage ../applications/graphics/batik { }; + batsignal = callPackage ../applications/misc/batsignal { }; + baudline = callPackage ../applications/audio/baudline { }; bb = callPackage ../applications/misc/bb { }; + bchoppr = callPackage ../applications/audio/bchoppr { }; + berry = callPackage ../applications/window-managers/berry { }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; @@ -18951,6 +19517,8 @@ in brave = callPackage ../applications/networking/browsers/brave { }; + break-time = callPackage ../applications/misc/break-time { }; + breezy = with python3Packages; toPythonApplication breezy; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; @@ -18963,6 +19531,8 @@ in bjumblr = callPackage ../applications/audio/bjumblr { }; + bschaffl = callPackage ../applications/audio/bschaffl { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; @@ -19036,8 +19606,6 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { }; - chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -19050,8 +19618,6 @@ in chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); @@ -19089,6 +19655,8 @@ in cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { }; + clp = callPackage ../applications/science/math/clp { }; cmatrix = callPackage ../applications/misc/cmatrix { }; @@ -19134,6 +19702,8 @@ in codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + convos = callPackage ../applications/networking/irc/convos { }; + comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; @@ -19144,7 +19714,9 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + python3Packages = python37Packages; + }; cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; @@ -19224,7 +19796,7 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/misc/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { }; dirt = callPackage ../applications/audio/dirt {}; @@ -19283,8 +19855,6 @@ in dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; - draftsight = callPackage ../applications/graphics/draftsight { }; - dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; drawing = callPackage ../applications/graphics/drawing { }; @@ -19364,7 +19934,7 @@ in electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -19372,11 +19942,12 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs26; - emacsPackages = emacs26Packages; - emacs-nox = emacs26-nox; + emacs = emacs27; + emacsPackages = emacs27Packages; + emacs-nox = emacs27-nox; + emacsWithPackages = emacsPackages.emacsWithPackages; - emacs26 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19388,14 +19959,14 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { withX = false; withNS = false; withGTK2 = false; withGTK3 = false; })); - emacs25 = callPackage ../applications/editors/emacs/25.nix { + emacs26 = callPackage ../applications/editors/emacs/26.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19407,8 +19978,9 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { + emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { withX = false; + withNS = false; withGTK2 = false; withGTK3 = false; })); @@ -19444,12 +20016,10 @@ in }; }; - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - - emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacsWithPackages = emacsPackages.emacsWithPackages; + emacs27WithPackages = emacs27Packages.emacsWithPackages; inherit (gnome3) empathy; @@ -19496,6 +20066,8 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); + evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + exercism = callPackage ../applications/misc/exercism { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -19512,6 +20084,7 @@ in inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; + evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; keepass = callPackage ../applications/misc/keepass { }; @@ -19549,6 +20122,14 @@ in FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; + finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { + inherit (darwin.apple_sdk.frameworks) Security; + }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -19583,8 +20164,12 @@ in font-manager = callPackage ../applications/misc/font-manager { }; + fontpreview = callPackage ../applications/misc/fontpreview { }; + foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + foot = callPackage ../applications/misc/foot { }; + fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; @@ -19605,6 +20190,8 @@ in gcal = callPackage ../applications/misc/gcal { }; + gcstar = callPackage ../applications/misc/gcstar { }; + geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; @@ -19751,7 +20338,7 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = pkgs.newScope { - inherit (gnome2) libIDL; + inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; python = python2; gnused = gnused_422; @@ -19764,16 +20351,16 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; + firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox = wrapFirefox firefox-unwrapped { }; - firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; + firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; - firefox-esr = firefox-esr-68; + firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; + firefox-esr = firefox-esr-78; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19785,8 +20372,6 @@ in firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19798,8 +20383,6 @@ in firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -19837,7 +20420,11 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { + mpi = openmpi; + # pyside2 5.12 is broken under python 3.8 + python3Packages = python37Packages; + }; freemind = callPackage ../applications/misc/freemind { }; @@ -19863,6 +20450,8 @@ in fte = callPackage ../applications/editors/fte { }; + g933-utils = callPackage ../tools/misc/g933-utils { }; + game-music-emu = callPackage ../applications/audio/game-music-emu { }; gavrasm = callPackage ../development/compilers/gavrasm { }; @@ -19917,6 +20506,8 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; + gitoxide = callPackage ../applications/version-management/gitoxide { }; + inherit (gnome3) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -19998,6 +20589,8 @@ in gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); + gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; + gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { }; @@ -20089,12 +20682,16 @@ in gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; + gvisor = callPackage ../applications/virtualization/gvisor { + go = go_1_14; + }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; + gwc = callPackage ../applications/audio/gwc { }; + gxmessage = callPackage ../applications/misc/gxmessage { }; gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { }; @@ -20111,6 +20708,8 @@ in hactool = callPackage ../tools/compression/hactool { }; + hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -20323,6 +20922,10 @@ in iksemel = callPackage ../development/libraries/iksemel { }; + imag = callPackage ../applications/misc/imag { + inherit (darwin.apple_sdk.frameworks) Security; + }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { @@ -20387,7 +20990,7 @@ in inherit (nodePackages) imapnotify; - img2pdf = callPackage ../applications/misc/img2pdf { }; + img2pdf = with python3Packages; toPythonApplication img2pdf; imgcat = callPackage ../applications/graphics/imgcat { }; @@ -20396,10 +20999,16 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; + inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { + lcms = lcms2; + }; + inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { @@ -20424,10 +21033,22 @@ in ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; + istioctl = callPackage ../applications/networking/cluster/istioctl { }; + bip = callPackage ../applications/networking/irc/bip { }; j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; + jabcode = callPackage ../development/libraries/jabcode { }; + + jabcode-writer = callPackage ../development/libraries/jabcode { + subproject = "writer"; + }; + + jabcode-reader = callPackage ../development/libraries/jabcode { + subproject = "reader"; + }; + jabref = callPackage ../applications/office/jabref { }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -20493,6 +21114,8 @@ in kanshi = callPackage ../tools/misc/kanshi { }; + kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; + kdeApplications = let mkApplications = import ../applications/kde; @@ -20504,13 +21127,15 @@ in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; + akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b + kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog + keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake + kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; + k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; @@ -20570,6 +21195,8 @@ in klayout = libsForQt5.callPackage ../applications/misc/klayout { }; + kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { }; + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { @@ -20585,6 +21212,8 @@ in kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kpt = callPackage ../applications/networking/cluster/kpt { }; + krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; @@ -20645,6 +21274,8 @@ in ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; + lazpaint = callPackage ../applications/graphics/lazpaint { }; + caps = callPackage ../applications/audio/caps { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; @@ -20707,6 +21338,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + icu = icu64; variant = "still"; }); }); @@ -20726,17 +21358,14 @@ in linuxband = callPackage ../applications/audio/linuxband { }; - ledger = callPackage ../applications/office/ledger { - # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs - # an update to find it: - # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html - boost = boost15x; - }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; + lighthouse = callPackage ../applications/misc/lighthouse { }; lighttable = callPackage ../applications/editors/lighttable {}; @@ -20807,16 +21436,20 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring; + inherit (gnome3) gnome-desktop; wine = wineWowPackages.staging; }; - lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; + lutris = callPackage ../applications/misc/lutris/fhsenv.nix { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; lutris-free = lutris.override { steamSupport = false; }; lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; @@ -20850,7 +21483,6 @@ in mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; - marathon = callPackage ../applications/networking/cluster/marathon { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; markdown-pp = callPackage ../tools/text/markdown-pp { }; @@ -20859,6 +21491,8 @@ in magnetico = callPackage ../applications/networking/p2p/magnetico { }; + mastodon-bot = nodePackages.mastodon-bot; + matchbox = callPackage ../applications/window-managers/matchbox { }; matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { @@ -20976,6 +21610,8 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + molot-lite = callPackage ../applications/audio/molot-lite { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -21018,6 +21654,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-tunein mopidy-youtube; motif = callPackage ../development/libraries/motif { }; @@ -21066,6 +21703,8 @@ in normalize = callPackage ../applications/audio/normalize { }; + mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; + mm = callPackage ../applications/networking/instant-messengers/mm { }; mm-common = callPackage ../development/libraries/mm-common { }; @@ -21091,6 +21730,7 @@ in convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; + sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -21155,6 +21795,8 @@ in netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; + nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { geoip = geoipWithDatabase; }; @@ -21170,6 +21812,8 @@ in nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -21180,10 +21824,15 @@ in ostinato = callPackage ../applications/networking/ostinato { }; + p4 = callPackage ../applications/version-management/p4 { }; p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; + pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + pbis-open = callPackage ../tools/security/pbis { }; pcmanfm = callPackage ../applications/misc/pcmanfm { }; @@ -21336,9 +21985,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -21418,6 +22065,8 @@ in obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obsidian = callPackage ../applications/misc/obsidian { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; @@ -21476,6 +22125,11 @@ in osmium-tool = callPackage ../applications/misc/osmium-tool { }; + osu-lazer = callPackage ../games/osu-lazer { + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-netcore = dotnetCorePackages.netcore_3_1; + }; + owamp = callPackage ../applications/networking/owamp { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -21504,6 +22158,8 @@ in stdenv = gcc7Stdenv; }; + webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; + pamix = callPackage ../applications/audio/pamix { }; pamixer = callPackage ../applications/audio/pamixer { }; @@ -21658,6 +22314,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plexamp = callPackage ../applications/audio/plexamp { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -21704,7 +22362,7 @@ in protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; - protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { }; + protonvpn-gui = callPackage ../applications/networking/protonvpn-gui { }; ps2client = callPackage ../applications/networking/ps2client { }; @@ -22003,6 +22661,8 @@ in udiskie = callPackage ../applications/misc/udiskie { }; + sacc = callPackage ../applications/networking/gopher/sacc { }; + sakura = callPackage ../applications/misc/sakura { }; sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; @@ -22147,9 +22807,9 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; - maestral = callPackage ../applications/networking/maestral { }; + maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -22262,6 +22922,8 @@ in git = gitMinimal; }; + sslyze = with python3Packages; toPythonApplication sslyze; + ssr = callPackage ../applications/audio/soundscape-renderer {}; ssrc = callPackage ../applications/audio/ssrc { }; @@ -22272,10 +22934,7 @@ in stp = callPackage ../applications/science/logic/stp { }; - stretchly = callPackage ../applications/misc/stretchly { - # Error on launch w/electron_8 - electron = electron_7; - }; + stretchly = callPackage ../applications/misc/stretchly { }; stumpish = callPackage ../applications/window-managers/stumpish {}; @@ -22309,6 +22968,8 @@ in pythonBindings = true; }); + sublime-music = callPackage ../applications/audio/sublime-music { }; + subunit = callPackage ../development/libraries/subunit { }; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; @@ -22328,9 +22989,12 @@ in symlinks = callPackage ../tools/system/symlinks { }; - syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; + # this can be changed to python3 once pyside2 is updated to support the latest python version + syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo114Module; + }) syncthing syncthing-cli syncthing-discovery @@ -22376,14 +23040,20 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + talentedhack = callPackage ../applications/audio/talentedhack { }; + tambura = callPackage ../applications/audio/tambura { }; + tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; + + tanka = callPackage ../applications/networking/cluster/tanka { }; + teams = callPackage ../applications/networking/instant-messengers/teams { }; teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskell = callPackage ../applications/misc/taskell { }; + taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; taskjuggler = callPackage ../applications/misc/taskjuggler { }; @@ -22452,19 +23122,26 @@ in thonny = callPackage ../applications/editors/thonny { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome2) libIDL; - inherit (rustPackages_1_42) rustc; + thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { + inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; + icu = icu67; + libvpx = libvpx_1_8; + gtk3Support = true; + }; + + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + inherit (rustPackages_1_44) cargo rustc; + libpng = libpng_apng; + nss = nss_3_44; gtk3Support = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; - }; + thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; ticpp = callPackage ../development/libraries/ticpp { }; @@ -22484,7 +23161,9 @@ in tint2 = callPackage ../applications/misc/tint2 { }; - tiny = callPackage ../applications/networking/irc/tiny { }; + tiny = callPackage ../applications/networking/irc/tiny { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; @@ -22590,6 +23269,8 @@ in ueberzug = with python3Packages; toPythonApplication ueberzug; + uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; @@ -22686,6 +23367,8 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + olifant = callPackage ../applications/misc/olifant { }; + gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { gtk = pkgs.gtk3; }; @@ -22716,6 +23399,8 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; + virtual-ans = callPackage ../applications/audio/virtual-ans {}; + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; @@ -22779,6 +23464,8 @@ in vmpk = callPackage ../applications/audio/vmpk { }; + vocproc = callPackage ../applications/audio/vocproc { }; + vnstat = callPackage ../applications/networking/vnstat { }; vocal = callPackage ../applications/audio/vocal { }; @@ -22799,6 +23486,8 @@ in vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; + code-server = callPackage ../servers/code-server { }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { }; @@ -23087,8 +23776,6 @@ in libpng = libpng12; }; - xara = callPackage ../applications/graphics/xara { }; - xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick; inherit (xorg) libXt; @@ -23304,6 +23991,8 @@ in xmacro = callPackage ../tools/X11/xmacro { }; + xmenu = callPackage ../applications/misc/xmenu { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; xmp = callPackage ../applications/audio/xmp { }; @@ -23409,6 +24098,11 @@ in bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + + cgminer = callPackage ../applications/blockchains/cgminer { }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; @@ -23478,18 +24172,14 @@ in monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; - pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; - protobuf = protobuf3_10; }; masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; - mist = callPackage ../applications/blockchains/mist.nix { }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; @@ -23511,11 +24201,13 @@ in wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; + wownero = callPackage ../applications/blockchains/wownero.nix {}; zcash = callPackage ../applications/blockchains/zcash { }; - parity = callPackage ../applications/blockchains/parity { }; + openethereum = callPackage ../applications/blockchains/openethereum { }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; @@ -23525,6 +24217,8 @@ in quorum = callPackage ../applications/blockchains/quorum.nix { }; + whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -23624,13 +24318,11 @@ in inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; }; - cataclysm-dda = callPackage ../games/cataclysm-dda { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; - }; + cataclysmDDA = callPackage ../games/cataclysm-dda { }; - cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; - }; + cataclysm-dda = cataclysmDDA.stable.tiles; + + cataclysm-dda-git = cataclysmDDA.git.tiles; chessdb = callPackage ../games/chessdb { }; @@ -23800,9 +24492,14 @@ in frozen-bubble = callPackage ../games/frozen-bubble { }; fsg = callPackage ../games/fsg { - wxGTK = wxGTK28.override { unicode = false; }; + wxGTK = wxGTK28.override { + unicode = false; + gst-plugins-base = null; + }; }; + fslint = callPackage ../applications/misc/fslint {}; + galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -23901,6 +24598,8 @@ in leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -23996,6 +24695,8 @@ in nxengine-evo = callPackage ../games/nxengine-evo { }; + oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { }; + odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; @@ -24035,6 +24736,11 @@ in static = true; }; }; + openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix { + zlib = zlib.override { + static = true; + }; + }; opentyrian = callPackage ../games/opentyrian { }; @@ -24171,6 +24877,8 @@ in service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; + sfrotz = callPackage ../games/sfrotz { }; + sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; @@ -24208,9 +24916,11 @@ in stockfish = callPackage ../games/stockfish { }; - steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { }); + steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); - steam = steamPackages.steam-chrootenv; + steam = steamPackages.steam-fhsenv; steam-run = steam.run; steam-run-native = (steam.override { @@ -24496,6 +25206,7 @@ in dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; @@ -24544,7 +25255,7 @@ in inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr; + }) redshift redshift-wlr gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; @@ -24596,6 +25307,8 @@ in eigen = eigen2; }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; jmol = callPackage ../applications/science/chemistry/jmol { }; @@ -24640,9 +25353,7 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { - stdenv = gcc8Stdenv; - }; + ants = callPackage ../applications/science/biology/ants { }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -24696,7 +25407,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; + ezminc = callPackage ../applications/science/biology/EZminc { }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -24830,6 +25541,8 @@ in varscan = callPackage ../applications/science/biology/varscan { }; + whisper = callPackage ../applications/science/biology/whisper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; @@ -24842,6 +25555,10 @@ in almonds = callPackage ../applications/science/math/almonds { }; + amd-blis = callPackage ../development/libraries/science/math/amd-blis { }; + + amd-libflame = callPackage ../development/libraries/science/math/amd-libflame { }; + arpack = callPackage ../development/libraries/science/math/arpack { }; blas = callPackage ../build-support/alternatives/blas { }; @@ -25117,11 +25834,11 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { + polyml = stdenv.lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = if stdenv.isLinux then jre else jdk; + java = openjdk11; }; iprover = callPackage ../applications/science/logic/iprover { }; @@ -25239,6 +25956,8 @@ in adms = callPackage ../applications/science/electronics/adms { }; + appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; + # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. # This is the last version with the old model. @@ -25250,6 +25969,8 @@ in caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; + csxcad = callPackage ../applications/science/electronics/csxcad { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { @@ -25260,6 +25981,8 @@ in gtkwave = callPackage ../applications/science/electronics/gtkwave { }; + hyp2mat = callPackage ../applications/science/electronics/hyp2mat { }; + fped = callPackage ../applications/science/electronics/fped { }; # this is a wrapper for kicad.base and kicad.libraries @@ -25279,6 +26002,8 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; + qcsxcad = libsForQt5.callPackage ../applications/science/electronics/qcsxcad { }; + qucs = callPackage ../applications/science/electronics/qucs { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; @@ -25290,6 +26015,7 @@ in caffe = callPackage ../applications/science/math/caffe ({ opencv3 = opencv3WithoutCuda; # Used only for image loading. + blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); @@ -25327,6 +26053,7 @@ in gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; maxima = callPackage ../applications/science/math/maxima { ecl = null; @@ -25514,7 +26241,7 @@ in android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; + antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; atari800 = callPackage ../misc/emulators/atari800 { }; @@ -25528,6 +26255,8 @@ in attract-mode = callPackage ../misc/emulators/attract-mode { }; + autotiling = python3Packages.callPackage ../misc/autotiling { }; + beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; @@ -25550,6 +26279,8 @@ in clinfo = callPackage ../tools/system/clinfo { }; + clpeak = callPackage ../tools/misc/clpeak { }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -25589,6 +26320,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; @@ -25624,6 +26357,8 @@ in dosbox = callPackage ../misc/emulators/dosbox { }; + emu2 = callPackage ../misc/emulators/emu2 { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -25683,7 +26418,8 @@ in 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; + inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; gammu = callPackage ../applications/misc/gammu { }; @@ -25809,6 +26545,8 @@ in icu = icu58; }; + mamba = callPackage ../applications/audio/mamba{ }; + mame = libsForQt5.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -25985,6 +26723,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; @@ -26000,7 +26740,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - nix-linter = haskellPackages.callPackage ../development/tools/analysis/nix-linter { }; + nix-linter = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/analysis/nix-linter { }); nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -26029,6 +26769,8 @@ in nix-top = callPackage ../tools/package-management/nix-top { }; + nix-tree = haskell.lib.justStaticExecutables (haskellPackages.nix-tree); + nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; nix-repl = throw ( @@ -26049,6 +26791,8 @@ in nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { }; @@ -26155,6 +26899,8 @@ in py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; + rargs = callPackage ../tools/misc/rargs { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; @@ -26321,6 +27067,7 @@ in terraform_0_11 terraform_0_11-full terraform_0_12 + terraform_0_13 terraform_plugins_test ; @@ -26332,6 +27079,8 @@ in callPackage ../applications/networking/cluster/terraform-providers {} ); + terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; + terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -26342,6 +27091,8 @@ in tilt = callPackage ../applications/networking/cluster/tilt {}; + timeular = callPackage ../applications/office/timeular {}; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi @@ -26389,6 +27140,8 @@ in urbit = callPackage ../misc/urbit { }; + utf8cpp = callPackage ../development/libraries/utf8cpp { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; unicode-paracode = callPackage ../tools/misc/unicode { }; @@ -26578,6 +27331,8 @@ in zap = callPackage ../tools/networking/zap { }; + zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; + zopfli = callPackage ../tools/compression/zopfli { }; myEnvFun = callPackage ../misc/my-env { @@ -26654,7 +27409,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -26731,6 +27486,10 @@ in openfst = callPackage ../development/libraries/openfst {}; + opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + + phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; + duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { @@ -26747,7 +27506,7 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; - diceware = callPackage ../tools/security/diceware { }; + diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc; @@ -26818,6 +27577,8 @@ in kube3d = callPackage ../applications/networking/cluster/kube3d {}; + zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {}; + zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; runwayml = callPackage ../applications/graphics/runwayml {}; @@ -26875,4 +27636,6 @@ in vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; + + navidrome = callPackage ../servers/misc/navidrome {}; } |