diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 2038 |
1 files changed, 1451 insertions, 587 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index a09a8a64602d..c8299dc4b61f 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -154,16 +154,24 @@ in ankisyncd = callPackage ../servers/ankisyncd { }; + antsimulator = callPackage ../games/antsimulator { }; + fiche = callPackage ../servers/fiche { }; fishnet = callPackage ../servers/fishnet { }; + fission = callPackage ../development/tools/fission { }; + + authy = callPackage ../applications/misc/authy { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; breakpad = callPackage ../development/misc/breakpad { }; + buf = callPackage ../development/tools/buf { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -188,7 +196,14 @@ in castget = callPackage ../applications/networking/feedreaders/castget { }; - castxml = callPackage ../development/tools/castxml { }; + castxml = callPackage ../development/tools/castxml { + inherit (llvmPackages) clang-unwrapped libclang llvm; + inherit (python3Packages) sphinx; + }; + + catatonit = callPackage ../applications/virtualization/catatonit { }; + + cen64 = callPackage ../misc/emulators/cen64 { }; cereal = callPackage ../development/libraries/cereal { }; @@ -246,6 +261,16 @@ in protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; + + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; + + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; + + protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; + + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -262,6 +287,8 @@ in creddump = callPackage ../tools/security/creddump {}; + credslayer = callPackage ../tools/security/credslayer { }; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; devour = callPackage ../tools/X11/devour {}; @@ -282,6 +309,7 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { + go = buildPackages.go_1_15; writePython3 = buildPackages.writers.writePython3; }; @@ -360,6 +388,7 @@ in fetchgit = callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; + git-lfs = buildPackages.git-lfs; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; @@ -412,7 +441,7 @@ in else makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; inherit cacert; - curl = buildPackages.curl.override (old: rec { + curl = buildPackages.curlMinimal.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -477,6 +506,8 @@ in fetchFromSavannah = callPackage ../build-support/fetchsavannah {}; + fetchFromSourcehut = callPackage ../build-support/fetchsourcehut { }; + fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; @@ -504,6 +535,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + maelstrom = callPackage ../games/maelstrom { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; @@ -512,7 +545,7 @@ in makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } + makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: @@ -617,10 +650,12 @@ in _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../tools/security/1password-gui { }; + _1password-gui = callPackage ../applications/misc/1password-gui { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; + _7zz = callPackage ../tools/archivers/7zz { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -637,6 +672,8 @@ in acme-sh = callPackage ../tools/admin/acme.sh { }; + acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { ffmpeg = ffmpeg_2; }; @@ -657,8 +694,6 @@ in arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; - tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; - opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; @@ -748,6 +783,18 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + quich = callPackage ../tools/misc/quich { } ; + + tfk8s = callPackage ../tools/misc/tfk8s { }; + + xtrt = callPackage ../tools/archivers/xtrt { }; + + yabridge = callPackage ../tools/audio/yabridge { + wine = wineWowPackages.minimal; + }; + + yabridgectl = callPackage ../tools/audio/yabridgectl { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -784,6 +831,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; + lifecycled = callPackage ../tools/misc/lifecycled { }; + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; @@ -794,6 +843,10 @@ in flavour = "git"; }; + logseq = callPackage ../applications/misc/logseq { + electron = electron_11; + }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; microcom = callPackage ../applications/terminal-emulators/microcom { }; @@ -856,6 +909,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; + writefreely = callPackage ../applications/misc/writefreely { }; + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; @@ -987,6 +1042,8 @@ in async = callPackage ../development/tools/async {}; + async-profiler = callPackage ../development/tools/async-profiler { }; + atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; @@ -1013,6 +1070,8 @@ in awslogs = callPackage ../tools/admin/awslogs { }; + aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; + aws-env = callPackage ../tools/admin/aws-env { }; aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; @@ -1029,6 +1088,8 @@ in aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; + iamy = callPackage ../tools/admin/iamy { }; azure-cli = callPackage ../tools/admin/azure-cli { }; @@ -1043,6 +1104,8 @@ in betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; + betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -1095,6 +1158,8 @@ in barman = python3Packages.callPackage ../tools/misc/barman { }; + bashate = python3Packages.callPackage ../development/tools/bashate { }; + bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bashcards = callPackage ../tools/misc/bashcards { }; @@ -1103,6 +1168,8 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; + bitwarden = callPackage ../tools/security/bitwarden { }; inherit (nodePackages) bitwarden-cli; @@ -1116,6 +1183,8 @@ in bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; + blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; + bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; @@ -1124,6 +1193,8 @@ in bonfire = callPackage ../tools/misc/bonfire { }; + botamusique = callPackage ../tools/audio/botamusique { }; + boulder = callPackage ../tools/admin/boulder { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -1190,6 +1261,8 @@ in corsmisc = callPackage ../tools/security/corsmisc { }; + cosign = callPackage ../tools/security/cosign { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; cpuid = callPackage ../os-specific/linux/cpuid { }; @@ -1217,6 +1290,8 @@ in detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + dfmt = callPackage ../tools/text/dfmt { }; + diskonaut = callPackage ../tools/misc/diskonaut { }; diskus = callPackage ../tools/misc/diskus { @@ -1285,7 +1360,9 @@ in gaia = callPackage ../development/libraries/gaia { }; - galene = callPackage ../servers/web-apps/galene {}; + galene = callPackage ../servers/web-apps/galene { + buildGoModule = buildGo115Module; + }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1319,6 +1396,10 @@ in glasgow = with python3Packages; toPythonApplication glasgow; + gmni = callPackage ../applications/networking/browsers/gmni { }; + + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; @@ -1329,7 +1410,7 @@ in gucci = callPackage ../tools/text/gucci { }; - grc = callPackage ../tools/misc/grc { }; + grc = python3Packages.callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { SDL = SDL_sixel; @@ -1345,12 +1426,18 @@ in glyr = callPackage ../tools/audio/glyr { }; + gtklp = callPackage ../tools/misc/gtklp { }; + google-amber = callPackage ../tools/graphics/amber { }; hakrawler = callPackage ../tools/security/hakrawler { }; + harvid = callPackage ../tools/video/harvid { }; + hime = callPackage ../tools/inputmethods/hime {}; + hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; + hostctl = callPackage ../tools/system/hostctl { }; hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; @@ -1373,10 +1460,14 @@ in lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; + pacparser = callPackage ../tools/networking/pacparser { }; pass = callPackage ../tools/security/pass { }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; + pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; pass-nodmenu = callPackage ../tools/security/pass { @@ -1391,12 +1482,18 @@ in passExtensions = recurseIntoAttrs pass.extensions; + xjadeo = callPackage ../tools/video/xjadeo { }; + asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; go-audit = callPackage ../tools/system/go-audit { }; gopass = callPackage ../tools/security/gopass { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -1427,6 +1524,8 @@ in pebble = callPackage ../tools/admin/pebble { }; + play-with-mpv = callPackage ../tools/video/play-with-mpv { }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; skhd = callPackage ../os-specific/darwin/skhd { @@ -1548,7 +1647,7 @@ in b3sum = callPackage ../tools/security/b3sum {}; - backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; @@ -1671,7 +1770,6 @@ in else libtensorflow-bin; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - inherit (linuxPackages) nvidia_x11; cudaSupport = config.cudaSupport or false; }; @@ -1697,14 +1795,20 @@ in bmake = callPackage ../development/tools/build-managers/bmake { }; + boca = callPackage ../development/libraries/boca { }; + bochs = callPackage ../applications/virtualization/bochs { }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; - borgbackup = callPackage ../tools/backup/borg { }; + borgbackup = callPackage ../tools/backup/borgbackup { }; + + borgmatic = callPackage ../tools/backup/borgmatic { }; boringtun = callPackage ../tools/networking/boringtun { }; + bookstack = callPackage ../servers/web-apps/bookstack { }; + # Upstream recommends qt5.12 and it doesn't build with qt5.15 boomerang = libsForQt512.callPackage ../development/tools/boomerang { }; @@ -1743,10 +1847,14 @@ in bsod = callPackage ../misc/emulators/bsod { }; + py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + simh = callPackage ../misc/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; + btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; + btrbk = callPackage ../tools/backup/btrbk { asciidoc = asciidoc-full; }; @@ -1866,8 +1974,6 @@ in cbor-diag = callPackage ../development/tools/cbor-diag { }; - ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { }; croc = callPackage ../tools/networking/croc { }; @@ -1904,6 +2010,8 @@ in cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; + clickclack = callPackage ../tools/misc/clickclack { }; + clog-cli = callPackage ../development/tools/clog-cli { }; cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; @@ -1958,11 +2066,43 @@ in cowsay = callPackage ../tools/misc/cowsay { }; + czkawka = callPackage ../tools/misc/czkawka { }; + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { }; - clipman = callPackage ../tools/misc/clipman { }; + clipman = callPackage ../tools/wayland/clipman { }; + + kanshi = callPackage ../tools/wayland/kanshi { }; + + oguri = callPackage ../tools/wayland/oguri { }; + + slurp = callPackage ../tools/wayland/slurp { }; + + swaykbdd = callPackage ../tools/wayland/swaykbdd { }; + + swaycwd = callPackage ../tools/wayland/swaycwd { }; + + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + + wev = callPackage ../tools/wayland/wev { }; + + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + + wlogout = callPackage ../tools/wayland/wlogout { }; + + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + + wlsunset = callPackage ../tools/wayland/wlsunset { }; + + wob = callPackage ../tools/wayland/wob { }; + + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + + wtype = callPackage ../tools/wayland/wtype { }; + + ydotool = callPackage ../tools/wayland/ydotool { }; clipster = callPackage ../tools/misc/clipster { }; @@ -2093,6 +2233,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + digitemp = callPackage ../tools/misc/digitemp { }; + dijo = callPackage ../tools/misc/dijo { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -2110,6 +2252,14 @@ in discount = callPackage ../tools/text/discount { }; + discourse = callPackage ../servers/web-apps/discourse { + ruby = ruby_2_7; + }; + + discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { + ruby = ruby_2_7; + }; + discocss = callPackage ../tools/misc/discocss { }; disfetch = callPackage ../tools/misc/disfetch { }; @@ -2146,7 +2296,7 @@ in dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; - dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + inherit (ocamlPackages) dot-merlin-reader; dozenal = callPackage ../applications/misc/dozenal { }; @@ -2166,7 +2316,7 @@ in duf = callPackage ../tools/misc/duf { }; - inherit (ocamlPackages) dune dune_2 dune-release; + inherit (ocamlPackages) dune_1 dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -2195,6 +2345,8 @@ in edac-utils = callPackage ../os-specific/linux/edac-utils { }; + eddy = libsForQt5.callPackage ../applications/graphics/eddy { }; + eggdrop = callPackage ../tools/networking/eggdrop { }; eksctl = callPackage ../tools/admin/eksctl { }; @@ -2217,6 +2369,8 @@ in enca = callPackage ../tools/text/enca { }; + enigma = callPackage ../games/enigma {}; + ent = callPackage ../tools/misc/ent { }; envconsul = callPackage ../tools/system/envconsul { }; @@ -2277,16 +2431,22 @@ in fileshelter = callPackage ../servers/web-apps/fileshelter { }; + fioctl = callPackage ../tools/admin/fioctl { }; + firecracker = callPackage ../applications/virtualization/firecracker { }; firectl = callPackage ../applications/virtualization/firectl { }; firestarter = callPackage ../applications/misc/firestarter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; + fselect = callPackage ../tools/misc/fselect { }; fsmon = callPackage ../tools/misc/fsmon { }; + fst = callPackage ../tools/text/fst { }; + fsql = callPackage ../tools/misc/fsql { }; fop = callPackage ../tools/typesetting/fop { @@ -2309,11 +2469,13 @@ in fuzzel = callPackage ../applications/misc/fuzzel { }; - flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + flashfocus = callPackage ../misc/flashfocus { }; qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; - fwup = callPackage ../tools/misc/fwup { }; + fwup = callPackage ../tools/misc/fwup { + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; @@ -2325,6 +2487,8 @@ in g2o = libsForQt5.callPackage ../development/libraries/g2o { }; + gb-backup = callPackage ../tools/backup/gamerbackup { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; gdrivefs = python27Packages.gdrivefs; @@ -2335,6 +2499,8 @@ in go-chromecast = callPackage ../applications/video/go-chromecast { }; + go-containerregistry = callPackage ../development/tools/go-containerregistry { }; + go-rice = callPackage ../tools/misc/go.rice {}; go-2fa = callPackage ../tools/security/2fa {}; @@ -2416,6 +2582,8 @@ in gringo = callPackage ../tools/misc/gringo { }; + grit = callPackage ../tools/misc/grit { }; + grobi = callPackage ../tools/X11/grobi { }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; @@ -2440,6 +2608,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hidrd = callPackage ../tools/misc/hidrd { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; home-manager = callPackage ../tools/package-management/home-manager {}; @@ -2476,6 +2646,8 @@ in jotta-cli = callPackage ../applications/misc/jotta-cli { }; + joycond = callPackage ../os-specific/linux/joycond { }; + jwt-cli = callPackage ../tools/security/jwt-cli { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2494,6 +2666,8 @@ in klog = qt5.callPackage ../applications/radio/klog { }; + krapslog = callPackage ../tools/misc/krapslog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -2504,6 +2678,8 @@ in lief = callPackage ../development/libraries/lief {}; + libnbd = callPackage ../development/libraries/libnbd { }; + libndtypes = callPackage ../development/libraries/libndtypes { }; libxnd = callPackage ../development/libraries/libxnd { }; @@ -2512,6 +2688,8 @@ in linuxptp = callPackage ../os-specific/linux/linuxptp { }; + lisgd = callPackage ../tools/inputmethods/lisgd { }; + lite = callPackage ../applications/editors/lite { }; loadwatch = callPackage ../tools/system/loadwatch { }; @@ -2548,6 +2726,8 @@ in massren = callPackage ../tools/misc/massren { }; + mat2 = with python3.pkgs; toPythonApplication mat2; + maxcso = callPackage ../tools/archivers/maxcso {}; medusa = callPackage ../tools/security/medusa { }; @@ -2596,6 +2776,8 @@ in monsoon = callPackage ../tools/security/monsoon {}; + moodle-dl = callPackage ../tools/networking/moodle-dl { }; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; @@ -2632,6 +2814,8 @@ in nix-template = callPackage ../tools/package-management/nix-template { }; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2696,13 +2880,17 @@ in playerctl = callPackage ../tools/audio/playerctl { }; + poweralertd = callPackage ../tools/misc/poweralertd { }; + ps_mem = callPackage ../tools/system/ps_mem { }; psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; - pueue = callPackage ../applications/misc/pueue { }; + pueue = callPackage ../applications/misc/pueue { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; pixiecore = callPackage ../tools/networking/pixiecore {}; @@ -2716,6 +2904,7 @@ in procs = callPackage ../tools/admin/procs { inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin) libiconv; }; psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; @@ -2764,6 +2953,7 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; + buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; @@ -2806,7 +2996,9 @@ in roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); - routinator = callPackage ../servers/routinator { }; + routinator = callPackage ../servers/routinator { + inherit (darwin.apple_sdk.frameworks) Security; + }; rsbep = callPackage ../tools/backup/rsbep { }; @@ -2861,6 +3053,8 @@ in mstflint = callPackage ../tools/misc/mstflint { }; + mslink = callPackage ../tools/misc/mslink { }; + mcelog = callPackage ../os-specific/linux/mcelog { util-linux = util-linuxMinimal; }; @@ -2902,8 +3096,6 @@ in }); asciidoctor = callPackage ../tools/typesetting/asciidoctor { - # kindlegen is unfree, don't enable by default - kindlegen = null; # epubcheck pulls in Java, which is problematic on some platforms epubcheck = null; }; @@ -2950,6 +3142,25 @@ in pythonPackages = python3Packages; }; + beetsExternalPlugins = + let + pluginArgs = { + # This is a stripped down beets for testing of the external plugins. + beets = (beets.override { + enableAlternatives = false; + enableCopyArtifacts = false; + enableExtraFiles = false; + }).overrideAttrs (lib.const { + doInstallCheck = false; + }); + pythonPackages = python3Packages; + }; + in lib.recurseIntoAttrs { + alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; + copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; + extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; + }; + bento4 = callPackage ../tools/video/bento4 { }; bepasty = callPackage ../tools/misc/bepasty { }; @@ -2993,9 +3204,7 @@ in librsync = librsync_0_9; }; - bud = callPackage ../tools/networking/bud { - inherit (pythonPackages) gyp; - }; + bud = callPackage ../tools/networking/bud { }; bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; @@ -3015,10 +3224,14 @@ in anydesk = callPackage ../applications/networking/remote/anydesk { }; + anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; + atool = callPackage ../tools/archivers/atool { }; bash_unit = callPackage ../tools/misc/bash_unit { }; + boltbrowser = callPackage ../tools/misc/boltbrowser { }; + bsc = callPackage ../tools/compression/bsc { inherit (llvmPackages) openmp; }; @@ -3029,9 +3242,7 @@ in cabextract = callPackage ../tools/archivers/cabextract { }; - cadaver = callPackage ../tools/networking/cadaver { - openssl = openssl_1_0_2; - }; + cadaver = callPackage ../tools/networking/cadaver { }; davix = callPackage ../tools/networking/davix { }; @@ -3090,6 +3301,8 @@ in checkinstall = callPackage ../tools/package-management/checkinstall { }; + checkmake = callPackage ../development/tools/checkmake { }; + chit = callPackage ../development/tools/chit { }; chkrootkit = callPackage ../tools/security/chkrootkit { }; @@ -3100,6 +3313,8 @@ in chunksync = callPackage ../tools/backup/chunksync { }; + cicero-tui = callPackage ../tools/misc/cicero-tui { }; + cipherscan = callPackage ../tools/security/cipherscan { openssl = if stdenv.hostPlatform.system == "x86_64-linux" then openssl-chacha @@ -3115,6 +3330,7 @@ in clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; + protobuf = protobuf3_14; }; clementineUnfree = clementine.unfree; @@ -3127,7 +3343,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_21_01_0; + citrix_workspace = citrix_workspace_21_03_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3136,6 +3352,7 @@ in citrix_workspace_20_10_0 citrix_workspace_20_12_0 citrix_workspace_21_01_0 + citrix_workspace_21_03_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -3156,8 +3373,6 @@ in colordiff = callPackage ../tools/text/colordiff { }; - concurrencykit = callPackage ../development/libraries/concurrencykit { }; - connect = callPackage ../tools/networking/connect { }; conspy = callPackage ../os-specific/linux/conspy {}; @@ -3210,6 +3425,10 @@ in usbsdmux = callPackage ../development/tools/misc/usbsdmux { }; + usbview = callPackage ../tools/misc/usbview { }; + + uwuify = callPackage ../tools/misc/uwuify { }; + anthy = callPackage ../tools/inputmethods/anthy { }; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; @@ -3234,12 +3453,12 @@ in netevent = callPackage ../tools/inputmethods/netevent { }; + netplan = callPackage ../tools/admin/netplan { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; - libkkc-data = callPackage ../data/misc/libkkc-data { - inherit (pythonPackages) marisa; - }; + libkkc-data = callPackage ../data/misc/libkkc-data { }; libkkc = callPackage ../tools/inputmethods/libkkc { }; @@ -3250,7 +3469,9 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { + go = go_1_15; + }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -3394,11 +3615,6 @@ in cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) - cudatoolkit_6 - cudatoolkit_6_5 - cudatoolkit_7 - cudatoolkit_7_5 - cudatoolkit_8 cudatoolkit_9 cudatoolkit_9_0 cudatoolkit_9_1 @@ -3408,16 +3624,14 @@ in cudatoolkit_10_1 cudatoolkit_10_2 cudatoolkit_11 - cudatoolkit_11_0; + cudatoolkit_11_0 + cudatoolkit_11_1 + cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_7 - cudnn_cudatoolkit_7_5 - cudnn6_cudatoolkit_8 - cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 cudnn_cudatoolkit_9_0 cudnn_cudatoolkit_9_1 @@ -3427,18 +3641,37 @@ in cudnn_cudatoolkit_10_1 cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11_0 + cudnn_cudatoolkit_11_1 + cudnn_cudatoolkit_11_2; cudnn = cudnn_cudatoolkit_10; + cutensorPackages = callPackages ../development/libraries/science/math/cutensor { }; + inherit (cutensorPackages) + cutensor_cudatoolkit_10 + cutensor_cudatoolkit_10_1 + cutensor_cudatoolkit_10_2 + cutensor_cudatoolkit_11 + cutensor_cudatoolkit_11_0 + cutensor_cudatoolkit_11_1 + cutensor_cudatoolkit_11_2; + + cutensor = cutensor_cudatoolkit_10; + + curie = callPackage ../data/fonts/curie { }; + curlFull = curl.override { - idnSupport = true; ldapSupport = true; + }; + + curl = curlMinimal.override { + idnSupport = true; gssSupport = true; brotliSupport = true; }; - curl = callPackage ../tools/networking/curl { }; + curlMinimal = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; @@ -3449,7 +3682,7 @@ in curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; - cutter = callPackage ../tools/networking/cutter { }; + tcp-cutter = callPackage ../tools/networking/tcp-cutter { }; cwebbin = callPackage ../development/tools/misc/cwebbin { }; @@ -3473,7 +3706,15 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; + dbeaver = callPackage ../applications/misc/dbeaver { + jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 + + # TODO: remove once maven uses JDK 11 + # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 + maven = maven.override { + jdk = jdk11; + }; + }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -3498,7 +3739,8 @@ in }; deno = callPackage ../development/web/deno { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation; }; detox = callPackage ../tools/misc/detox { }; @@ -3565,6 +3807,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { }; + dnsx = callPackage ../tools/security/dnsx { }; dhcp = callPackage ../tools/networking/dhcp { }; @@ -3598,6 +3842,11 @@ in inherit (pythonPackages) mutagen python wrapPython; }; + dirdiff = callPackage ../tools/text/dirdiff { + tcl = tcl-8_5; + tk = tk-8_5; + }; + picotts = callPackage ../tools/audio/picotts { }; wgetpaste = callPackage ../tools/text/wgetpaste { }; @@ -3676,9 +3925,16 @@ in }; drone = callPackage ../development/tools/continuous-integration/drone { }; + drone-oss = callPackage ../development/tools/continuous-integration/drone { + enableUnfree = false; + }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { }; + + drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -3773,6 +4029,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + lychee = callPackage ../tools/networking/lychee { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; mcrcon = callPackage ../tools/networking/mcrcon {}; @@ -3835,27 +4093,21 @@ in volctl = callPackage ../tools/audio/volctl { }; - vorta = libsForQt5.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 { }; + volk = callPackage ../development/libraries/volk { }; - wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; + vorta = libsForQt5.callPackage ../applications/backup/vorta { }; - wlsunset = callPackage ../tools/wayland/wlsunset { }; + vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - wob = callPackage ../tools/misc/wob { }; + utahfs = callPackage ../applications/networking/utahfs { }; - wtype = callPackage ../tools/wayland/wtype { }; + wakeonlan = callPackage ../tools/networking/wakeonlan { }; - wrangler = callPackage ../development/tools/wrangler { }; + wallutils = callPackage ../tools/graphics/wallutils { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + wrangler = callPackage ../development/tools/wrangler { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + }; wsl-open = callPackage ../tools/misc/wsl-open { }; @@ -3944,6 +4196,8 @@ in emem = callPackage ../applications/misc/emem { }; + empty = callPackage ../tools/misc/empty { }; + emulsion = callPackage ../applications/graphics/emulsion { inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; }; @@ -3976,9 +4230,7 @@ in epsxe = callPackage ../misc/emulators/epsxe { }; - escrotum = callPackage ../tools/graphics/escrotum { - inherit (pythonPackages) buildPythonApplication pygtk numpy; - }; + escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { }; @@ -4026,6 +4278,8 @@ in expect = callPackage ../tools/misc/expect { }; + expliot = python3Packages.callPackage ../tools/security/expliot { }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication Fabric; @@ -4205,9 +4459,9 @@ in libbladeRF = callPackage ../development/libraries/libbladeRF { }; - lp_solve = callPackage ../applications/science/math/lp_solve { }; + libbtbb = callPackage ../development/libraries/libbtbb { }; - lprof = callPackage ../tools/graphics/lprof { }; + lp_solve = callPackage ../applications/science/math/lp_solve { }; fastlane = callPackage ../tools/admin/fastlane { }; @@ -4231,6 +4485,8 @@ in flamegraph = callPackage ../development/tools/flamegraph { }; + flawfinder = callPackage ../development/tools/flawfinder { }; + flips = callPackage ../tools/compression/flips { }; flvtool2 = callPackage ../tools/video/flvtool2 { @@ -4241,6 +4497,8 @@ in python = python2; }; + fontfor = callPackage ../tools/misc/fontfor { }; + fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -4281,6 +4539,10 @@ in fprintd = callPackage ../tools/security/fprintd { }; + fprintd-tod = callPackage ../tools/security/fprintd { + libfprint = libfprint-tod; + }; + ferdi = callPackage ../applications/networking/instant-messengers/ferdi { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; @@ -4289,6 +4551,8 @@ in mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; + freac = callPackage ../applications/audio/freac { }; + freedroid = callPackage ../games/freedroid { }; freedroidrpg = callPackage ../games/freedroidrpg { }; @@ -4305,6 +4569,8 @@ in freetds = callPackage ../development/libraries/freetds { }; + freetube = callPackage ../applications/video/freetube { }; + freqtweak = callPackage ../applications/audio/freqtweak { wxGTK = wxGTK31-gtk2; }; @@ -4470,6 +4736,17 @@ in humanfriendly; }; + git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive { + inherit (python3Packages) + buildPythonApplication + fetchPypi + annexremote + drivelib + GitPython + tenacity + humanfriendly; + }; + git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { }; git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { }; @@ -4613,6 +4890,8 @@ in gitfs = callPackage ../tools/filesystems/gitfs { }; + github-backup = callPackage ../tools/misc/github-backup { }; + gitin = callPackage ../applications/version-management/git-and-tools/gitin { }; gitinspector = callPackage ../applications/version-management/gitinspector { }; @@ -4649,7 +4928,6 @@ in gitui = callPackage ../applications/version-management/git-and-tools/gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; - inherit (pkgs) openssl perl; }; gogs = callPackage ../applications/version-management/gogs { }; @@ -4674,8 +4952,6 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -4698,6 +4974,8 @@ in gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; gnuclad = callPackage ../applications/graphics/gnuclad { }; @@ -4783,8 +5061,6 @@ in google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; - google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; gdown = with python3Packages; toPythonApplication gdown; @@ -4803,6 +5079,8 @@ in gparted = callPackage ../tools/misc/gparted { }; + gpt2tc = callPackage ../tools/text/gpt2tc { }; + ldmtool = callPackage ../tools/misc/ldmtool { }; gpodder = callPackage ../applications/audio/gpodder { }; @@ -4929,7 +5207,6 @@ in gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; - gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; @@ -5087,13 +5364,7 @@ in hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; - - hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; + hdfview = callPackage ../tools/misc/hdfview { }; hecate = callPackage ../applications/editors/hecate { }; @@ -5352,6 +5623,8 @@ in ispike = callPackage ../development/libraries/science/robotics/ispike { }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; + isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5480,13 +5753,17 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); - kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; + kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { }); + kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; kakoune = wrapKakoune kakoune-unwrapped { plugins = [ ]; # override with the list of desired plugins }; + kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; - kak-lsp = callPackage ../tools/misc/kak-lsp { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { + inherit (darwin.apple_sdk.frameworks) Security; + }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -5548,6 +5825,8 @@ in knockknock = callPackage ../tools/security/knockknock { }; + knockpy = callPackage ../tools/security/knockpy { }; + kore = callPackage ../development/web/kore { }; krakenx = callPackage ../tools/system/krakenx { }; @@ -5580,6 +5859,8 @@ in k6 = callPackage ../development/tools/k6 { }; + l2md = callPackage ../tools/text/l2md { }; + lab = callPackage ../applications/version-management/git-and-tools/lab { }; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; @@ -5598,7 +5879,7 @@ in lego = callPackage ../tools/admin/lego { }; - leocad = callPackage ../applications/graphics/leocad { }; + leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; less = callPackage ../tools/misc/less { }; @@ -5650,13 +5931,23 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; - logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; logstash = logstash6; @@ -5684,8 +5975,6 @@ in kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; - kippo = callPackage ../servers/kippo { }; - kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; lagrange = callPackage ../applications/networking/browsers/lagrange { @@ -5712,6 +6001,8 @@ in matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools; + matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { }; + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; @@ -5724,6 +6015,8 @@ in mcfly = callPackage ../tools/misc/mcfly { }; + m2r = python3Packages.callPackage ../tools/text/m2r { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -5781,6 +6074,10 @@ in pythonPackages = python3Packages; }; + nats-top = callPackage ../tools/system/nats-top { }; + + natscli = callPackage ../tools/system/natscli { }; + nbench = callPackage ../tools/misc/nbench { }; ncrack = callPackage ../tools/security/ncrack { }; @@ -5798,6 +6095,8 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + nkeys = callPackage ../tools/system/nkeys { }; + nyxt = callPackage ../applications/networking/browsers/nyxt { }; nfpm = callPackage ../tools/package-management/nfpm { }; @@ -5813,9 +6112,12 @@ in nodejs-slim = nodejs-slim-14_x; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + icu = icu67; + }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; + icu = icu67; }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { @@ -5861,8 +6163,6 @@ in jump = callPackage ../tools/system/jump {}; - kindlegen = callPackage ../tools/typesetting/kindlegen { }; - latex2html = callPackage ../tools/misc/latex2html { }; latexrun = callPackage ../tools/typesetting/tex/latexrun { }; @@ -5964,6 +6264,8 @@ in libqmi = callPackage ../development/libraries/libqmi { }; + libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { }; + libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; @@ -5976,6 +6278,8 @@ in libnixxml = callPackage ../development/libraries/libnixxml { }; + libplctag = callPackage ../development/libraries/libplctag { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; @@ -6002,6 +6306,8 @@ in libzmf = callPackage ../development/libraries/libzmf {}; + librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; + libreswan = callPackage ../tools/networking/libreswan { }; librest = callPackage ../development/libraries/librest { }; @@ -6076,7 +6382,6 @@ in luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; - lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -6498,7 +6803,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18 nextcloud19 nextcloud20; + nextcloud18 nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -6604,6 +6909,8 @@ in graphicalSupport = true; }; + nmap-unfree = callPackage ../tools/security/nmap-unfree { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -6670,6 +6977,8 @@ in nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { }; oatpp = callPackage ../development/libraries/oatpp { }; @@ -6692,6 +7001,10 @@ in openfortivpn = callPackage ../tools/networking/openfortivpn { }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; + + opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; + obexfs = callPackage ../tools/bluetooth/obexfs { }; obexftp = callPackage ../tools/bluetooth/obexftp { }; @@ -6720,6 +7033,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + ombi = callPackage ../servers/ombi { }; + omping = callPackage ../applications/networking/omping { }; onefetch = callPackage ../tools/misc/onefetch { @@ -6753,6 +7068,8 @@ in opendylan-bootstrap = opendylan_bin; }; + ophis = python3Packages.callPackage ../development/compilers/ophis { }; + opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; open-ecard = callPackage ../tools/security/open-ecard { }; @@ -6786,20 +7103,21 @@ in opensm = callPackage ../tools/networking/opensm { }; - openssh = - callPackage ../tools/networking/openssh { - hpnSupport = false; - etcDir = "/etc/ssh"; - pam = if stdenv.isLinux then pam else null; - }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); - openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { - hpnSupport = true; - }); + openssh = opensshPackages.openssh.override { + etcDir = "/etc/ssh"; + }; - openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { - withGssapiPatches = true; - }); + openssh_hpn = opensshPackages.openssh_hpn.override { + etcDir = "/etc/ssh"; + }; + + openssh_gssapi = opensshPackages.openssh_gssapi.override { + etcDir = "/etc/ssh"; + }; + + ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; opensp = callPackage ../tools/text/sgml/opensp { }; @@ -6881,6 +7199,8 @@ in owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; + oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; + oxidized = callPackage ../tools/admin/oxidized { }; oxipng = callPackage ../tools/graphics/oxipng { }; @@ -6988,7 +7308,9 @@ in pcimem = callPackage ../os-specific/linux/pcimem { }; - pciutils = callPackage ../tools/system/pciutils { }; + pciutils = callPackage ../tools/system/pciutils { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -7084,7 +7406,7 @@ in pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - xcbuildHook = xcbuild6Hook; + xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -7122,6 +7444,9 @@ in plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + inherit (callPackage ../servers/plik { }) + plik plikd; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; @@ -7211,6 +7536,8 @@ in prettyping = callPackage ../tools/networking/prettyping { }; + pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -7239,12 +7566,16 @@ in openssl = openssl_1_0_2; }; + prs = callPackage ../tools/security/prs { }; + psw = callPackage ../tools/misc/psw { }; pws = callPackage ../tools/misc/pws { }; cntlm = callPackage ../tools/networking/cntlm { }; + past-time = python3Packages.callPackage ../tools/misc/past-time { }; + pastebinit = callPackage ../tools/misc/pastebinit { }; pifi = callPackage ../applications/audio/pifi { }; @@ -7297,9 +7628,7 @@ in pympress = callPackage ../applications/office/pympress { }; - pyspread = python3Packages.callPackage ../applications/office/pyspread { - inherit (qt5) qtsvg wrapQtAppsHook; - }; + pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; pythonIRClib = pythonPackages.pythonIRClib; @@ -7373,6 +7702,8 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; + qmk = callPackage ../tools/misc/qmk { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; @@ -7453,8 +7784,7 @@ in redir = callPackage ../tools/networking/redir { }; - # failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now - redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_5; }; + redmine = callPackage ../applications/version-management/redmine { }; redsocks = callPackage ../tools/networking/redsocks { }; @@ -7466,6 +7796,10 @@ in retext = libsForQt5.callPackage ../applications/editors/retext { }; + inherit (callPackage ../tools/security/rekor { }) + rekor-cli + rekor-server; + richgo = callPackage ../development/tools/richgo { }; rs = callPackage ../tools/text/rs { }; @@ -7605,6 +7939,8 @@ in gperf = gperf_3_0; }; + rpm2targz = callPackage ../tools/archivers/rpm2targz { }; + rpmextract = callPackage ../tools/archivers/rpmextract { }; rrdtool = callPackage ../tools/misc/rrdtool { }; @@ -7663,6 +7999,8 @@ in s4cmd = callPackage ../tools/networking/s4cmd { }; + s5cmd = callPackage ../tools/networking/s5cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6-dns = skawarePackages.s6-dns; @@ -7675,6 +8013,8 @@ in s6-portable-utils = skawarePackages.s6-portable-utils; + sacad = callPackage ../tools/misc/sacad { }; + safecopy = callPackage ../tools/system/safecopy { }; sacd = callPackage ../tools/cd-dvd/sacd { }; @@ -7719,6 +8059,8 @@ in pulseSupport = config.pulseaudio or false; }; + scimark = callPackage ../misc/scimark { }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -7810,7 +8152,7 @@ in shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; @@ -7880,6 +8222,8 @@ in sipsak = callPackage ../tools/networking/sipsak { }; + sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; + siril = callPackage ../applications/science/astronomy/siril { }; sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; @@ -7960,6 +8304,8 @@ in spglib = callPackage ../development/libraries/spglib { }; + spicy = callPackage ../development/tools/spicy { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -8015,6 +8361,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + sunwait = callPackage ../applications/misc/sunwait { }; + surface-control = callPackage ../applications/misc/surface-control { }; syntex = callPackage ../tools/graphics/syntex {}; @@ -8027,7 +8375,9 @@ in solaar = callPackage ../applications/misc/solaar {}; - solanum = callPackage ../servers/irc/solanum {}; + solanum = callPackage ../servers/irc/solanum { + autoreconfHook = buildPackages.autoreconfHook269; + }; sourceHighlight = callPackage ../tools/text/source-highlight { }; @@ -8042,6 +8392,8 @@ in splot = haskell.lib.justStaticExecutables haskellPackages.splot; + spotdl = callPackage ../tools/audio/spotdl { }; + squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; @@ -8093,12 +8445,16 @@ in super = callPackage ../tools/security/super { }; + supertag = callPackage ../tools/filesystems/supertag { }; + supertux-editor = callPackage ../applications/editors/supertux-editor { }; svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + ssb = callPackage ../tools/security/ssb { }; + ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -8107,12 +8463,7 @@ in sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { - openssl = openssl_1_0_2.override { - enableSSL2 = true; - enableSSL3 = true; - }; - }; + sslscan = callPackage ../tools/security/sslscan { }; sslmate = callPackage ../development/tools/sslmate { }; @@ -8132,6 +8483,8 @@ in stress-ng = callPackage ../tools/system/stress-ng { }; + stressapptest = callPackage ../tools/system/stressapptest { }; + stoken = callPackage ../tools/security/stoken (config.stoken or {}); storeBackup = callPackage ../tools/backup/store-backup { }; @@ -8168,6 +8521,8 @@ in swec = callPackage ../tools/networking/swec { }; + swtpm = callPackage ../tools/security/swtpm { }; + svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; }; @@ -8209,6 +8564,8 @@ in swiften = callPackage ../development/libraries/swiften { }; + squeekboard = callPackage ../applications/accessibility/squeekboard { }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; @@ -8257,6 +8614,8 @@ in tdns-cli = callPackage ../tools/networking/tdns-cli { }; + tea = callPackage ../tools/misc/tea { }; + ted = callPackage ../tools/typesetting/ted { }; teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; @@ -8299,6 +8658,8 @@ in texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + tex-match = callPackage ../tools/typesetting/tex/tex-match { }; + thc-hydra = callPackage ../tools/security/thc-hydra { }; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; @@ -8441,12 +8802,16 @@ in trezorctl = with python3Packages; toPythonApplication trezor; - trezord = callPackage ../servers/trezord { }; + trezord = callPackage ../servers/trezord { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + trunk = callPackage ../development/tools/trunk { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -8547,6 +8912,8 @@ in tydra = callPackage ../tools/misc/tydra { }; + tz = callPackage ../tools/misc/tz { }; + u9fs = callPackage ../servers/u9fs { }; ua = callPackage ../tools/networking/ua { }; @@ -8555,6 +8922,8 @@ in ubridge = callPackage ../tools/networking/ubridge { }; + ubertooth = callPackage ../applications/radio/ubertooth { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -8623,7 +8992,9 @@ in uwsgi = callPackage ../servers/uwsgi { }; - v2ray = callPackage ../tools/networking/v2ray { }; + v2ray = callPackage ../tools/networking/v2ray { + buildGoModule = buildGo115Module; + }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -8678,9 +9049,7 @@ in inherit lib udisks2 python3; }; - viking = callPackage ../applications/misc/viking { - inherit (gnome2) scrollkeeper; - }; + viking = callPackage ../applications/misc/viking { }; vim-vint = callPackage ../development/tools/vim-vint { }; @@ -8710,6 +9079,8 @@ in vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; @@ -8887,6 +9258,8 @@ in tre = callPackage ../development/libraries/tre { }; + tremor-rs = callPackage ../tools/misc/tremor-rs { }; + ts = callPackage ../tools/system/ts { }; transfig = callPackage ../tools/graphics/transfig { @@ -8897,6 +9270,11 @@ in ttwatch = callPackage ../tools/misc/ttwatch { }; + turbovnc = callPackage ../tools/admin/turbovnc { + # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; + }; + udunits = callPackage ../development/libraries/udunits { }; uftp = callPackage ../servers/uftp {}; @@ -8919,6 +9297,11 @@ in withSystemd = true; }; + unbound-full = unbound.override { + withSystemd = true; + withDoH = true; + }; + unicorn = callPackage ../development/libraries/unicorn { }; units = callPackage ../tools/misc/units { @@ -8946,6 +9329,8 @@ in xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; + xkeysnail = callPackage ../tools/X11/xkeysnail { }; + xfstests = callPackage ../tools/misc/xfstests { }; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; @@ -8960,6 +9345,8 @@ in xwallpaper = callPackage ../tools/X11/xwallpaper { }; + gxkb = callPackage ../applications/misc/gxkb { }; + xxkb = callPackage ../applications/misc/xxkb { }; ugarit = callPackage ../tools/backup/ugarit { @@ -9041,6 +9428,18 @@ in libpsl = null; }; + wget2 = callPackage ../tools/networking/wget2 { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20210208"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; + sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp"; + }; + }); + }; + wg-bond = callPackage ../applications/networking/wg-bond { }; which = callPackage ../tools/system/which { }; @@ -9131,6 +9530,8 @@ in xml2 = callPackage ../tools/text/xml/xml2 { }; + xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { }; + xmlformat = callPackage ../tools/text/xml/xmlformat { }; xmlroff = callPackage ../tools/typesetting/xmlroff { }; @@ -9143,8 +9544,6 @@ in w3m = w3m-batch; }; - xmpppy = pythonPackages.xmpppy; - xiccd = callPackage ../tools/misc/xiccd { }; xidlehook = callPackage ../tools/X11/xidlehook { @@ -9188,6 +9587,8 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yapf = with python3Packages; toPythonApplication yapf; + yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; @@ -9208,6 +9609,8 @@ in yeshup = callPackage ../tools/system/yeshup { }; + ytfzf = callPackage ../tools/misc/ytfzf { }; + ytree = callPackage ../tools/misc/ytree { }; yggdrasil = callPackage ../tools/networking/yggdrasil { }; @@ -9250,8 +9653,6 @@ in zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; - zimreader = callPackage ../tools/text/zimreader { }; - zimwriterfs = callPackage ../tools/text/zimwriterfs { }; par = callPackage ../tools/text/par { }; @@ -9267,12 +9668,20 @@ in zinit = callPackage ../shells/zsh/zinit {} ; + zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; + + zs-wait4host = callPackage ../tools/networking/zs-wait4host { }; + + zstxtns-utils = callPackage ../tools/text/zstxtns-utils { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; zsh-bd = callPackage ../shells/zsh/zsh-bd { }; + zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { }; + zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-history = callPackage ../shells/zsh/zsh-history { }; @@ -9403,6 +9812,24 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; + adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + + adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; @@ -9581,6 +10008,7 @@ in }; }; + clang_12 = llvmPackages_12.clang; clang_11 = llvmPackages_11.clang; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; @@ -9642,12 +10070,11 @@ in inherit (callPackages ../development/compilers/crystal { llvmPackages = llvmPackages_10; }) - crystal_0_31 - crystal_0_32 crystal_0_33 crystal_0_34 crystal_0_35 crystal_0_36 + crystal_1_0 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; @@ -9846,6 +10273,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if stdenv.isDarwin then null else if stdenv.targetPlatform.isRedox @@ -9862,6 +10292,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -9874,6 +10307,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -9965,7 +10401,7 @@ in profiledCompiler = false; }); - libgccjit = gcc9.cc.override { + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; langCC = false; @@ -10086,8 +10522,7 @@ in krank = haskell.lib.justStaticExecutables haskellPackages.krank; - # We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12. - stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal; + stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal; all-cabal-hashes = callPackage ../data/misc/hackage { }; @@ -10116,10 +10551,13 @@ in graphviz = graphviz-nox; }); - inherit (callPackage ../development/compilers/haxe { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }) haxe_3_2 haxe_3_4; - haxe = haxe_3_4; + inherit (callPackage ../development/compilers/haxe { }) + haxe_4_2 + haxe_3_4 + haxe_3_2 + ; + + haxe = haxe_4_2; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; @@ -10141,41 +10579,35 @@ in glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = if stdenv.isAarch64 then - srcOnly { - name = "go-1.8-linux-arm64-bootstrap"; - src = fetchurl { - url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; - sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; - }; - } - else - callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; + }); + + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_15; + go = go_1_16; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -10403,32 +10835,26 @@ in jwasm = callPackage ../development/compilers/jwasm { }; - knightos-genkfs = callPackage ../development/tools/knightos/genkfs { - asciidoc = asciidoc-full; - }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; knightos-kcc = callPackage ../development/tools/knightos/kcc { }; - knightos-kimg = callPackage ../development/tools/knightos/kimg { - asciidoc = asciidoc-full; - }; + knightos-kimg = callPackage ../development/tools/knightos/kimg { }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; - knightos-mkrom = callPackage ../development/tools/knightos/mkrom { - asciidoc = asciidoc-full; - }; + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; - knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { - asciidoc = asciidoc-full; - }; + knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; knightos-scas = callPackage ../development/tools/knightos/scas { }; knightos-z80e = callPackage ../development/tools/knightos/z80e { }; + koka = haskellPackages.callPackage ../development/compilers/koka { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -10460,6 +10886,7 @@ in lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; lld_11 = llvmPackages_11.lld; + lld_12 = llvmPackages_12.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -10469,10 +10896,12 @@ in lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; lldb_11 = llvmPackages_11.lldb; + lldb_12 = llvmPackages_12.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; @@ -10481,7 +10910,7 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvmPackages = recurseIntoAttrs (with targetPlatform; + llvmPackages = with targetPlatform; if isDarwin then llvmPackages_7 else if isFreeBSD then @@ -10491,55 +10920,63 @@ in else if isWasm then llvmPackages_8 else - llvmPackages_latest); + llvmPackages_latest; - llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - }; + }); - llvmPackages_6 = callPackage ../development/compilers/llvm/6 { + llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - }; + }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + }); - llvmPackages_8 = callPackage ../development/compilers/llvm/8 { + llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - }; + }); - llvmPackages_9 = callPackage ../development/compilers/llvm/9 { + llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - }; + }); - llvmPackages_10 = callPackage ../development/compilers/llvm/10 { + llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; - }; + }); - llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + })); + + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_12.tools; + targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); llvmPackages_latest = llvmPackages_11; - llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; + llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -10613,9 +11050,8 @@ in muon = callPackage ../development/compilers/muon { }; - nim = callPackage ../development/compilers/nim { }; - nim-unwrapped = nim.unwrapped; - nimble-unwrapped = nim.nimble-unwrapped; + inherit (callPackages ../development/compilers/nim { }) + nim-unwrapped nimble-unwrapped nim; nrpl = callPackage ../development/tools/nrpl { }; @@ -10651,7 +11087,7 @@ in ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0; orc = callPackage ../development/compilers/orc { }; @@ -10668,7 +11104,7 @@ in ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_03; + ocamlPackages = ocaml-ng.ocamlPackages_4_04; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -10745,14 +11181,14 @@ in rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_49 = callPackage ../development/compilers/rust/1_49.nix { + rust_1_50 = callPackage ../development/compilers/rust/1_50.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_49; + rust = rust_1_50; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_49 = rust_1_49.packages.stable; - rustPackages = rustPackages_1_49; + rustPackages_1_50 = rust_1_50.packages.stable; + rustPackages = rustPackages_1_50; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -10782,6 +11218,7 @@ in cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10813,11 +11250,13 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -10835,6 +11274,7 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10854,6 +11294,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { + inherit (darwin.apple_sdk.frameworks) Security; + }; + crate2nix = callPackage ../development/tools/rust/crate2nix { }; convco = callPackage ../development/tools/convco { @@ -10872,7 +11316,9 @@ in rustracerd = callPackage ../development/tools/rust/racerd { inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (callPackage ../development/tools/rust/rust-analyzer { }) + inherit (callPackage ../development/tools/rust/rust-analyzer { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }) rust-analyzer-unwrapped rust-analyzer; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { @@ -10885,8 +11331,11 @@ in sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbcl_2_0_8 = callPackage ../development/compilers/sbcl/2.0.8.nix {}; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; - sbcl = callPackage ../development/compilers/sbcl {}; + sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; + sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; + sbcl = sbcl_2_1_2; scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; @@ -10918,7 +11367,9 @@ in smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = callPackage ../development/compilers/solc { }; + solc = solc_0_8; + solc_0_8 = callPackage ../development/compilers/solc { }; + solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { }; souffle = callPackage ../development/compilers/souffle { autoreconfHook = buildPackages.autoreconfHook269; @@ -10932,7 +11383,9 @@ in jdk = oraclejdk; }; - sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { }; + sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; + }; squeak = callPackage ../development/compilers/squeak { }; @@ -10998,6 +11451,7 @@ in vala_0_44 vala_0_46 vala_0_48 + vala_0_50 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -11122,7 +11576,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackage ./dhall-packages.nix { }; + dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; @@ -11284,6 +11738,8 @@ in overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; }; + octavePackages = recurseIntoAttrs octave.pkgs; + ocropus = callPackage ../applications/misc/ocropus { }; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -11293,9 +11749,10 @@ in # # Set default PHP interpreter, extensions and packages php = php74; - phpExtensions = php74Extensions; - phpPackages = php74Packages; + phpExtensions = php.extensions; + phpPackages = php.packages; + # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -11344,38 +11801,46 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override { self = pythonFull; + pythonAttr = "pythonFull"; x11Support = true; }; python2Full = python2.override { self = python2Full; + pythonAttr = "python2Full"; x11Support = true; }; python27Full = python27.override { self = python27Full; + pythonAttr = "python27Full"; x11Support = true; }; python3Full = python3.override { self = python3Full; + pythonAttr = "python3Full"; bluezSupport = true; x11Support = true; }; python36Full = python36.override { self = python36Full; + pythonAttr = "python36Full"; bluezSupport = true; x11Support = true; }; python37Full = python37.override { self = python37Full; + pythonAttr = "python37Full"; bluezSupport = true; x11Support = true; }; python38Full = python38.override { self = python38Full; + pythonAttr = "python38Full"; bluezSupport = true; x11Support = true; }; python39Full = python39.override { self = python39Full; + pythonAttr = "python39Full"; bluezSupport = true; x11Support = true; }; @@ -11391,7 +11856,7 @@ in # Python package sets. python27Packages = python27.pkgs; python36Packages = python36.pkgs; - python37Packages = recurseIntoAttrs python37.pkgs; + python37Packages = python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; python39Packages = recurseIntoAttrs python39.pkgs; python310Packages = python310.pkgs; @@ -11407,8 +11872,6 @@ in # Should eventually be moved inside Python interpreters. python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - python2nix = callPackage ../tools/package-management/python2nix { }; - pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); pypi2nix = callPackage ../development/tools/pypi2nix {}; @@ -11503,7 +11966,8 @@ in ruby_2_4 ruby_2_5 ruby_2_6 - ruby_2_7; + ruby_2_7 + ruby_3_0; ruby = ruby_2_6; rubyPackages = rubyPackages_2_6; @@ -11517,6 +11981,7 @@ in rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; + rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; ruby_1_9-gems = recurseIntoAttrs ruby_1_9.gems; ruby_2_0-gems = recurseIntoAttrs ruby_2_0.gems; @@ -11540,12 +12005,6 @@ in sparkleshare = callPackage ../applications/version-management/sparkleshare { }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ - inherit (darwin) libobjc; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); - spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; @@ -11566,6 +12025,8 @@ in tclreadline = callPackage ../development/interpreters/tclreadline { }; + trealla = callPackage ../development/interpreters/trealla { }; + wasm = ocamlPackages.wasm; proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; @@ -11652,6 +12113,10 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + umr = callPackage ../development/misc/umr { + llvmPackages = llvmPackages_latest; + }; + srandrd = callPackage ../tools/X11/srandrd { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -11710,9 +12175,10 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_5; + apacheKafka = apacheKafka_2_6; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; + apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; }; kt = callPackage ../tools/misc/kt {}; @@ -11724,12 +12190,14 @@ in astyle = callPackage ../development/tools/misc/astyle { }; + automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { }; + awf = callPackage ../development/tools/misc/awf { }; aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11 electron_12; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -11855,7 +12323,6 @@ in }); bison = callPackage ../development/tools/parsing/bison { }; - yacc = bison; # TODO: move to aliases.nix # Ruby fails to build with current bison bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { @@ -12000,6 +12467,8 @@ in cookiecutter = with python3Packages; toPythonApplication cookiecutter; + corrosion = callPackage ../development/tools/build-managers/corrosion { }; + corundum = callPackage ../development/tools/corundum { }; confluent-platform = callPackage ../servers/confluent-platform {}; @@ -12053,8 +12522,7 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_8; - stdenv = llvmPackages_8.stdenv; + llvmPackages = llvmPackages_latest; }; credstash = with python3Packages; toPythonApplication credstash; @@ -12069,6 +12537,10 @@ in csslint = callPackage ../development/web/csslint { }; + cvise = python3Packages.callPackage ../development/tools/misc/cvise { + inherit (llvmPackages_11) llvm clang-unwrapped; + }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -12230,7 +12702,7 @@ in ffuf = callPackage ../tools/security/ffuf { }; flow = callPackage ../development/tools/analysis/flow { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; + ocamlPackages = ocaml-ng.ocamlPackages_4_09; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -12272,7 +12744,7 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; + fedpkg = callPackage ../development/tools/fedpkg { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -12285,6 +12757,8 @@ in inherit (xorg) libX11 libXext libXi libXtst; }; + gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; + github-release = callPackage ../development/tools/github/github-release { }; global = callPackage ../development/tools/misc/global { }; @@ -12329,6 +12803,8 @@ in gputils = callPackage ../development/tools/misc/gputils { }; + gpuvis = callPackage ../development/tools/misc/gpuvis { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -12337,6 +12813,7 @@ in gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; gradle_6 = res.gradleGen.gradle_6_8; + gradle_7 = res.gradleGen.gradle_7; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -12434,6 +12911,8 @@ in augustus = callPackage ../games/augustus { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; @@ -12452,6 +12931,7 @@ in khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + krankerl = callPackage ../development/tools/krankerl { }; krew = callPackage ../development/tools/krew { }; @@ -12473,6 +12953,8 @@ in kustomize = callPackage ../development/tools/kustomize { }; + kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { }; + ktlint = callPackage ../development/tools/ktlint { }; kythe = callPackage ../development/tools/kythe { }; @@ -12515,16 +12997,16 @@ in lttv = callPackage ../development/tools/misc/lttv { }; + luaformatter = callPackage ../development/tools/luaformatter { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; - go-md2man = callPackage ../development/tools/misc/md2man {}; + go-md2man = callPackage ../development/tools/misc/go-md2man {}; mage = callPackage ../development/tools/build-managers/mage { }; @@ -12596,7 +13078,7 @@ in gconf = pkgs.gnome2.GConf; }; - # NOTE: Override and set icon-lang = null to use Awk instead of Icon. + # NOTE: Override and set useIcon = false to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; @@ -12613,14 +13095,14 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { - autoreconfHook = buildPackages.autoreconfHook269; - }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; }; + pactorio = callPackage ../development/tools/pactorio { }; + pahole = callPackage ../development/tools/misc/pahole {}; panopticon = callPackage ../development/tools/analysis/panopticon {}; @@ -12667,6 +13149,8 @@ in }; })); + polar = callPackage ../tools/misc/polar { }; + inherit (nodePackages) postcss-cli; postiats-utilities = callPackage ../development/tools/postiats-utilities {}; @@ -12675,6 +13159,8 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; + pqrs = callPackage ../development/tools/pqrs { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -12707,12 +13193,14 @@ in r10k = callPackage ../tools/system/r10k { }; - inherit (callPackages ../development/tools/analysis/radare2 ({ + radare2 = callPackage ../development/tools/analysis/radare2 ({ inherit (gnome2) vte; lua = lua5; - } // (config.radare or {}))) radare2 r2-for-cutter; + } // (config.radare or {})); + + rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; - radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; ragel = ragelStable; @@ -12770,8 +13258,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - scaff = callPackage ../development/tools/scaff { }; - sd-local = callPackage ../development/tools/sd-local { }; selenium-server-standalone = callPackage ../development/tools/selenium/server { }; @@ -12780,6 +13266,8 @@ in semver-tool = callPackage ../development/tools/misc/semver-tool { }; + semantik = libsForQt5.callPackage ../applications/office/semantik { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; @@ -12795,6 +13283,8 @@ in scss-lint = callPackage ../development/tools/scss-lint { }; + segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; + shadowenv = callPackage ../tools/misc/shadowenv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12805,11 +13295,13 @@ in inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_11 - shards_0_12 + shards_0_14 shards; shellcheck = callPackage ../development/tools/shellcheck {}; + shellharden = callPackage ../development/tools/shellharden {}; + schemaspy = callPackage ../development/tools/database/schemaspy { }; shncpd = callPackage ../tools/networking/shncpd { }; @@ -12966,11 +13458,16 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + uddup = python3Packages.callPackage ../tools/security/uddup { }; + udis86 = callPackage ../development/tools/udis86 { }; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; - uhd = callPackage ../applications/radio/uhd { }; + uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; + uhd = callPackage ../applications/radio/uhd { + boost = boost17x; + }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -13014,6 +13511,8 @@ in vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; + whatstyle = callPackage ../development/tools/misc/whatstyle { inherit (llvmPackages) clang-unwrapped; }; @@ -13026,6 +13525,8 @@ in xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; + xcode-install = callPackage ../development/tools/xcode-install { }; + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; @@ -13111,6 +13612,8 @@ in agg = callPackage ../development/libraries/agg { }; + alass = callPackage ../applications/video/alass { }; + allegro = allegro4; allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; @@ -13123,6 +13626,8 @@ in amrwb = callPackage ../development/libraries/amrwb { }; + ansi2html = with python3.pkgs; toPythonApplication ansi2html; + anttweakbar = callPackage ../development/libraries/AntTweakBar { }; appstream = callPackage ../development/libraries/appstream { }; @@ -13195,7 +13700,9 @@ in aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; - aws-c-io = callPackage ../development/libraries/aws-c-io { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { + inherit (darwin.apple_sdk.frameworks) Security; + }; aws-checksums = callPackage ../development/libraries/aws-checksums { }; @@ -13217,6 +13724,8 @@ in bctoolbox = callPackage ../development/libraries/bctoolbox { }; + bearssl = callPackage ../development/libraries/bearssl { }; + beecrypt = callPackage ../development/libraries/beecrypt { }; belcard = callPackage ../development/libraries/belcard { }; @@ -13303,6 +13812,8 @@ in hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; + hci = callPackage ../development/tools/continuous-integration/hci { }; + niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -13476,7 +13987,7 @@ in cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; }; # Make bdb5 the default as it is the last release under the custom @@ -13717,7 +14228,7 @@ in fstrm = callPackage ../development/libraries/fstrm { }; - cfitsio = callPackage ../development/libraries/cfitsio { }; + cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { }; fontconfig = callPackage ../development/libraries/fontconfig { }; @@ -13751,6 +14262,8 @@ in funambol = callPackage ../development/libraries/funambol { }; + galer = callPackage ../tools/security/galer { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; gamin = callPackage ../development/libraries/gamin { }; @@ -13758,6 +14271,11 @@ in ganv = callPackage ../development/libraries/ganv { }; + garble = callPackage ../build-support/go/garble.nix { + # https://github.com/burrowers/garble/issues/124 + buildGoModule = buildGo115Module; + }; + gcab = callPackage ../development/libraries/gcab { }; gcovr = with python3Packages; toPythonApplication gcovr; @@ -13822,8 +14340,6 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; - gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; gdcm = callPackage ../development/libraries/gdcm { }; @@ -13866,6 +14382,8 @@ in libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; + libhsts = callPackage ../development/libraries/libhsts { }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { }; @@ -14029,7 +14547,7 @@ in gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = newScope { libav = pkgs.ffmpeg; }; - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); gusb = callPackage ../development/libraries/gusb { }; @@ -14363,8 +14881,13 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu68 = callPackage ../development/libraries/icu/68.nix ({ + nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu67; + icu = icu68; id3lib = callPackage ../development/libraries/id3lib { }; @@ -14401,7 +14924,9 @@ in indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; - indilib = callPackage ../development/libraries/indilib { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; + indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { }; + indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; @@ -14428,8 +14953,8 @@ in iso-flags = callPackage ../data/icons/iso-flags { }; ispc = callPackage ../development/compilers/ispc { - stdenv = llvmPackages_10.stdenv; - llvmPackages = llvmPackages_10; + stdenv = llvmPackages_11.stdenv; + llvmPackages = llvmPackages_11; }; isso = callPackage ../servers/isso { }; @@ -14446,6 +14971,8 @@ in jansson = callPackage ../development/libraries/jansson { }; + jasper = callPackage ../development/libraries/jasper { }; + jbig2dec = callPackage ../development/libraries/jbig2dec { }; jcal = callPackage ../development/libraries/jcal { }; @@ -14498,7 +15025,6 @@ in }; krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; - kerberos = libkrb5; # TODO: move to aliases.nix l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; @@ -14618,7 +15144,7 @@ in libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_07) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -14794,6 +15320,8 @@ in libdmtx = callPackage ../development/libraries/libdmtx { }; + libdmapsharing = callPackage ../development/libraries/libdmapsharing { }; + libdnet = callPackage ../development/libraries/libdnet { }; libdnf = callPackage ../tools/package-management/libdnf { }; @@ -14866,6 +15394,10 @@ in libfprint = callPackage ../development/libraries/libfprint { }; + libfprint-tod = callPackage ../development/libraries/libfprint-tod { }; + + libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; + libfpx = callPackage ../development/libraries/libfpx { }; libgadu = callPackage ../development/libraries/libgadu { }; @@ -14903,7 +15435,9 @@ in libgxps = callPackage ../development/libraries/libgxps { }; - libiio = callPackage ../development/libraries/libiio { }; + libiio = callPackage ../development/libraries/libiio { + python = python3; + }; libinjection = callPackage ../development/libraries/libinjection { }; @@ -14943,7 +15477,9 @@ in liblscp = callPackage ../development/libraries/liblscp { }; - libe-book = callPackage ../development/libraries/libe-book {}; + libe-book = callPackage ../development/libraries/libe-book { + icu = icu67; + }; libechonest = callPackage ../development/libraries/libechonest { }; @@ -15144,6 +15680,11 @@ in librime = callPackage ../development/libraries/librime {}; + librsb = callPackage ../development/libraries/librsb { + # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec + memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; + }; + librtprocess = callPackage ../development/libraries/librtprocess { }; libsamplerate = callPackage ../development/libraries/libsamplerate { @@ -15158,6 +15699,8 @@ in libspectre = callPackage ../development/libraries/libspectre { }; + libspnav = callPackage ../development/libraries/libspnav { }; + libgsf = callPackage ../development/libraries/libgsf { }; # GNU libc provides libiconv so systems with glibc don't need to build @@ -15235,6 +15778,8 @@ in libmicrohttpd = libmicrohttpd_0_9_72; }; + libjwt = callPackage ../development/libraries/libjwt { }; + libkate = callPackage ../development/libraries/libkate { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; @@ -15343,7 +15888,7 @@ in libnih = callPackage ../development/libraries/libnih { }; - libnova = callPackage ../development/libraries/libnova { }; + libnova = callPackage ../development/libraries/science/astronomy/libnova { }; libnxml = callPackage ../development/libraries/libnxml { }; @@ -15379,7 +15924,7 @@ in libosmocore = callPackage ../applications/misc/libosmocore { }; - libosmpbf = callPackage ../development/libraries/libosmpbf {}; + libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; libotr = callPackage ../development/libraries/libotr { }; @@ -15395,6 +15940,8 @@ in libpeas = callPackage ../development/libraries/libpeas { }; + libpg_query = callPackage ../development/libraries/libpg_query { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; libpgf = callPackage ../development/libraries/libpgf { }; @@ -15407,6 +15954,8 @@ in libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; + libpostal = callPackage ../development/libraries/libpostal { }; + libpaper = callPackage ../development/libraries/libpaper { }; libpfm = callPackage ../development/libraries/libpfm { }; @@ -15429,7 +15978,9 @@ in libpwquality = callPackage ../development/libraries/libpwquality { }; - libqalculate = callPackage ../development/libraries/libqalculate { }; + libqalculate = callPackage ../development/libraries/libqalculate { + readline = readline80; + }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; @@ -15447,6 +15998,8 @@ in libsearpc = callPackage ../development/libraries/libsearpc { }; + libseat = callPackage ../development/libraries/libseat { }; + libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -15541,6 +16094,8 @@ in libtoxcore_0_1 libtoxcore_0_2; libtoxcore = libtoxcore_0_2; + libtpms = callPackage ../tools/security/libtpms { }; + libtap = callPackage ../development/libraries/libtap { }; libtgvoip = callPackage ../development/libraries/libtgvoip { }; @@ -15670,6 +16225,8 @@ in libx86 = callPackage ../development/libraries/libx86 {}; + libxcrypt = callPackage ../development/libraries/libxcrypt { }; + libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; libxkbcommon = libxkbcommon_8; @@ -15706,9 +16263,7 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { - python = if stdenv.isDarwin then python2 else python3; - }; + libxslt = callPackage ../development/libraries/libxslt { }; libxsmm = callPackage ../development/libraries/libxsmm { }; @@ -15805,10 +16360,14 @@ in matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + maxflow = callPackage ../development/libraries/maxflow { }; + mbedtls = callPackage ../development/libraries/mbedtls { }; mdctags = callPackage ../development/tools/misc/mdctags { }; + md4c = callPackage ../development/libraries/md4c { }; + mdds = callPackage ../development/libraries/mdds { }; mediastreamer = callPackage ../development/libraries/mediastreamer { }; @@ -15944,11 +16503,15 @@ in ndpi = callPackage ../development/libraries/ndpi { }; + nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; + nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - notcurses = callPackage ../development/libraries/notcurses { }; + notcurses = callPackage ../development/libraries/notcurses { + readline = readline80; + }; ncurses5 = ncurses.override { abiVersion = "5"; @@ -15973,11 +16536,11 @@ in openssl = openssl_1_0_2; }; - nettle = callPackage ../development/libraries/nettle { }; + nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {}; - newt = callPackage ../development/libraries/newt { }; + newt = callPackage ../development/libraries/newt { python = python3; }; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; @@ -16094,7 +16657,7 @@ in openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackages ../development/libraries/openbabel { }; + openbabel3 = callPackage ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -16165,12 +16728,12 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_0 - libressl_3_1; + libressl_3_1 + libressl_3_2; # Please keep this pointed to the latest version. See also # https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2 - libressl = libressl_3_1; + libressl = libressl_3_2; boringssl = callPackage ../development/libraries/boringssl { }; @@ -16248,6 +16811,8 @@ in pkgdiff = callPackage ../tools/misc/pkgdiff { }; + place-cursor-at = haskell.lib.justStaticExecutables haskellPackages.place-cursor-at; + plib = callPackage ../development/libraries/plib { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; @@ -16258,8 +16823,6 @@ in polkit = callPackage ../development/libraries/polkit { }; - polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; @@ -16290,6 +16853,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + prime-server = callPackage ../development/libraries/prime-server { }; + primesieve = callPackage ../development/libraries/science/math/primesieve { }; prison = callPackage ../development/libraries/prison { }; @@ -16309,8 +16874,9 @@ in python = python37; }; - protobuf = protobuf3_14; + protobuf = protobuf3_15; + protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; @@ -16344,6 +16910,8 @@ in pybind11 = pythonPackages.pybind11; + pylode = callPackage ../misc/pylode {}; + python-qt = callPackage ../development/libraries/python-qt { python = python27; inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; @@ -16363,10 +16931,6 @@ in qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; - qt3 = callPackage ../development/libraries/qt-3 { - libpng = libpng12; - }; - qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { @@ -16427,7 +16991,7 @@ in qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; inherit bison; inherit cups; inherit dconf; @@ -16505,6 +17069,8 @@ in raul = callPackage ../development/libraries/audio/raul { }; + raylib = callPackage ../development/libraries/raylib { }; + readline = readline6; readline6 = readline63; @@ -16520,6 +17086,8 @@ in readosm = callPackage ../development/libraries/readosm { }; + rinutils = callPackage ../development/libraries/rinutils { }; + kissfft = callPackage ../development/libraries/kissfft { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -16552,13 +17120,7 @@ in qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { - # 3.8 support is not ready yet: - # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573 - # The non minimal build is used because the 'qtgui' component is needed. - # gr-osmosdr is using the same gnuradio as of now. - gnuradio = gnuradio3_7-unwrapped; - }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -16595,6 +17157,8 @@ in rubberband = callPackage ../development/libraries/rubberband { }; + s2geometry = callPackage ../development/libraries/s2geometry { }; + /* 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 @@ -16670,13 +17234,15 @@ in sfsexp = callPackage ../development/libraries/sfsexp {}; + shhgit = callPackage ../tools/security/shhgit { }; + shhmsg = callPackage ../development/libraries/shhmsg { }; shhopt = callPackage ../development/libraries/shhopt { }; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - s2n = callPackage ../development/libraries/s2n { }; + s2n-tls = callPackage ../development/libraries/s2n-tls { }; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -16892,8 +17458,6 @@ in stlink = callPackage ../development/tools/misc/stlink { }; - steghide = callPackage ../tools/security/steghide {}; - stegseek = callPackage ../tools/security/stegseek {}; stlport = callPackage ../development/libraries/stlport { }; @@ -17043,7 +17607,9 @@ in tremor = callPackage ../development/libraries/tremor { }; - trillian = callPackage ../tools/misc/trillian { }; + trillian = callPackage ../tools/misc/trillian { + buildGoModule = buildGo115Module; + }; twolame = callPackage ../development/libraries/twolame { }; @@ -17098,12 +17664,8 @@ in stdenv = gcc6Stdenv; }); - v8_6_x = v8; v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python; - } // lib.optionalAttrs stdenv.isLinux { - # doesn't build with gcc7 - stdenv = gcc6Stdenv; }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; @@ -17114,6 +17676,10 @@ in vale = callPackage ../tools/text/vale { }; + valhalla = callPackage ../development/libraries/valhalla { + boost = boost.override { enablePython = true; python = python38; }; + }; + vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vc = callPackage ../development/libraries/vc { }; @@ -17197,7 +17763,7 @@ in waylandpp = callPackage ../development/libraries/waylandpp { }; - wcslib = callPackage ../development/libraries/wcslib { }; + wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; @@ -17335,8 +17901,6 @@ in yder = callPackage ../development/libraries/yder { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -17353,8 +17917,6 @@ in pythonPackages = python3Packages; }; - yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; @@ -17367,6 +17929,8 @@ in zlib = callPackage ../development/libraries/zlib { }; + zlib-ng = callPackage ../development/libraries/zlib-ng { }; + libdynd = callPackage ../development/libraries/libdynd { }; zlog = callPackage ../development/libraries/zlog { }; @@ -17398,6 +17962,8 @@ in zziplib = callPackage ../development/libraries/zziplib { }; + glpng = callPackage ../development/libraries/glpng { }; + gsignond = callPackage ../development/libraries/gsignond { plugins = []; }; @@ -17496,8 +18062,11 @@ in buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; + buildGo116Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_16; + }; - buildGoPackage = buildGo115Package; + buildGoPackage = buildGo116Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -17505,8 +18074,11 @@ in buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; + buildGo116Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_16; + }; - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -17551,6 +18123,10 @@ in }; quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp)); quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl)); + quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp ecl)); + quicklispPackagesCCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp ccl)); + quicklispPackagesABCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp abcl)); + quicklispPackagesGCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp gcl)); quicklispPackages = quicklispPackagesSBCL; ### DEVELOPMENT / PERL MODULES @@ -17614,12 +18190,14 @@ in ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { - kerberos = libkrb5; - }; + _389-ds-base = callPackage ../servers/ldap/389 { }; adguardhome = callPackage ../servers/adguardhome {}; + alerta = callPackage ../servers/monitoring/alerta/client.nix { }; + + alerta-server = callPackage ../servers/monitoring/alerta { }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; @@ -17640,7 +18218,7 @@ in mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; @@ -17659,7 +18237,7 @@ in subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); + apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -17708,6 +18286,7 @@ in bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; + dig = bind.dnsutils; inherit (callPackages ../servers/bird { }) bird bird6 bird2; @@ -17845,7 +18424,9 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo115Module; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -17894,6 +18475,10 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; + inspircd = callPackage ../servers/irc/inspircd { }; + + inspircdMinimal = inspircd.override { extraModules = []; }; + imgproxy = callPackage ../servers/imgproxy { }; ircdog = callPackage ../applications/networking/irc/ircdog { }; @@ -17939,7 +18524,11 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; - mastodon = callPackage ../servers/mastodon { }; + mastodon = callPackage ../servers/mastodon { + # With nodejs v14 the streaming endpoint breaks. Need migrate to uWebSockets.js or similar. + # https://github.com/tootsuite/mastodon/issues/15184 + nodejs-slim = nodejs-slim-12_x; + }; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; @@ -17975,7 +18564,7 @@ in mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; - inherit (callPackages ../servers/mpd { }) + inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; @@ -18045,11 +18634,15 @@ in nix-tour = callPackage ../applications/misc/nix-tour {}; + nosqli = callPackage ../tools/security/nosqli { }; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + oauth2_proxy = callPackage ../servers/oauth2_proxy { + buildGoModule = buildGo115Module; + }; openbgpd = callPackage ../servers/openbgpd { }; @@ -18090,6 +18683,8 @@ in }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; + pomerium = callPackage ../servers/http/pomerium { }; + postgrey = callPackage ../servers/mail/postgrey { }; pshs = callPackage ../servers/http/pshs { }; @@ -18177,7 +18772,6 @@ in inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; - mysql = mariadb; # TODO: move to aliases.nix mongodb = hiPrio mongodb-3_4; @@ -18233,6 +18827,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost173; # Configure checks for specific version. protobuf = protobuf3_7; + icu = icu67; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -18327,24 +18922,30 @@ 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 = buildGo115Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; + prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; + prometheus-bitcoin-exporter = callPackage ../servers/monitoring/prometheus/bitcoin-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; - prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; + prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; + prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; + prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; @@ -18356,6 +18957,7 @@ in prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; @@ -18367,6 +18969,7 @@ in prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; + prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; @@ -18388,10 +18991,6 @@ in pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; - - pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { @@ -18436,13 +19035,11 @@ in # Fails to compile with boost >= 1.72 rippled = callPackage ../servers/rippled { - boost = boost171; + boost = boost17x; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { - boost = boost167.override { - enableStatic = true; - }; + boost = boost17x; }; roon-server = callPackage ../servers/roon-server { }; @@ -18657,6 +19254,7 @@ in zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version}; + agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version}; proxy-pgsql = (callPackages ../servers/monitoring/zabbix/proxy.nix { postgresqlSupport = true; }).${version}; proxy-sqlite = (callPackages ../servers/monitoring/zabbix/proxy.nix { sqliteSupport = true; }).${version}; @@ -18670,7 +19268,6 @@ in zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); - zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); zabbix = zabbix50; @@ -18704,7 +19301,9 @@ in alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; - alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + alsaUtils = callPackage ../os-specific/linux/alsa-utils { + fftw = fftwFloat; + }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-tools { }; @@ -18812,6 +19411,8 @@ in criu = callPackage ../os-specific/linux/criu { }; + cryptomator = callPackage ../tools/security/cryptomator { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; @@ -18858,6 +19459,8 @@ in fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; + fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; + fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; @@ -18904,7 +19507,7 @@ in fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { util-linux = util-linuxMinimal; }); - fuse = lowPrio fusePackages.fuse_2; + fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -18969,7 +19572,6 @@ in iotop = callPackage ../os-specific/linux/iotop { }; iproute2 = callPackage ../os-specific/linux/iproute { }; - iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix) iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; @@ -19041,12 +19643,17 @@ in inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; - osxfuse = callPackage ../os-specific/darwin/osxfuse { }; + macfuse-stubs = callPackage ../os-specific/darwin/macfuse { + inherit (darwin) libtapi; + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; power-calibrate = callPackage ../os-specific/linux/power-calibrate { }; + powercap = callPackage ../os-specific/linux/powercap { }; + powerstat = callPackage ../os-specific/linux/powerstat { }; smemstat = callPackage ../os-specific/linux/smemstat { }; @@ -19156,14 +19763,14 @@ in ]; }; - linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -19178,6 +19785,14 @@ in ]; }; + linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19214,6 +19829,13 @@ in ]; }; + linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + /* 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 @@ -19300,6 +19922,8 @@ in tbs = callPackage ../os-specific/linux/tbs { }; + mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); @@ -19337,7 +19961,8 @@ in rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; - rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; + rtw88 = callPackage ../os-specific/linux/rtw88 { }; + rtlwifi_new = rtw88; openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; @@ -19374,6 +19999,8 @@ in sch_cake = callPackage ../os-specific/linux/sch_cake { }; + isgx = callPackage ../os-specific/linux/isgx { }; + sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -19394,6 +20021,8 @@ in v86d = callPackage ../os-specific/linux/v86d { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; virtualbox = callPackage ../os-specific/linux/virtualbox { @@ -19423,20 +20052,20 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_5_4; + linuxPackages = linuxPackages_5_10; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_10; + linuxPackages_latest = linuxPackages_5_11; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; + linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_10; + linuxPackages-rt_latest = linuxPackages-rt_5_11; linux-rt = linuxPackages-rt.kernel; linux-rt_latest = linuxPackages-rt_latest.kernel; @@ -19452,6 +20081,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); + linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -19489,7 +20119,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_10; + linux_latest_for_hardened = pkgs.linux_5_11; 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 { @@ -19528,6 +20158,9 @@ in linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); + # XanMod kernel + linuxPackages_xanmod = recurseIntoAttrs (linuxPackagesFor pkgs.linux_xanmod); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -19659,6 +20292,9 @@ in musl = callPackage ../os-specific/linux/musl { }; + musl-fts = callPackage ../os-specific/linux/musl-fts { }; + musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; + nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -19680,11 +20316,15 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; + air = callPackage ../development/tools/air { }; + delve = callPackage ../development/tools/delve { }; dep = callPackage ../development/tools/dep { }; @@ -19749,6 +20389,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + go-mockery = callPackage ../development/tools/go-mockery { }; + gomacro = callPackage ../development/tools/gomacro { }; gomodifytags = callPackage ../development/tools/gomodifytags { }; @@ -19757,6 +20399,8 @@ in gopls = callPackage ../development/tools/gopls { }; + gops = callPackage ../development/tools/gops { }; + gore = callPackage ../development/tools/gore { }; gotests = callPackage ../development/tools/gotests { }; @@ -19843,6 +20487,8 @@ in powerdns = callPackage ../servers/dns/powerdns { }; + powerdns-admin = callPackage ../applications/networking/powerdns-admin { }; + dnsdist = callPackage ../servers/dns/dnsdist { }; pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; @@ -19905,7 +20551,7 @@ in rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; - rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; + rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -20054,11 +20700,13 @@ in ubootClearfog ubootGuruplug ubootJetsonTK1 + ubootNanoPCT4 ubootNovena ubootOdroidC2 ubootOdroidXU3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 + ubootOrangePiZero ubootPcduino3Nano ubootPine64 ubootPine64LTS @@ -20134,6 +20782,8 @@ in v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; + vendir = callPackage ../development/tools/vendir { }; + vndr = callPackage ../development/tools/vndr { }; windows = callPackages ../os-specific/windows {}; @@ -20511,6 +21161,8 @@ in julia-mono = callPackage ../data/fonts/julia-mono { }; + juno-theme = callPackage ../data/themes/juno { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; @@ -20522,11 +21174,14 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (gnome3) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; koreader = callPackage ../applications/misc/koreader {}; + kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -20653,6 +21308,8 @@ in mustache-go = callPackage ../development/tools/mustache-go { }; + mustache-hpp = callPackage ../development/libraries/mustache-hpp { }; + myrica = callPackage ../data/fonts/myrica { }; nafees = callPackage ../data/fonts/nafees { }; @@ -20706,8 +21363,12 @@ in openzone-cursors = callPackage ../data/themes/openzone { }; + oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; + orbitron = callPackage ../data/fonts/orbitron { }; + orchis = callPackage ../data/themes/orchis { }; + orion = callPackage ../data/themes/orion {}; overpass = callPackage ../data/fonts/overpass { }; @@ -20728,6 +21389,8 @@ in papis = with python3Packages; toPythonApplication papis; + paperlike-go = callPackage ../tools/misc/paperlike-go { }; + paps = callPackage ../tools/misc/paps { }; pecita = callPackage ../data/fonts/pecita {}; @@ -20791,6 +21454,8 @@ in sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + savepagenow = callPackage ../tools/misc/savepagenow { }; + scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; scowl = callPackage ../data/misc/scowl { }; @@ -20801,6 +21466,8 @@ in shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; + sjasmplus = callPackage ../development/compilers/sjasmplus { }; + skeu = callPackage ../data/themes/skeu { }; sweet = callPackage ../data/themes/sweet { }; @@ -20882,7 +21549,6 @@ in maligned = callPackage ../development/tools/maligned { }; - inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; scientifica = callPackage ../data/fonts/scientifica { }; @@ -21016,6 +21682,8 @@ in vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; + vollkorn = callPackage ../data/fonts/vollkorn { }; + weather-icons = callPackage ../data/fonts/weather-icons { }; wireless-regdb = callPackage ../data/misc/wireless-regdb { }; @@ -21131,6 +21799,8 @@ in }); android-studio = androidStudioPackages.stable; + angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { }; + animbar = callPackage ../applications/graphics/animbar { }; antfs-cli = callPackage ../applications/misc/antfs-cli {}; @@ -21152,6 +21822,7 @@ in apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; + texlive = texlive.combined.scheme-medium; }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; @@ -21276,6 +21947,8 @@ in bandwidth = callPackage ../tools/misc/bandwidth { }; + banking = callPackage ../applications/office/banking { }; + baresip = callPackage ../applications/networking/instant-messengers/baresip { }; barrier = libsForQt5.callPackage ../applications/misc/barrier {}; @@ -21347,8 +22020,14 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blflash = callPackage ../tools/misc/blflash { }; + blogc = callPackage ../applications/misc/blogc { }; + blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { + inherit (haskellPackages) ghcWithPackages; + }; + bluefish = callPackage ../applications/editors/bluefish { gtk = gtk3; }; @@ -21367,6 +22046,8 @@ in bonzomatic = callPackage ../applications/editors/bonzomatic { }; + bottles = callPackage ../applications/misc/bottles { }; + brave = callPackage ../applications/networking/browsers/brave { }; break-time = callPackage ../applications/misc/break-time { }; @@ -21397,7 +22078,11 @@ in bviplus = callPackage ../applications/editors/bviplus { }; - cage = callPackage ../applications/window-managers/cage { }; + caerbannog = callPackage ../applications/misc/caerbannog { }; + + cage = callPackage ../applications/window-managers/cage { + wlroots = wlroots_0_12; + }; calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; @@ -21409,6 +22094,8 @@ in calibre = libsForQt5.callPackage ../applications/misc/calibre { }; + calibre-web = callPackage ../servers/calibre-web { }; + calligra = libsForQt5.callPackage ../applications/office/calligra { # Must use the same Qt version as Calligra itself: poppler = libsForQt5.poppler_0_61; @@ -21428,6 +22115,8 @@ in catfs = callPackage ../os-specific/linux/catfs { }; + catgirl = callPackage ../applications/networking/irc/catgirl { }; + catimg = callPackage ../tools/misc/catimg { }; catt = callPackage ../applications/video/catt { }; @@ -21484,8 +22173,9 @@ in claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix { + claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = true; }; clfswm = callPackage ../applications/window-managers/clfswm { }; @@ -21539,6 +22229,8 @@ in inherit (gnome2) libgnomeui GConf; }; + corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { @@ -21573,12 +22265,16 @@ in coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim { + buildGoPackage = buildGo115Package; + }; cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; + cqrlog = callPackage ../applications/radio/cqrlog { }; + crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { }; @@ -21769,6 +22465,8 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; + ebumeter = callPackage ../applications/audio/ebumeter { }; + echoip = callPackage ../servers/echoip { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { @@ -21812,7 +22510,6 @@ in Xaw3d = null; gconf = null; alsaLib = null; - imagemagick = null; acl = null; gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; @@ -21825,25 +22522,6 @@ in withGTK3 = false; })); - emacs26 = callPackage ../applications/editors/emacs/26.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { - withX = false; - withNS = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -21852,27 +22530,9 @@ in }; emacsPackagesFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv pkgs; - inherit fetchFromGitHub fetchurl; - inherit emacs texinfo makeWrapper runCommand writeText; - inherit (xorg) lndir; - - trivialBuild = callPackage ../build-support/emacs/trivial.nix { - inherit emacs; - }; - - melpaBuild = callPackage ../build-support/emacs/melpa.nix { - inherit emacs; - }; - - external = { - inherit (haskellPackages) - ghc-mod structured-haskell-mode Agda hindent; - inherit - autoconf automake editorconfig-core-c git libffi libpng pkg-config - poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq openssl ott; - }; + inherit (lib) makeScope makeOverridable; + inherit emacs; + pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; inherit (gnome3) empathy; @@ -21899,9 +22559,7 @@ in eq10q = callPackage ../applications/audio/eq10q { }; - errbot = callPackage ../applications/networking/errbot { - python = python3; - }; + errbot = python3Packages.callPackage ../applications/networking/errbot { }; espeak-classic = callPackage ../applications/audio/espeak { }; @@ -22076,79 +22734,103 @@ in gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { - boost = boost166; - gnuradio = gnuradio3_7-unwrapped; - }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; - gnuradio-unwrapped = callPackage ../applications/radio/gnuradio { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python3; + gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python3; + boost = boost17x; + }; }; + gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; # A build without gui components and other utilites not needed for end user # libraries - gnuradioMinimal = gnuradio-unwrapped.override { - features = { - gnuradio-companion = false; - python-support = false; - gr-ctrlport = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - sphinx = false; - doxygen = false; + gnuradioMinimal = gnuradio.override { + wrap = false; + unwrapped = gnuradio.unwrapped.override { + volk = volk.override { + # So it will not reference python + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + gr-blocktool = false; + sphinx = false; + doxygen = false; + }; }; }; - gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = gnuradio-unwrapped; - }; - gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python2; + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python3; + boost = boost17x; + }; }; + gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. - gnuradio3_7Minimal = gnuradio3_7-unwrapped.override { - features = { - gnuradio-companion = false; - python-support = false; - gr-ctrlport = false; - gr-qtgui = false; - gr-utils = false; - sphinx = false; - doxygen = false; - gr-wxgui = false; + gnuradio3_8Minimal = gnuradio3_8.override { + wrap = false; + unwrapped = gnuradio3_8.unwrapped.override { + volk = volk.override { + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + sphinx = false; + doxygen = false; + }; }; }; gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = gnuradio3_7-unwrapped; - }; - - grandorgue = callPackage ../applications/audio/grandorgue { }; - - gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { - gnuradio = gnuradio3_7-unwrapped; - }; - - gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { - gnuradio = gnuradio3_7-unwrapped; + unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python2; + # Incompatible with uhd4+ + uhd = uhd3_5; + }; }; - - gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { - gnuradio = gnuradio3_7-unwrapped; + gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs; + # A build without gui components and other utilites not needed if gnuradio is + # used as a c++ library. + gnuradio3_7Minimal = gnuradio3_7.override { + wrap = false; + unwrapped = gnuradio3_7.unwrapped.override { + volk = volk.override { + enableModTool = false; + }; + features = { + gnuradio-companion = false; + python-support = false; + gr-qtgui = false; + gr-utils = false; + sphinx = false; + doxygen = false; + gr-wxgui = false; + }; + }; }; - gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { - gnuradio = gnuradio3_7-unwrapped; - }; + grandorgue = callPackage ../applications/audio/grandorgue { }; - gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { - gnuradio = gnuradio3_7-unwrapped; + greetd = recurseIntoAttrs { + greetd = callPackage ../os-specific/linux/greetd { }; + gtkgreet = callPackage ../os-specific/linux/gtkgreet { }; + dlm = callPackage ../os-specific/linux/dlm { }; + wlgreet = callPackage ../os-specific/linux/wlgreet { }; + tuigreet = callPackage ../os-specific/linux/tuigreet { }; }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { @@ -22159,17 +22841,6 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; - google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt514) qtbase qtwebkit; - # Downgrade to 1.34 to get libidn.so.11 - libidn = (libidn.overrideAttrs (oldAttrs: { - src = fetchurl { - url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - })).out; - }; - googler = callPackage ../applications/misc/googler { python = python3; }; @@ -22188,14 +22859,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = libsForQt514.callPackage ../applications/radio/gqrx { - gnuradio = gnuradio3_7Minimal; - # Use the same gnuradio for gr-osmosdr as well - gr-osmosdr = gr-osmosdr.override { - gnuradio = gnuradio3_7Minimal; - pythonSupport = false; - }; - }; + gqrx = callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -22215,7 +22879,7 @@ in gthumb = callPackage ../applications/graphics/gthumb { }; - gtimelog = pythonPackages.gtimelog; + gtimelog = with python3Packages; toPythonApplication gtimelog; inherit (gnome3) gucharmap; @@ -22337,11 +23001,28 @@ in formatter = callPackage ../applications/misc/formatter { }; + formiko = with python3Packages; callPackage ../applications/editors/formiko { + inherit buildPythonApplication; + }; + foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = libsForQt5.callPackage ../applications/graphics/freecad { }; + freecad = libsForQt5.callPackage ../applications/graphics/freecad { + inherit (python3Packages) + GitPython + boost + matplotlib + pivy + pycollada + pyside2 + pyside2-tools + python + pyyaml + scipy + shiboken2; + }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -22354,6 +23035,8 @@ in freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; + freeplane = callPackage ../applications/misc/freeplane { }; + freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -22492,6 +23175,8 @@ in jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); + jmusicbot = callPackage ../applications/audio/jmusicbot { }; + libquvi = callPackage ../applications/video/quvi/library.nix { }; librespot = callPackage ../applications/audio/librespot { @@ -22539,10 +23224,12 @@ in giada = callPackage ../applications/audio/giada {}; + giara = callPackage ../applications/networking/giara { }; + gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { - inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; glow = callPackage ../applications/editors/glow { }; @@ -22582,10 +23269,6 @@ in gtkpod = callPackage ../applications/audio/gtkpod { }; - jbidwatcher = callPackage ../applications/misc/jbidwatcher { - java = if stdenv.isLinux then jre else jdk; - }; - qrcodegen = callPackage ../development/libraries/qrcodegen { }; qrencode = callPackage ../development/libraries/qrencode { }; @@ -22678,6 +23361,8 @@ in hamster = callPackage ../applications/misc/hamster { }; + hacpack = callPackage ../tools/compression/hacpack { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; @@ -22702,9 +23387,7 @@ in herbe = callPackage ../applications/misc/herbe { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { - asciidoc = asciidoc-full; - }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -22764,6 +23447,8 @@ in hugo = callPackage ../applications/misc/hugo { }; + go-org = callPackage ../applications/misc/go-org { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. @@ -22822,6 +23507,8 @@ in smallwm = callPackage ../applications/window-managers/smallwm { }; + smooth = callPackage ../development/libraries/smooth { }; + smos = callPackage ../applications/misc/smos { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; @@ -22836,15 +23523,18 @@ in super-productivity = callPackage ../applications/networking/super-productivity { }; - wlr-randr = callPackage ../tools/misc/wlr-randr { }; + wlroots = callPackage ../development/libraries/wlroots { + inherit (xorg) xcbutilrenderutil; + }; - wlroots = callPackage ../development/libraries/wlroots { }; + wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { }; sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; @@ -22859,12 +23549,16 @@ in wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { }; + hikari = callPackage ../applications/window-managers/hikari { + wlroots = wlroots_0_12; + }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; + i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { }; + i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; @@ -22875,6 +23569,8 @@ in i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { }; + i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; @@ -22913,9 +23609,13 @@ in i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { }; + i3wsr = callPackage ../applications/window-managers/i3/wsr.nix { }; + i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { }; + waybox = callPackage ../applications/window-managers/waybox { + wlroots = wlroots_0_12; + }; windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; @@ -22952,7 +23652,7 @@ in imagej = callPackage ../applications/graphics/imagej { }; - imagemagick_light = imagemagick.override { + imagemagick6_light = imagemagick6.override { bzip2 = null; zlib = null; libX11 = null; @@ -22975,14 +23675,14 @@ in libde265 = null; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { + imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = imagemagick.override { inherit ghostscript; }; + imagemagick6Big = imagemagick6.override { inherit ghostscript; }; - imagemagick7_light = lowPrio (imagemagick7.override { + imagemagick_light = lowPrio (imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -23004,11 +23704,11 @@ in libheif = null; }); - imagemagick7 = lowPrio (imagemagick7Big.override { + imagemagick = lowPrio (imagemagickBig.override { ghostscript = null; }); - imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { + imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }); @@ -23029,6 +23729,8 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { @@ -23039,9 +23741,7 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { - gnuradio = gnuradioMinimal; - }; + inspectrum = callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -23140,12 +23840,12 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; + kconf = callPackage ../applications/networking/cluster/kconf { }; + kail = callPackage ../tools/networking/kail { }; kanboard = callPackage ../applications/misc/kanboard { }; - kanshi = callPackage ../tools/misc/kanshi { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -23200,7 +23900,7 @@ in ffmpeg = ffmpeg_2; }; - kiwix = callPackage ../applications/misc/kiwix { }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -23232,6 +23932,8 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kube-score = callPackage ../applications/networking/cluster/kube-score { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; @@ -23242,16 +23944,30 @@ in kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kuttl = callPackage ../applications/networking/cluster/kuttl { + buildGoModule = buildGo115Module; + }; + + kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; + + kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubeless = callPackage ../applications/networking/cluster/kubeless { }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; k9s = callPackage ../applications/networking/cluster/k9s { }; + pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; + popeye = callPackage ../applications/networking/cluster/popeye { }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; @@ -23260,6 +23976,12 @@ in kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; + + kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; + + kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { @@ -23312,6 +24034,8 @@ in libowfat = callPackage ../development/libraries/libowfat { }; + libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; @@ -23428,6 +24152,8 @@ in inherit (darwin) libobjc; }; + handlr = callPackage ../tools/misc/handlr { }; + jftui = callPackage ../applications/video/jftui { }; lime = callPackage ../development/libraries/lime { }; @@ -23440,6 +24166,8 @@ in ltc-tools = callPackage ../applications/audio/ltc-tools { }; + lscolors = callPackage ../applications/misc/lscolors { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; @@ -23479,7 +24207,7 @@ in mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = { + magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; @@ -23526,6 +24254,8 @@ in mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mbrola = callPackage ../applications/audio/mbrola { }; + mcomix3 = callPackage ../applications/graphics/mcomix3 {}; mcpp = callPackage ../development/compilers/mcpp { }; @@ -23554,6 +24284,8 @@ in meme = callPackage ../applications/graphics/meme { }; + meme-suite = callPackage ../applications/science/biology/meme-suite { }; + # Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; @@ -23574,6 +24306,8 @@ in meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; + metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { }; + metersLv2 = callPackage ../applications/audio/meters_lv2 { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit { @@ -23665,6 +24399,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -23675,7 +24411,6 @@ in inherit (mopidyPackages) mopidy - mopidy-gmusic mopidy-iris mopidy-local mopidy-moped @@ -23724,6 +24459,8 @@ in ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + pragha = libsForQt5.callPackage ../applications/audio/pragha { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; rofi-calc = callPackage ../applications/science/math/rofi-calc { }; @@ -23771,6 +24508,7 @@ in mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; + thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -23852,7 +24590,9 @@ in ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = callPackage ../tools/misc/nncp { }; + nncp = callPackage ../tools/misc/nncp { + go = go_1_15; + }; notion = callPackage ../applications/window-managers/notion { }; @@ -23863,6 +24603,8 @@ in ocenaudio = callPackage ../applications/audio/ocenaudio { }; + onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -23905,6 +24647,8 @@ in stdenv = stdenv_32bit; }; + pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; + polybar = callPackage ../applications/misc/polybar { }; polybarFull = callPackage ../applications/misc/polybar { @@ -23934,6 +24678,8 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; + qemacs = callPackage ../applications/editors/qemacs { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -24027,6 +24773,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; + muso = callPackage ../applications/audio/muso { }; + mystem = callPackage ../applications/misc/mystem { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; @@ -24230,6 +24978,8 @@ in osmo = callPackage ../applications/office/osmo { }; + osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; + palemoon = callPackage ../applications/networking/browsers/palemoon { # https://developer.palemoon.org/build/linux/ stdenv = gcc8Stdenv; @@ -24279,6 +25029,8 @@ in wxGTK = wxGTK30-gtk3; }; + pdfslicer = callPackage ../applications/misc/pdfslicer { }; + pekwm = callPackage ../applications/window-managers/pekwm { }; pencil = callPackage ../applications/graphics/pencil { @@ -24369,6 +25121,8 @@ in pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + pika-backup = callPackage ../applications/backup/pika-backup { }; + purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; @@ -24426,6 +25180,8 @@ in plugin-torture = callPackage ../applications/audio/plugin-torture { }; + poke = callPackage ../applications/editors/poke { }; + polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; @@ -24440,6 +25196,10 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { }; + + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; @@ -24493,6 +25253,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; @@ -24506,10 +25268,7 @@ in qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { - lua5 = lua5_1; - miniupnpc = miniupnpc_1; - }; + eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; @@ -24777,7 +25536,7 @@ in udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { }; @@ -24803,6 +25562,8 @@ in seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + secretscanner = callPackage ../tools/security/secretscanner { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; @@ -24841,9 +25602,9 @@ in slop = callPackage ../tools/misc/slop {}; - slrn = callPackage ../applications/networking/newsreaders/slrn { }; + slowhttptest = callPackage ../tools/security/slowhttptest { }; - slurp = callPackage ../tools/misc/slurp { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; sniproxy = callPackage ../applications/networking/sniproxy { }; @@ -24867,6 +25628,8 @@ in split2flac = callPackage ../applications/audio/split2flac { }; + spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; + spotify-tui = callPackage ../applications/audio/spotify-tui { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -24893,16 +25656,12 @@ in linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) - // (callPackage ../applications/misc/sweethome3d/editors.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - sweethome3dApp = sweethome3d.application; - }) - ); + sweethome3d = recurseIntoAttrs ( + (callPackage ../applications/misc/sweethome3d { }) // + (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); swingsane = callPackage ../applications/graphics/swingsane { }; @@ -24935,7 +25694,7 @@ in }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { - inherit (xfce) exo; + inherit (xfce) xfce4-dev-tools; }; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; @@ -25024,10 +25783,13 @@ in libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); - sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail { - jdk = jdk8; + sourcetrail = let llvmPackages = llvmPackages_10; + in libsForQt5.callPackage ../development/tools/sourcetrail { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + jdk = jdk8; pythonPackages = python3Packages; + inherit llvmPackages; }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -25080,7 +25842,7 @@ in sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion19 subversion_1_10 subversion; + subversion_1_10 subversion; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -25103,6 +25865,8 @@ in sunvox = callPackage ../applications/audio/sunvox { }; + svkbd = callPackage ../applications/accessibility/svkbd { }; + swaglyrics = callPackage ../tools/misc/swaglyrics { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -25272,6 +26036,8 @@ in ticpp = callPackage ../development/libraries/ticpp { }; + ticker = callPackage ../applications/misc/ticker { }; + tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -25391,6 +26157,8 @@ in testssl = callPackage ../applications/networking/testssl { }; + lavalauncher = callPackage ../applications/misc/lavalauncher { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -25417,6 +26185,8 @@ in unigine-valley = callPackage ../applications/graphics/unigine-valley { }; + unipicker = callPackage ../applications/misc/unipicker { }; + unison = callPackage ../applications/networking/sync/unison { ocamlPackages = ocaml-ng.ocamlPackages_4_09; enableX11 = config.unison.enableX11 or true; @@ -25428,6 +26198,8 @@ in urh = callPackage ../applications/radio/urh { }; + uroboros = callPackage ../tools/system/uroboros { }; + uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; uucp = callPackage ../tools/misc/uucp { }; @@ -25493,7 +26265,7 @@ in vimv = callPackage ../tools/misc/vimv/default.nix { }; - qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; @@ -25516,6 +26288,7 @@ in neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -25673,6 +26446,8 @@ in wad = python3Packages.callPackage ../tools/security/wad { }; + wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + waon = callPackage ../applications/audio/waon { }; w3m = callPackage ../applications/networking/browsers/w3m { }; @@ -25704,15 +26479,22 @@ in pythonPackages = python3Packages; }; + wapiti = callPackage ../tools/security/wapiti { }; + way-cooler = throw ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; - wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { }; - wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix { - inherit (wayfireApplications-unwrapped) wayfire; - }; + wayfireApplications-unwrapped = recurseIntoAttrs ( + (callPackage ../applications/window-managers/wayfire/applications.nix { }). + extend (_: _: { wlroots = wlroots_0_12; }) + ); + wayfirePlugins = recurseIntoAttrs ( + callPackage ../applications/window-managers/wayfire/plugins.nix { + inherit (wayfireApplications-unwrapped) wayfire; + } + ); wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; waypipe = callPackage ../applications/networking/remote/waypipe { }; @@ -25754,7 +26536,9 @@ in weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; - wio = callPackage ../applications/window-managers/wio { }; + wio = callPackage ../applications/window-managers/wio { + wlroots = wlroots_0_12; + }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -25891,33 +26675,6 @@ in cores = retroArchCores; }; - wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix { - inherit kodi; - plugins = let inherit (lib) optional optionals; in with kodiPlugins; - ([] - ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.kodi.enableAdvancedEmulatorLauncher or false) - advanced-emulator-launcher - ++ optionals (config.kodi.enableControllers or false) - (with controllers; - [ default dreamcast gba genesis mouse n64 nes ps snes ]) - ++ optional (config.kodi.enableExodus or false) exodus - ++ optionals (config.kodi.enableHyperLauncher or false) - (with hyper-launcher; [ plugin service pdfreader ]) - ++ optional (config.kodi.enableJoystick or false) joystick - ++ optional (config.kodi.enableOSMCskin or false) osmc-skin - ++ optional (config.kodi.enableSVTPlay or false) svtplay - ++ optional (config.kodi.enableSteamController or false) steam-controller - ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher - ++ optional (config.kodi.enablePVRHTS or false) pvr-hts - ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun - ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple - ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive - ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp - ++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive - ); - }; - wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { @@ -25930,6 +26687,9 @@ in gtk = gtk2; }; + xa = callPackage ../development/compilers/xa/xa.nix { }; + dxa = callPackage ../development/compilers/xa/dxa.nix { }; + x11basic = callPackage ../development/compilers/x11basic { autoconf = buildPackages.autoconf269; }; @@ -25975,28 +26735,16 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; - - kodiPlainWayland = callPackage ../applications/video/kodi { - useWayland = true; - }; - - kodiGBM = callPackage ../applications/video/kodi { - useGbm = true; - }; - - kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); + kodiPackages = recurseIntoAttrs (kodi.packages); - kodi = wrapKodi { - kodi = kodiPlain; - }; + kodi = callPackage ../applications/video/kodi { }; - kodi-wayland = wrapKodi { - kodi = kodiPlainWayland; + kodi-wayland = callPackage ../applications/video/kodi { + waylandSupport = true; }; - kodi-gbm = wrapKodi { - kodi = kodiGBM; + kodi-gbm = callPackage ../applications/video/kodi { + gbmSupport = true; }; kodi-cli = callPackage ../tools/misc/kodi-cli { }; @@ -26013,6 +26761,8 @@ in xcape = callPackage ../tools/X11/xcape { }; + xcat = callPackage ../tools/security/xcat { }; + xchainkeys = callPackage ../tools/X11/xchainkeys { }; xchm = callPackage ../applications/misc/xchm { }; @@ -26041,6 +26791,10 @@ in xdotool = callPackage ../tools/X11/xdotool { }; + xed-editor = callPackage ../applications/editors/xed-editor { + xapps = cinnamon.xapps; + }; + xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); xen = xenPackages.xen-vanilla; @@ -26143,6 +26897,13 @@ in xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; + + xplayer = callPackage ../applications/video/xplayer { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; + inherit (cinnamon) xapps; + }; + libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; + xrectsel = callPackage ../tools/X11/xrectsel { }; xrestop = callPackage ../tools/X11/xrestop { }; @@ -26235,6 +26996,10 @@ in zathura = callPackage ../applications/misc/zathura { }; + zdns = callPackage ../tools/security/zdns { }; + + zerobin = callPackage ../applications/networking/zerobin { }; + zeroc-ice = callPackage ../development/libraries/zeroc-ice { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -26251,7 +27016,9 @@ in autoconf = buildPackages.autoconf269; }; - zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zgrab2 = callPackage ../tools/security/zgrab2 { }; + + zgrviewer = callPackage ../applications/graphics/zgrviewer { }; zgv = callPackage ../applications/graphics/zgv { # Enable the below line for terminal display. Note @@ -26274,12 +27041,14 @@ in zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; zscroll = callPackage ../applications/misc/zscroll {}; + zsteg = callPackage ../tools/security/zsteg { }; + zynaddsubfx = zyn-fusion; zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { @@ -26298,6 +27067,8 @@ in aeon = callPackage ../applications/blockchains/aeon { }; + balanceofsatoshis = nodePackages.balanceofsatoshis; + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; @@ -26370,6 +27141,8 @@ in lndconnect = callPackage ../applications/blockchains/lndconnect { }; + lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; @@ -26396,6 +27169,8 @@ in ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + pycoin = with python3Packages; toPythonApplication pycoin; + stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; @@ -26413,7 +27188,7 @@ in wownero = callPackage ../applications/blockchains/wownero.nix {}; - zcash = callPackage ../applications/blockchains/zcash { }; + zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; openethereum = callPackage ../applications/blockchains/openethereum { }; @@ -26513,10 +27288,16 @@ in lua = lua5; }; + black-hole-solver = callPackage ../games/black-hole-solver { + inherit (perlPackages) PathTiny; + }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; + blobwars = callPackage ../games/blobwars { }; + boohu = callPackage ../games/boohu { }; braincurses = callPackage ../games/braincurses { }; @@ -26537,12 +27318,16 @@ in cataclysm-dda-git = cataclysmDDA.git.tiles; + cbonsai = callPackage ../games/cbonsai { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; chiaki = libsForQt5.callPackage ../games/chiaki { }; + chromium-bsu = callPackage ../games/chromium-bsu { }; + chocolateDoom = callPackage ../games/chocolate-doom { }; clonehero-unwrapped = pkgs.callPackage ../games/clonehero { }; @@ -26791,9 +27576,7 @@ in icbm3d = callPackage ../games/icbm3d { }; - ingen = callPackage ../applications/audio/ingen { - inherit (pythonPackages) rdflib; - }; + ingen = callPackage ../applications/audio/ingen { }; ideogram = callPackage ../applications/graphics/ideogram { }; @@ -27029,8 +27812,6 @@ in pysolfc = python3Packages.callPackage ../games/pysolfc { }; - qweechat = callPackage ../applications/networking/irc/qweechat { }; - qqwing = callPackage ../games/qqwing { }; quake3wrapper = callPackage ../games/quake3/wrapper { }; @@ -27156,6 +27937,8 @@ in soldat-unstable = callPackage ../games/soldat-unstable { }; + sollya = callPackage ../development/interpreters/sollya { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -27274,10 +28057,16 @@ in typespeed = callPackage ../games/typespeed { }; + uchess = callPackage ../games/uchess { + buildGoModule = buildGo116Module; + }; + udig = callPackage ../applications/gis/udig { }; ufoai = callPackage ../games/ufoai { }; + uhexen2 = callPackage ../games/uhexen2 { }; + ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { }; @@ -27333,13 +28122,15 @@ in libpng = libpng12; }; + wargus = callPackage ../games/wargus { }; + warmux = callPackage ../games/warmux { }; warsow-engine = callPackage ../games/warsow/engine.nix { }; warsow = callPackage ../games/warsow { }; - warzone2100 = libsForQt5.callPackage ../games/warzone2100 { }; + warzone2100 = callPackage ../games/warzone2100 { }; wesnoth = callPackage ../games/wesnoth { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; @@ -27434,7 +28225,6 @@ in zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; - stdenv = gcc9Stdenv; }); zeroad = zeroadPackages.zeroad; @@ -27459,12 +28249,13 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; + arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; @@ -27498,6 +28289,7 @@ in mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; } // lib.optionalAttrs (config.allowAliases or false) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 + arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; @@ -27569,6 +28361,14 @@ in octopus = callPackage ../applications/science/chemistry/octopus { }; + openlp = libsForQt5.callPackage ../applications/misc/openlp { }; + openlpFull = appendToName "full" (openlp.override { + pdfSupport = true; + presentationSupport = true; + vlcSupport = true; + gstreamerSupport = true; + }); + openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; pymol = callPackage ../applications/science/chemistry/pymol { }; @@ -27615,6 +28415,8 @@ in bayescan = callPackage ../applications/science/biology/bayescan { }; + bedops = callPackage ../applications/science/biology/bedops { }; + bedtools = callPackage ../applications/science/biology/bedtools { }; bcftools = callPackage ../applications/science/biology/bcftools { }; @@ -27908,7 +28710,9 @@ in osi = callPackage ../development/libraries/science/math/osi { }; - or-tools = callPackage ../development/libraries/science/math/or-tools { }; + or-tools = callPackage ../development/libraries/science/math/or-tools { + abseil-cpp = abseil-cpp.override { static = true; }; + }; rubiks = callPackage ../development/libraries/science/math/rubiks { }; @@ -27988,10 +28792,14 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; + xmedcon = callPackage ../applications/science/medicine/xmedcon { }; + ### SCIENCE/PHYSICS elmerfem = callPackage ../applications/science/physics/elmerfem {}; + professor = callPackage ../applications/science/physics/professor { }; + sacrifice = callPackage ../applications/science/physics/sacrifice {}; sherpa = callPackage ../applications/science/physics/sherpa {}; @@ -28051,6 +28859,8 @@ in cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; + crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet.nix { }; + caprice32 = callPackage ../misc/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { @@ -28210,7 +29020,7 @@ in tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; - tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; + tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; aiger = callPackage ../applications/science/logic/aiger {}; @@ -28317,6 +29127,8 @@ in cudaSupport = config.cudaSupport or false; }; + dap = callPackage ../applications/science/math/dap { }; + ecm = callPackage ../applications/science/math/ecm { }; eukleides = callPackage ../applications/science/math/eukleides { @@ -28450,13 +29262,15 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; + sumo = callPackage ../applications/science/networking/sumo { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; - stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; @@ -28628,6 +29442,8 @@ in cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; + cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -28655,6 +29471,8 @@ in dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + demjson = with python3Packages; toPythonApplication demjson; + dosbox = callPackage ../misc/emulators/dosbox { }; emu2 = callPackage ../misc/emulators/emu2 { }; @@ -28786,6 +29604,8 @@ in inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + hjson = with python3Packages; toPythonApplication hjson; + epkowa = callPackage ../misc/drivers/epkowa { }; utsushi = callPackage ../misc/drivers/utsushi { }; @@ -28810,13 +29630,17 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; inherit (darwin) libobjc; }; + libjack2 = jack2.override { prefix = "lib"; }; - jack2Full = jack2; # TODO: move to aliases.nix + + j2cli = with python3Packages; toPythonApplication j2cli; jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; keynav = callPackage ../tools/X11/keynav { }; + kgx = callPackage ../applications/terminal-emulators/kgx { }; + kmon = callPackage ../tools/system/kmon { }; kompose = callPackage ../applications/networking/cluster/kompose { }; @@ -28839,8 +29663,6 @@ in lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; - lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; @@ -28859,6 +29681,8 @@ in martyr = callPackage ../development/libraries/martyr { }; + mas = callPackage ../os-specific/darwin/mas { }; + moltengamepad = callPackage ../misc/drivers/moltengamepad { }; openzwave = callPackage ../development/libraries/openzwave { }; @@ -28890,6 +29714,8 @@ in nixUnstable nixFlakes; + nixStatic = pkgsStatic.nix; + nixops = callPackage ../tools/package-management/nixops { }; nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); @@ -29118,16 +29944,32 @@ in solfege = python3Packages.callPackage ../misc/solfege { }; + disnix = callPackage ../tools/package-management/disnix { }; + + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); + + dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; + + disnixos = callPackage ../tools/package-management/disnix/disnixos { }; + + DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; + lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - lice = callPackage ../tools/misc/lice {}; + lice = python3Packages.callPackage ../tools/misc/lice {}; m33-linux = callPackage ../misc/drivers/m33-linux { }; mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { - gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; + gdal = gdal.override { + libmysqlclient = mysql // { + lib = { dev = mysql; } + ;} + ;}; mysql = mysql; pcre = pcre-cpp; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -29147,6 +29989,8 @@ in sndio = callPackage ../misc/sndio { }; + stork = callPackage ../applications/misc/stork { }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; opkg = callPackage ../tools/package-management/opkg { }; @@ -29193,7 +30037,9 @@ in pykms = callPackage ../tools/networking/pykms { }; - pyload = callPackage ../applications/networking/pyload {}; + pyupgrade = with python3Packages; toPythonApplication pyupgrade; + + pwncat = python3Packages.callPackage ../tools/security/pwncat { }; pwntools = with python3Packages; toPythonApplication pwntools; @@ -29242,6 +30088,8 @@ in ricty = callPackage ../data/fonts/ricty { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; + rmount = callPackage ../tools/filesystems/rmount {}; romdirfs = callPackage ../tools/filesystems/romdirfs {}; @@ -29302,7 +30150,7 @@ in sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); + senv = callPackage ../applications/misc/senv { }; brlaser = callPackage ../misc/cups/drivers/brlaser { }; @@ -29357,6 +30205,12 @@ in hasktags = haskellPackages.hasktags; }; + spacenavd = callPackage ../misc/drivers/spacenavd { }; + + spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; + + spnavcfg = callPackage ../applications/misc/spnavcfg { }; + splix = callPackage ../misc/cups/drivers/splix { }; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; @@ -29398,6 +30252,8 @@ in callPackage ../applications/networking/cluster/terraform-providers {} ); + terraforming = callPackage ../applications/networking/cluster/terraforming { }; + terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; @@ -29523,10 +30379,9 @@ in wasmer = callPackage ../development/interpreters/wasmer { }; + yabasic = callPackage ../development/interpreters/yabasic { }; + wasm-pack = callPackage ../development/tools/wasm-pack { - # Wasm-pack depends on a version of rust-openssl which is incompatible with - # LibreSSL 3.1, so we explicitly opt for the older version. - libressl = libressl_3_0; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -29544,6 +30399,8 @@ in pythonPackages = python3Packages; }; + wiki-js = callPackage ../servers/web-apps/wiki-js { }; + winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; @@ -29707,6 +30564,8 @@ in zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; + zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { @@ -29842,6 +30701,8 @@ in opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + openring = callPackage ../applications/misc/openring { }; + phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; duti = callPackage ../os-specific/darwin/duti { @@ -29907,13 +30768,6 @@ in pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; - qmk_firmware = callPackage ../development/misc/qmk_firmware { - avrgcc = pkgsCross.avr.buildPackages.gcc; - avrbinutils = pkgsCross.avr.buildPackages.binutils; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; - }; - new-session-manager = callPackage ../applications/audio/new-session-manager { }; newlib = callPackage ../development/misc/newlib { }; @@ -29929,6 +30783,8 @@ in bemenu = callPackage ../applications/misc/bemenu { }; + _9menu = callPackage ../applications/misc/9menu { }; + dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; @@ -29937,6 +30793,8 @@ in zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + zrepl = callPackage ../tools/backup/zrepl { }; + runwayml = callPackage ../applications/graphics/runwayml {}; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -29951,6 +30809,8 @@ in nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + webwormhole = callPackage ../tools/networking/webwormhole { }; + wifi-password = callPackage ../os-specific/darwin/wifi-password {}; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; @@ -29997,7 +30857,9 @@ in zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { }; + zettlr = callPackage ../applications/misc/zettlr { + texlive = texlive.combined.scheme-medium; + }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; @@ -30005,7 +30867,9 @@ in bottom = callPackage ../tools/system/bottom {}; - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {}; + cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { + wlroots = wlroots_0_12; + }; psftools = callPackage ../os-specific/linux/psftools {}; |