diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 1374 |
1 files changed, 950 insertions, 424 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 3116adb5eba9..c5d0c1957b60 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -10,19 +10,6 @@ res: pkgs: super: with pkgs; -let - self = - builtins.trace '' - It seems that you are using a patched Nixpkgs that references the self - variable in pkgs/top-level/all-packages.nix. This variable was incorrectly - named, so its usage needs attention. Please use pkgs for packages or super - for functions. - '' - res; # Do *NOT* use res in your fork. It will be removed. - - # TODO: turn self into an error - -in { # A stdenv capable of building 32-bit binaries. On x86_64-linux, @@ -174,6 +161,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + aether = callPackage ../applications/networking/aether { }; + alda = callPackage ../development/interpreters/alda { }; althttpd = callPackage ../servers/althttpd { }; @@ -239,6 +228,8 @@ in cen64 = callPackage ../misc/emulators/cen64 { }; + uxn = callPackage ../misc/emulators/uxn { }; + cereal = callPackage ../development/libraries/cereal { }; cewl = callPackage ../tools/security/cewl { }; @@ -269,6 +260,8 @@ in comedilib = callPackage ../development/libraries/comedilib { }; + commitlint = nodePackages."@commitlint/cli"; + containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; @@ -317,6 +310,8 @@ in protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; @@ -367,6 +362,7 @@ in dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; }; + tarsum = callPackage ../build-support/docker/tarsum.nix { }; snapTools = callPackage ../build-support/snap { }; @@ -589,6 +585,7 @@ in fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -656,6 +653,8 @@ in singularity-tools = callPackage ../build-support/singularity-tools { }; + sirula = callPackage ../tools/wayland/sirula { }; + srcOnly = callPackage ../build-support/src-only { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -868,12 +867,18 @@ in inherit (plasma5Packages) kdialog; }; + akku = callPackage ../tools/package-management/akku { }; + albert = libsForQt5.callPackage ../applications/misc/albert {}; + arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + auditwheel = callPackage ../tools/package-management/auditwheel { }; amidst = callPackage ../tools/games/minecraft/amidst { }; + cope = callPackage ../tools/misc/cope { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -894,6 +899,8 @@ in redfang = callPackage ../tools/networking/redfang { }; + sx-go = callPackage ../tools/security/sx-go { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; @@ -1015,16 +1022,16 @@ in terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminus = callPackage ../applications/terminal-emulators/terminus { }; + terminal-colors = callPackage ../applications/misc/terminal-colors { }; termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { - inherit (haskellPackages) ghcWithPackages; - }; + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { }; + + termonad = termonad-with-packages; termsyn = callPackage ../data/fonts/termsyn { }; @@ -1105,6 +1112,10 @@ in apksigcopier = callPackage ../development/tools/apksigcopier { }; + apksigner = callPackage ../development/tools/apksigner { + inherit (androidenv.androidPkgs_9_0) build-tools; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -1126,6 +1137,8 @@ in ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; + archivebox = python3Packages.callPackage ../applications/misc/archivebox { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; archivy = python3Packages.callPackage ../applications/misc/archivy { }; @@ -1141,13 +1154,15 @@ in arduino = arduino-core.override { withGui = true; }; - arduino-ci = callPackage ../development/arduino/arduino-ci { }; + arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; + + arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-core = callPackage ../development/embedded/arduino/arduino-core { }; - arduino-core = callPackage ../development/arduino/arduino-core { }; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; - arduino-mk = callPackage ../development/arduino/arduino-mk {}; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; @@ -1331,6 +1346,8 @@ in bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bic = callPackage ../development/interpreters/bic { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; bitwarden = callPackage ../tools/security/bitwarden { }; @@ -1339,6 +1356,8 @@ in inherit (nodePackages) hyperspace-cli; + bklk = callPackage ../applications/misc/bklk { }; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; @@ -1401,6 +1420,8 @@ in codeql = callPackage ../development/tools/analysis/codeql { }; + corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -1435,7 +1456,7 @@ in inherit (darwin.apple_sdk.frameworks) PCSC; }; - cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cozy = callPackage ../applications/audio/cozy { }; cpuid = callPackage ../os-specific/linux/cpuid { }; @@ -1459,12 +1480,13 @@ in deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; - deltachat-electron = callPackage - ../applications/networking/instant-messengers/deltachat-electron { }; + deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; deskew = callPackage ../applications/graphics/deskew { }; - detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + detect-secrets = with python3Packages; toPythonApplication detect-secrets; dfmt = callPackage ../tools/text/dfmt { }; @@ -1494,6 +1516,8 @@ in ecdsautils = callPackage ../tools/security/ecdsautils { }; + echidna = haskell.lib.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); + sedutil = callPackage ../tools/security/sedutil { }; elvish = callPackage ../shells/elvish { }; @@ -1632,6 +1656,8 @@ in hostctl = callPackage ../tools/system/hostctl { }; + hp2p = callPackage ../tools/networking/hp2p { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -1658,6 +1684,8 @@ in lsix = callPackage ../tools/graphics/lsix { }; + mdr = callPackage ../tools/misc/mdr { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; pacparser = callPackage ../tools/networking/pacparser { }; @@ -1747,7 +1775,7 @@ in xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1854,11 +1882,6 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { - jdk = jdk8; - swt = swt_jdk8; - }; - b3sum = callPackage ../tools/security/b3sum {}; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; @@ -1909,8 +1932,6 @@ in bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; - bcat = callPackage ../tools/text/bcat {}; - bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; @@ -1991,8 +2012,8 @@ in }; libtensorflow = - if python.pkgs.tensorflow ? libtensorflow - then python.pkgs.tensorflow.libtensorflow + if python3.pkgs.tensorflow ? libtensorflow + then python3.pkgs.tensorflow.libtensorflow else libtensorflow-bin; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { @@ -2029,7 +2050,9 @@ in boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { }; + bochs = callPackage ../applications/virtualization/bochs { + wxGTK = wxGTK30; + }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; @@ -2057,6 +2080,8 @@ in bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; + bpb = callPackage ../tools/security/bpb { }; + bpytop = callPackage ../tools/system/bpytop { }; brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); @@ -2163,6 +2188,8 @@ in traefik = callPackage ../servers/traefik { }; + traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; @@ -2219,6 +2246,8 @@ in croc = callPackage ../tools/networking/croc { }; + cbftp = callPackage ../tools/networking/cbftp { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille @@ -2539,10 +2568,14 @@ in dino = callPackage ../applications/networking/instant-messengers/dino { }; + djv = callPackage ../applications/graphics/djv { }; + dlx = callPackage ../misc/emulators/dlx { }; dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; + doitlive = callPackage ../tools/misc/doitlive { }; dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; @@ -2619,7 +2652,13 @@ in element = callPackage ../applications/science/chemistry/element { }; - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { + inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; + electron = electron_13; + }; + element-desktop-wayland = element-desktop.override { + useWayland = true; + }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { conf = config.element-web.conf or {}; @@ -2851,6 +2890,8 @@ in gping = callPackage ../tools/networking/gping { }; + gpu-burn = callPackage ../applications/misc/gpu-burn { }; + greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; @@ -2919,6 +2960,8 @@ in inklecate = callPackage ../development/compilers/inklecate {}; + interactsh = callPackage ../tools/misc/interactsh { }; + interlock = callPackage ../servers/interlock {}; iotools = callPackage ../tools/misc/iotools { }; @@ -2969,6 +3012,8 @@ in lepton = callPackage ../tools/graphics/lepton { }; + lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; + lexicon = callPackage ../tools/admin/lexicon { }; lief = callPackage ../development/libraries/lief { @@ -3081,6 +3126,8 @@ in moodle-dl = callPackage ../tools/networking/moodle-dl { }; + moonraker = callPackage ../servers/moonraker { }; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; @@ -3165,6 +3212,8 @@ in odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + ossutil = callPackage ../tools/admin/ossutil {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3228,6 +3277,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + reg = callPackage ../tools/virtualization/reg { }; + river = callPackage ../applications/window-managers/river { }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; @@ -3316,6 +3367,8 @@ in razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; + replay-sorcery = callPackage ../tools/video/replay-sorcery { }; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { @@ -3523,9 +3576,7 @@ in birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; - blastem = callPackage ../misc/emulators/blastem { - inherit (python27Packages) pillow; - }; + blastem = callPackage ../misc/emulators/blastem { }; blueberry = callPackage ../tools/bluetooth/blueberry { }; @@ -3541,9 +3592,7 @@ in bsdiff = callPackage ../tools/compression/bsdiff { }; - btar = callPackage ../tools/backup/btar { - librsync = librsync_0_9; - }; + btar = callPackage ../tools/backup/btar { }; bud = callPackage ../tools/networking/bud { }; @@ -3665,6 +3714,8 @@ in cicero-tui = callPackage ../tools/misc/cicero-tui { }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { }; + cipherscan = callPackage ../tools/security/cipherscan { openssl = if stdenv.hostPlatform.system == "x86_64-linux" then openssl-chacha @@ -3746,8 +3797,9 @@ in convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + inherit (darwin.apple_sdk.frameworks) IOKit; }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -3758,7 +3810,9 @@ in cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - cryptpad = callPackage ../servers/web-apps/cryptpad { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { + nodejs = nodejs-12_x; + }; ethash = callPackage ../development/libraries/ethash { }; @@ -3896,8 +3950,16 @@ in qtbase = qt5.qtbase; }; + coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; + + coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; + c14 = callPackage ../applications/networking/c14 { }; + corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; + + coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -3906,6 +3968,8 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }; + changetower = callPackage ../tools/networking/changetower { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; civetweb = callPackage ../development/libraries/civetweb { }; @@ -3934,6 +3998,8 @@ in cloud-utils = callPackage ../tools/misc/cloud-utils { }; + cloudlist = callPackage ../tools/security/cloudlist { }; + cobalt = callPackage ../applications/misc/cobalt { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -3950,6 +4016,10 @@ in compass = callPackage ../development/tools/compass { }; + cone = callPackage ../development/compilers/cone { + llvmPackages = llvmPackages_7; + }; + conda = callPackage ../tools/package-management/conda { }; console-bridge = callPackage ../development/libraries/console-bridge { }; @@ -4063,6 +4133,8 @@ in daemonize = callPackage ../tools/system/daemonize { }; + danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; + daq = callPackage ../applications/networking/ids/daq { }; dar = callPackage ../tools/backup/dar { }; @@ -4147,10 +4219,6 @@ in pythonPackages = python3Packages; libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { - pythonPackages = python2Packages; - libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; - }; deluge = deluge-2_x; desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; @@ -4173,6 +4241,8 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; + dnspeep = callPackage ../tools/security/dnspeep { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -4200,12 +4270,11 @@ in diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; diffoscopeMinimal = callPackage ../tools/misc/diffoscope { - inherit (androidenv.androidPkgs_9_0) build-tools; jdk = jdk8; }; diffoscope = diffoscopeMinimal.override { - enableBloat = true; + enableBloat = !stdenv.isDarwin; }; diffr = callPackage ../tools/text/diffr { @@ -4214,6 +4283,8 @@ in diffstat = callPackage ../tools/text/diffstat { }; + difftastic = callPackage ../tools/text/difftastic { }; + diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { @@ -4399,6 +4470,8 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; + emote = callPackage ../tools/inputmethods/emote { }; + engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -4427,12 +4500,16 @@ in rar2fs = callPackage ../tools/filesystems/rar2fs { }; + s9fes = callPackage ../development/interpreters/s9fes { }; + s-tar = callPackage ../tools/archivers/s-tar {}; sonota = callPackage ../tools/misc/sonota { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + soupault = callPackage ../tools/typesetting/soupault { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { @@ -4529,7 +4606,9 @@ in choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { }; + emscripten = callPackage ../development/compilers/emscripten { + llvmPackages = llvmPackages_13; + }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -4544,7 +4623,7 @@ in # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; - elk7Version = "7.5.1"; + elk7Version = "7.10.2"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { util-linux = util-linuxMinimal; @@ -4557,12 +4636,12 @@ in }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; @@ -4857,7 +4936,9 @@ in libbtbb = callPackage ../development/libraries/libbtbb { }; - lp_solve = callPackage ../applications/science/math/lp_solve { }; + lp_solve = callPackage ../applications/science/math/lp_solve { + inherit (darwin) cctools; + }; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; @@ -4916,6 +4997,8 @@ in fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; + footswitch = callPackage ../tools/inputmethods/footswitch { }; + foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty {}; @@ -4992,6 +5075,8 @@ in ftop = callPackage ../os-specific/linux/ftop { }; + ftxui = callPackage ../development/libraries/ftxui { }; + fsarchiver = callPackage ../tools/archivers/fsarchiver { }; fsfs = callPackage ../tools/filesystems/fsfs { }; @@ -5105,7 +5190,11 @@ in gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../tools/networking/gftp { }; + gftp = callPackage ../applications/networking/gftp { + gtk = gtk2; + }; + + gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { }; gfbgraph = callPackage ../development/libraries/gfbgraph { }; @@ -5119,6 +5208,8 @@ in ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; + gst = callPackage ../applications/version-management/git-and-tools/gst { }; + ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; @@ -5173,7 +5264,9 @@ in git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; - git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { }; + git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; inherit (haskellPackages) git-brunch; @@ -5349,6 +5442,8 @@ in gitea = callPackage ../applications/version-management/gitea { }; + gokart = callPackage ../development/tools/gokart { }; + gl2ps = callPackage ../development/libraries/gl2ps { }; glab = callPackage ../applications/version-management/git-and-tools/glab { }; @@ -5467,7 +5562,10 @@ in google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { python = python3; }; - google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; + google-cloud-sdk-gce = google-cloud-sdk.override { + python = python38; + with-gce = true; + }; google-fonts = callPackage ../data/fonts/google-fonts { }; @@ -5509,7 +5607,9 @@ in gpp = callPackage ../development/tools/gpp { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { + hamlib = hamlib_4; + }; gptfdisk = callPackage ../tools/system/gptfdisk { }; @@ -5684,6 +5784,8 @@ in gvolicon = callPackage ../tools/audio/gvolicon {}; + gvproxy = callPackage ../tools/networking/gvproxy { }; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -5891,6 +5993,8 @@ in httpx = callPackage ../tools/security/httpx { }; + hurl = callPackage ../tools/networking/hurl { }; + hub = callPackage ../applications/version-management/git-and-tools/hub { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; @@ -5916,8 +6020,6 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -5999,6 +6101,8 @@ in inetutils = callPackage ../tools/networking/inetutils { }; + inferno = callPackage ../development/tools/inferno { }; + inform6 = callPackage ../development/compilers/inform6 { }; inform7 = callPackage ../development/compilers/inform7 { }; @@ -6255,7 +6359,7 @@ in keeperrl = callPackage ../games/keeperrl { }; - kexectools = callPackage ../os-specific/linux/kexectools { }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; @@ -6381,6 +6485,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; @@ -6531,7 +6637,7 @@ in }; meilisearch = callPackage ../servers/search/meilisearch { - inherit (darwin.apple_sdk.frameworks) IOKit Security; + inherit (darwin.apple_sdk.frameworks) Security; }; memtester = callPackage ../tools/system/memtester { }; @@ -6542,10 +6648,6 @@ in mhonarc = perlPackages.MHonArc; - minergate = callPackage ../applications/misc/minergate { }; - - minergate-cli = callPackage ../applications/misc/minergate-cli { }; - minica = callPackage ../tools/security/minica { }; minidlna = callPackage ../tools/networking/minidlna { }; @@ -6653,10 +6755,10 @@ in nodejs = pkgs.nodejs; }); - now-cli = callPackage ../development/web/now-cli {}; - np2kai = callPackage ../misc/emulators/np2kai { }; + openipmi = callPackage ../tools/system/openipmi { }; + ox = callPackage ../applications/editors/ox { }; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -6794,6 +6896,8 @@ in libmesode = callPackage ../development/libraries/libmesode {}; + libmsym = callPackage ../development/libraries/science/chemistry/libmsym { }; + libnabo = callPackage ../development/libraries/libnabo { }; libngspice = callPackage ../development/libraries/libngspice { }; @@ -6830,6 +6934,10 @@ in libzmf = callPackage ../development/libraries/libzmf {}; + libreddit = callPackage ../servers/libreddit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; libreswan = callPackage ../tools/networking/libreswan { }; @@ -6979,6 +7087,8 @@ in marktext = callPackage ../applications/misc/marktext { }; + mars-mips = callPackage ../development/tools/mars-mips { }; + mawk = callPackage ../tools/text/mawk { }; mb2md = callPackage ../tools/text/mb2md { }; @@ -7075,6 +7185,8 @@ in minio-client = callPackage ../tools/networking/minio-client { }; + minio-certgen = callPackage ../tools/security/minio-certgen { }; + minissdpd = callPackage ../tools/networking/minissdpd { }; inherit (callPackage ../tools/networking/miniupnpc @@ -7166,6 +7278,8 @@ in mscgen = callPackage ../tools/graphics/mscgen { }; + metabigor = callPackage ../tools/security/metabigor { }; + metasploit = callPackage ../tools/security/metasploit { }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -7265,10 +7379,12 @@ in netatalk = callPackage ../tools/filesystems/netatalk { }; - netcdf = callPackage ../development/libraries/netcdf { }; + netcdf = callPackage ../development/libraries/netcdf { + hdf5 = hdf5.override { usev110Api = true; }; + }; netcdf-mpi = appendToName "mpi" (netcdf.override { - hdf5 = hdf5-mpi; + hdf5 = hdf5-mpi.override { usev110Api = true; }; }); netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; @@ -7367,33 +7483,32 @@ in ngrok-1 = callPackage ../tools/networking/ngrok-1 { }; + nitter = callPackage ../servers/nitter { }; + noice = callPackage ../applications/misc/noice { }; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_0; + nomad = nomad_1_1; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { buildGoPackage = buildGo115Package; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { - buildGoPackage = buildGo116Package; + buildGoModule = buildGo116Module; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; + nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; + nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; notable = callPackage ../applications/misc/notable { }; @@ -7470,7 +7585,7 @@ in graphicalSupport = true; }; - nmap-unfree = callPackage ../tools/security/nmap-unfree { }; + nmap-formatter = callPackage ../tools/security/nmap-formatter { }; nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; @@ -7521,6 +7636,8 @@ in numlockx = callPackage ../tools/X11/numlockx { }; + nttcp = callPackage ../tools/networking/nttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; @@ -7574,7 +7691,7 @@ in opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; - openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; openfortivpn = callPackage ../tools/networking/openfortivpn { }; @@ -7621,8 +7738,12 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-agent = callPackage ../tools/security/onlykey-agent { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; + onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -7827,7 +7948,7 @@ in pamtester = callPackage ../tools/security/pamtester { }; - paperless = callPackage ../applications/office/paperless { }; + paperless-ng = callPackage ../applications/office/paperless-ng { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -7906,6 +8027,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + otpauth = callPackage ../tools/security/otpauth { }; + pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -7947,10 +8070,6 @@ in pdfarranger = callPackage ../applications/misc/pdfarranger { }; - pdfread = callPackage ../tools/graphics/pdfread { - inherit (pythonPackages) pillow; - }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -7963,6 +8082,8 @@ in peco = callPackage ../tools/text/peco { }; + pg_activity = callPackage ../development/tools/database/pg_activity { }; + pg_checksums = callPackage ../development/tools/database/pg_checksums { }; pg_flame = callPackage ../tools/misc/pg_flame { }; @@ -8025,6 +8146,10 @@ in pixiewps = callPackage ../tools/networking/pixiewps {}; + pinyin-tool = callPackage ../tools/text/pinyin-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; + pk2cmd = callPackage ../tools/misc/pk2cmd { }; plantuml = callPackage ../tools/misc/plantuml { }; @@ -8033,7 +8158,7 @@ in plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -8095,7 +8220,9 @@ in pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; - poedit = callPackage ../tools/text/poedit { }; + poedit = callPackage ../tools/text/poedit { + wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + }; polipo = callPackage ../servers/polipo { }; @@ -8249,9 +8376,11 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - remarshal = callPackage ../development/tools/remarshal { }; + remarshal = with python3Packages; toPythonApplication remarshal; - rehex = callPackage ../applications/editors/rehex { }; + rehex = callPackage ../applications/editors/rehex { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; + }; rig = callPackage ../tools/misc/rig { stdenv = gccStdenv; @@ -8271,13 +8400,13 @@ in openmpi = callPackage ../development/libraries/openmpi { }; + ouch = callPackage ../tools/compression/ouch { }; + mpi = openmpi; # this attribute should used to build MPI applications ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); qarte = libsForQt5.callPackage ../applications/video/qarte { }; @@ -8325,6 +8454,8 @@ in qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; + quadrafuzz = callPackage ../applications/audio/quadrafuzz { }; quickfix = callPackage ../development/libraries/quickfix { }; @@ -8422,6 +8553,8 @@ in rtss = callPackage ../development/tools/misc/rtss { }; + realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {}; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; @@ -8477,6 +8610,8 @@ in inherit (callPackage ../development/misc/resholve { }) resholve resholvePackage; + restool = callPackage ../os-specific/linux/restool {}; + reuse = callPackage ../tools/package-management/reuse { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; @@ -8540,7 +8675,7 @@ in rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; - rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; + rpiboot = callPackage ../development/misc/rpiboot { }; rpm = callPackage ../tools/package-management/rpm { python = python3; @@ -8678,6 +8813,8 @@ in scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; + scorecard = callPackage ../tools/security/scorecard { }; + scream = callPackage ../applications/audio/scream { }; scimark = callPackage ../misc/scimark { }; @@ -8917,6 +9054,8 @@ in libpng = libpng12; }; + snmpcheck = callPackage ../tools/networking/snmpcheck {}; + sniffglue = callPackage ../tools/networking/sniffglue { }; snort = callPackage ../applications/networking/ids/snort { }; @@ -8925,7 +9064,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - soapui = callPackage ../applications/networking/soapui { }; + soapui = callPackage ../applications/networking/soapui { + jdk = jdk11; + }; spglib = callPackage ../development/libraries/spglib { }; @@ -8996,7 +9137,7 @@ in socat = callPackage ../tools/networking/socat { }; - socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); + sockperf = callPackage ../tools/networking/sockperf { }; solaar = callPackage ../applications/misc/solaar {}; @@ -9004,6 +9145,8 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; + solc-select = with python3Packages; toPythonApplication solc-select; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spacebar = callPackage ../os-specific/darwin/spacebar { @@ -9031,6 +9174,8 @@ in srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; + srtrelay = callPackage ../applications/video/srtrelay { }; + sourcehut = callPackage ../applications/version-management/sourcehut { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; @@ -9177,7 +9322,7 @@ in stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { }; stone-phaser = callPackage ../applications/audio/stone-phaser { }; @@ -9218,6 +9363,8 @@ in znapzend = callPackage ../tools/backup/znapzend { }; + tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { }; + targetcli = callPackage ../os-specific/linux/targetcli { }; target-isns = callPackage ../os-specific/linux/target-isns { }; @@ -9230,6 +9377,10 @@ in tartube = callPackage ../applications/video/tartube { }; + tartube-yt-dlp = callPackage ../applications/video/tartube { + youtube-dl = yt-dlp; + }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; @@ -9238,6 +9389,8 @@ in tboot = callPackage ../tools/security/tboot { }; + tagutil = callPackage ../applications/audio/tagutil { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; @@ -9352,7 +9505,7 @@ in tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -9360,7 +9513,7 @@ in tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; - tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy { }; @@ -9484,6 +9637,8 @@ in translate-shell = callPackage ../applications/misc/translate-shell { }; + translatepy = with python3.pkgs; toPythonApplication translatepy; + trash-cli = callPackage ../tools/misc/trash-cli { }; trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; @@ -9552,6 +9707,8 @@ in twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; + twurl = callPackage ../tools/misc/twurl { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -9600,7 +9757,7 @@ in umlet = callPackage ../tools/misc/umlet { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; + unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; @@ -9794,14 +9951,18 @@ in }; sentry-cli = callPackage ../development/tools/sentry-cli { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + sentry-native = callPackage ../development/libraries/sentry-native { }; + vtun = callPackage ../tools/networking/vtun { openssl = openssl_1_0_2; }; - waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { }; + waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; @@ -10025,6 +10186,8 @@ in xsensors = callPackage ../os-specific/linux/xsensors { }; + xspim = callPackage ../development/tools/misc/xspim { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; xwallpaper = callPackage ../tools/X11/xwallpaper { }; @@ -10066,13 +10229,11 @@ in valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish62 varnish63; + varnish60 varnish65; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages - varnish62Packages - varnish63Packages; + varnish60Packages varnish65Packages; - varnishPackages = varnish63Packages; + varnishPackages = varnish65Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; @@ -10465,6 +10626,8 @@ in nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; + yarn-bash-completion = callPackage ../shells/bash/yarn-completion { }; + undistract-me = callPackage ../shells/bash/undistract-me { }; dash = callPackage ../shells/dash { }; @@ -10477,6 +10640,8 @@ in fish = callPackage ../shells/fish { }; + oh-my-fish = callPackage ../shells/fish/oh-my-fish { }; + wrapFish = callPackage ../shells/fish/wrapper.nix { }; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); @@ -10647,6 +10812,8 @@ in aldor = callPackage ../development/compilers/aldor { }; + algol68g = callPackage ../development/compilers/algol68g { }; + aliceml = callPackage ../development/compilers/aliceml { }; armips = callPackage ../development/compilers/armips { }; @@ -10672,6 +10839,7 @@ in bluespec = callPackage ../development/compilers/bluespec { gmp-static = gmp.override { withStatic = true; }; + tex = texlive.combined.scheme-full; }; cakelisp = callPackage ../development/compilers/cakelisp { }; @@ -10762,6 +10930,8 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; + comby = callPackage ../development/tools/comby { }; + compcert = coqPackages.compcert.override { version = "3.9"; }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; @@ -10809,6 +10979,8 @@ in devpi-server = callPackage ../development/tools/devpi-server {}; + dictu = callPackage ../development/compilers/dictu { }; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; ecl = callPackage ../development/compilers/ecl { }; @@ -10839,10 +11011,18 @@ in flyctl = callPackage ../development/web/flyctl { }; + fluidd = callPackage ../applications/misc/fluidd { }; + flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + fnm = callPackage ../development/tools/fnm { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + fnlfmt = callPackage ../development/tools/fnlfmt { }; + fpc = callPackage ../development/compilers/fpc { }; g203-led = callPackage ../tools/misc/g203-led { }; @@ -11195,7 +11375,15 @@ in langCC = false; langAda = true; profiledCompiler = false; - inherit gnatboot; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well go the same + # route (especially as gnatboot can't cross-compile). + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnatboot + else buildPackages.gnat6; }); gnat9 = wrapCC (gcc9.cc.override { @@ -11204,7 +11392,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat9; }); gnat10 = wrapCC (gcc10.cc.override { @@ -11213,7 +11408,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat10; }); gnat11 = wrapCC (gcc11.cc.override { @@ -11222,7 +11424,14 @@ in langCC = false; langAda = true; profiledCompiler = false; - gnatboot = gnat6; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat11; }); gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); @@ -11284,7 +11493,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8107; inherit (haskellPackages) ghc; @@ -11346,21 +11555,12 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); glslang = callPackage ../development/compilers/glslang { }; - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - 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.cc.isGNU && stdenv.isAarch64) { @@ -11556,9 +11756,12 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; - inherit (callPackages ../development/compilers/graalvm/community-edition.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }) graalvm8-ce graalvm11-ce; + graalvmCEPackages = + recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + graalvm8-ce = graalvmCEPackages.graalvm8-ce; + graalvm11-ce = graalvmCEPackages.graalvm11-ce; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -11627,6 +11830,8 @@ in knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; + regenkfs = callPackage ../development/tools/knightos/regenkfs { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kimg = callPackage ../development/tools/knightos/kimg { }; @@ -11635,6 +11840,8 @@ in knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; + remkrom = callPackage ../development/tools/knightos/remkrom { }; + knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; @@ -11677,6 +11884,7 @@ in lld_10 = llvmPackages_10.lld; lld_11 = llvmPackages_11.lld; lld_12 = llvmPackages_12.lld; + lld_13 = llvmPackages_13.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -11687,11 +11895,13 @@ in lldb_10 = llvmPackages_10.lldb; lldb_11 = llvmPackages_11.lldb; lldb_12 = llvmPackages_12.lldb; + lldb_13 = llvmPackages_13.lldb; llvm = llvmPackages.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_13 = llvmPackages_13.llvm; llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; @@ -11772,6 +11982,14 @@ in stdenv = gcc7Stdenv; })); + llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_13.tools; + targetLlvmLibraries = targetPackages.llvmPackages_13.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); + llvmPackages_latest = llvmPackages_12; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -11782,6 +12000,8 @@ in manticore = callPackage ../development/compilers/manticore { }; + marst = callPackage ../development/compilers/marst { }; + mercury = callPackage ../development/compilers/mercury { jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -11791,14 +12011,10 @@ in mint = callPackage ../development/compilers/mint { }; mitscheme = callPackage ../development/compilers/mit-scheme { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; - xlibsWrapper = null; + texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; enableX11 = true; }; @@ -11837,7 +12053,7 @@ in roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { }; + msbuild = callPackage ../development/tools/build-managers/msbuild { dotnet-sdk = dotnet-sdk_5; }; mosml = callPackage ../development/compilers/mosml { }; @@ -11887,7 +12103,8 @@ 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_17_0 ocamlformat_0_18_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 + ocamlformat_0_19_0; orc = callPackage ../development/compilers/orc { }; @@ -12047,7 +12264,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; - cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-update = callPackage ../tools/package-management/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12067,11 +12286,13 @@ in cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; + cargo-embed = callPackage ../development/tools/rust/cargo-embed { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -12105,7 +12326,7 @@ in }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; @@ -12169,7 +12390,6 @@ in scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners/default.nix { coursier = coursier.override { jre = jdk8; }; - jre = jdk8; }; metal = callPackage ../development/libraries/metal { }; @@ -12389,6 +12609,10 @@ in clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; + clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { + jre = jre8; + }; + clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java jdk = jdk11; @@ -12421,7 +12645,7 @@ in }; beam = callPackage ./beam-packages.nix { }; - beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; + beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; }; inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 @@ -12508,7 +12732,7 @@ in ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -12537,7 +12761,7 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; - me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; + me_cleaner = callPackage ../tools/misc/me_cleaner { }; mesos-dns = callPackage ../servers/mesos-dns { }; @@ -12580,14 +12804,14 @@ in # 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; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; @@ -12699,6 +12923,8 @@ in pypi2nix = callPackage ../development/tools/pypi2nix {}; + pypi-mirror = callPackage ../development/tools/pypi-mirror {}; + setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. @@ -12750,6 +12976,8 @@ in red = callPackage ../development/interpreters/red { }; + regexploit = callPackage ../tools/security/regexploit { }; + regextester = callPackage ../applications/misc/regextester { }; regina = callPackage ../development/interpreters/regina { }; @@ -12872,7 +13100,7 @@ in avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { + betaflight = callPackage ../development/embedded/stm32/betaflight { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -12930,7 +13158,7 @@ in guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { + inav = callPackage ../development/embedded/stm32/inav { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13001,6 +13229,8 @@ in ameba = callPackage ../development/tools/ameba { }; + anybadge = with python3Packages; toPythonApplication anybadge; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackage ../tools/admin/ansible { }) @@ -13036,10 +13266,9 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - 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"; }; + apacheKafka = apacheKafka_2_8; + apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; }; + apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; kt = callPackage ../tools/misc/kt {}; @@ -13047,18 +13276,34 @@ in arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; + arpa2common = callPackage ../development/libraries/arpa2common { }; + asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { }; + aviator = callPackage ../development/tools/misc/aviator { }; + 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_12 electron_13; + electron + electron_3 + electron_4 + electron_5 + electron_6 + electron_7 + electron_8 + electron_9 + electron_10 + electron_11 + electron_12 + electron_13 + electron_14; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -13083,7 +13328,7 @@ in automoc4 = callPackage ../development/tools/misc/automoc4 { }; - avrdude = callPackage ../development/tools/misc/avrdude { }; + avrdude = callPackage ../development/embedded/avrdude { }; b4 = callPackage ../development/tools/b4 { }; @@ -13163,7 +13408,13 @@ in buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; + bear = callPackage ../development/tools/build-managers/bear { + # error: no viable constructor or deduction guide for deduction of template arguments of 'map' + stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then + llvmPackages_11.stdenv + else + stdenv; + }; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; @@ -13237,21 +13488,19 @@ in black-macchiato = with python3Packages; toPythonApplication black-macchiato; - blackmagic = callPackage ../development/tools/misc/blackmagic { }; + blackmagic = callPackage ../development/embedded/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; buck = callPackage ../development/tools/build-managers/buck { }; - buildkite-agent = buildkite-agent3; - buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; - buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -13273,11 +13522,9 @@ in cbrowser = callPackage ../development/tools/misc/cbrowser { }; - cc-tool = callPackage ../development/tools/misc/cc-tool { }; + cc-tool = callPackage ../development/embedded/cc-tool { }; - ccache = callPackage ../development/tools/misc/ccache { - asciidoc = asciidoc-full; - }; + ccache = callPackage ../development/tools/misc/ccache { }; # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: @@ -13438,6 +13685,8 @@ in inherit (llvmPackages_11) llvm libclang; }; + cwltool = callPackage ../applications/science/misc/cwltool { }; + dprint = callPackage ../development/tools/dprint { }; libcxx = llvmPackages.libcxx; @@ -13464,12 +13713,15 @@ in libsigrok = callPackage ../development/tools/libsigrok { }; # old version: - libsigrok-0-3-0 = libsigrok.override { + libsigrok_0_3 = libsigrok.override { version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + doInstallCheck = false; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { + python3 = python38; + }; # special forks used for dsview libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; @@ -13493,7 +13745,7 @@ in ddd = callPackage ../development/tools/misc/ddd { }; - lattice-diamond = callPackage ../development/tools/lattice-diamond { }; + lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { }; direvent = callPackage ../development/tools/misc/direvent { }; @@ -13554,7 +13806,9 @@ in drush = callPackage ../development/tools/misc/drush { }; - easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + dwz = callPackage ../development/tools/misc/dwz { }; + + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -13603,7 +13857,7 @@ in ffuf = callPackage ../tools/security/ffuf { }; flow = callPackage ../development/tools/analysis/flow { - ocamlPackages = ocaml-ng.ocamlPackages_4_09; + ocamlPackages = ocaml-ng.ocamlPackages_4_10; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -13612,6 +13866,8 @@ in foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; + fprettify = callPackage ../development/tools/fprettify { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -13627,7 +13883,7 @@ in fsearch = callPackage ../tools/misc/fsearch { }; - fujprog = callPackage ../development/tools/misc/fujprog { + fujprog = callPackage ../development/embedded/fpga/fujprog { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -13668,6 +13924,14 @@ in global = callPackage ../development/tools/misc/global { }; + gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix { + component = "gnatcoll_db2ada"; + }; + + gnatinspect = callPackage ../development/libraries/ada/gnatcoll/db.nix { + component = "gnatinspect"; + }; + gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; @@ -13708,7 +13972,11 @@ in gotty = callPackage ../servers/gotty { }; - gputils = callPackage ../development/tools/misc/gputils { }; + gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { }; + + gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; + + gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -13736,6 +14004,8 @@ in gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; + crowdin-cli = callPackage ../tools/text/crowdin-cli { }; + gtranslator = callPackage ../tools/text/gtranslator { }; guff = callPackage ../tools/graphics/guff { }; @@ -13768,7 +14038,7 @@ in iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; iaca = iaca_3_0; - icestorm = callPackage ../development/tools/icestorm { }; + icestorm = callPackage ../development/embedded/fpga/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -13784,7 +14054,7 @@ in indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/arduino/ino { }; + ino = callPackage ../development/embedded/arduino/ino { }; inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; @@ -13842,6 +14112,8 @@ in ko = callPackage ../development/tools/ko { }; + konstraint = callPackage ../development/tools/konstraint { }; + krankerl = callPackage ../development/tools/krankerl { }; krew = callPackage ../development/tools/krew { }; @@ -13957,6 +14229,8 @@ in mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; + mockgen = callPackage ../development/tools/mockgen { }; modd = callPackage ../development/tools/modd { }; @@ -14031,7 +14305,7 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/embedded/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -14142,6 +14416,8 @@ in lua = lua5; } // (config.radare or {})); + ran = callPackage ../servers/http/ran { }; + retry = callPackage ../tools/system/retry { }; rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; @@ -14204,6 +14480,8 @@ in saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; + saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; sd-local = callPackage ../development/tools/sd-local { }; @@ -14308,6 +14586,8 @@ in spooles = callPackage ../development/libraries/science/math/spooles {}; + spruce = callPackage ../development/tools/misc/spruce { }; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -14320,9 +14600,9 @@ in sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -14353,17 +14633,31 @@ in c2ffi = callPackage ../development/tools/misc/c2ffi { }; + c3c = callPackage ../development/compilers/c3c { + llvmPackages = llvmPackages_11; + }; + swfmill = callPackage ../tools/video/swfmill { }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; }; + szyszka = callPackage ../tools/misc/szyszka { }; + + taplo-cli = callPackage ../development/tools/taplo-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + taplo-lsp = callPackage ../development/tools/taplo-lsp { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; - teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; terracognita = callPackage ../development/tools/misc/terracognita { }; @@ -14408,7 +14702,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - trellis = callPackage ../development/tools/trellis { }; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -14431,7 +14725,7 @@ in boost = boost17x; }; - uisp = callPackage ../development/tools/misc/uisp { }; + uisp = callPackage ../development/embedded/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; @@ -14450,6 +14744,8 @@ in readline = readline81; }; + java-language-server = callPackage ../development/tools/java/java-language-server { }; + jhiccup = callPackage ../development/tools/java/jhiccup { }; valgrind = callPackage ../development/tools/analysis/valgrind { @@ -14483,7 +14779,7 @@ in webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; @@ -14515,6 +14811,8 @@ in xxdiff-tip = xxdiff; + xxgdb = callPackage ../development/tools/misc/xxgdb { }; + yaml2json = callPackage ../development/tools/yaml2json { }; yams = callPackage ../applications/audio/yams { }; @@ -14733,12 +15031,10 @@ in boost160 = callPackage ../development/libraries/boost/1.60.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost171 = callPackage ../development/libraries/boost/1.71.nix { }; boost172 = callPackage ../development/libraries/boost/1.72.nix { }; boost173 = callPackage ../development/libraries/boost/1.73.nix { }; boost174 = callPackage ../development/libraries/boost/1.74.nix { }; @@ -15173,6 +15469,8 @@ in filter-audio = callPackage ../development/libraries/filter-audio {}; + filtron = callPackage ../servers/filtron {}; + flann = callPackage ../development/libraries/flann { }; flatcc = callPackage ../development/libraries/flatcc { }; @@ -15530,6 +15828,24 @@ in # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; + + # gnatcoll-bindings repository + gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; }; + gnatcoll-iconv = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "iconv"; }; + gnatcoll-lzma = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "lzma"; }; + gnatcoll-omp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "omp"; }; + gnatcoll-python3 = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "python3"; }; + gnatcoll-readline = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "readline"; }; + gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; }; + gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; }; + + # gnatcoll-db repository + gnatcoll-postgres = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "postgres"; }; + gnatcoll-sql = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sql"; }; + gnatcoll-sqlite = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sqlite"; }; + gnatcoll-xref = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "xref"; }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; @@ -15541,6 +15857,7 @@ in goocanvas = callPackage ../development/libraries/goocanvas { }; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; + goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { }; goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; gflags = callPackage ../development/libraries/gflags { }; @@ -15562,7 +15879,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg; }; + callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; }); inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); @@ -15705,6 +16022,8 @@ in gdktarget = "x11"; }; + gtkextra = callPackage ../development/libraries/gtkextra { }; + gtk3 = callPackage ../development/libraries/gtk/3.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -15785,7 +16104,9 @@ in gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; - hamlib = callPackage ../development/libraries/hamlib { }; + hamlib = hamlib_3; + hamlib_3 = callPackage ../development/libraries/hamlib { }; + hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; @@ -15864,11 +16185,6 @@ in inherit (callPackage ../development/tools/misc/hydra { }) hydra-unstable; - hydra-flakes = throw '' - Flakes support has been merged into Hydra's master. Please use - `pkgs.hydra-unstable` now. - ''; - hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; @@ -16060,6 +16376,8 @@ in judy = callPackage ../development/libraries/judy { }; + kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; + keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -16114,6 +16432,8 @@ in lmdbxx = callPackage ../development/libraries/lmdbxx { }; + lemon-graph = callPackage ../development/libraries/lemon-graph { }; + levmar = callPackage ../development/libraries/levmar { }; leptonica = callPackage ../development/libraries/leptonica { }; @@ -16168,10 +16488,14 @@ in libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libargs = callPackage ../development/libraries/libargs { }; + libarchive = callPackage ../development/libraries/libarchive { autoreconfHook = buildPackages.autoreconfHook269; }; + libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; + libasr = callPackage ../development/libraries/libasr { }; libass = callPackage ../development/libraries/libass { }; @@ -16237,14 +16561,16 @@ in libcacard = callPackage ../development/libraries/libcacard { }; + libcamera = callPackage ../development/libraries/libcamera { }; + libcanberra = callPackage ../development/libraries/libcanberra { - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; }; libcanberra-gtk2 = pkgs.libcanberra.override { - gtk = gtk2-x11; + gtkSupport = "gtk2"; }; libcanberra-gtk3 = pkgs.libcanberra.override { - gtk = gtk3-x11; + gtkSupport = "gtk3"; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) @@ -16360,7 +16686,10 @@ in libdeflate = callPackage ../development/libraries/libdeflate { }; - libdeltachat = callPackage ../development/libraries/libdeltachat { }; + libdeltachat = callPackage ../development/libraries/libdeltachat { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + inherit (darwin) libiconv; + }; libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -16552,6 +16881,8 @@ in libechonest = callPackage ../development/libraries/libechonest { }; + libemf2svg = callPackage ../development/libraries/libemf2svg { }; + libev = callPackage ../development/libraries/libev { }; libevent = callPackage ../development/libraries/libevent { }; @@ -16584,6 +16915,8 @@ in libffi = callPackage ../development/libraries/libffi { }; + libfreeaptx = callPackage ../development/libraries/libfreeaptx { }; + libfreefare = callPackage ../development/libraries/libfreefare { inherit (darwin) libobjc; }; @@ -17073,8 +17406,6 @@ in librsync = callPackage ../development/libraries/librsync { }; - librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { }; - librttopo = callPackage ../development/libraries/librttopo { }; libs3 = callPackage ../development/libraries/libs3 { }; @@ -17168,9 +17499,12 @@ in libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + python = python2; }; - libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; + libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { + python = python2; + }; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; @@ -17185,8 +17519,6 @@ in libtap = callPackage ../development/libraries/libtap { }; - libtgvoip = callPackage ../development/libraries/libtgvoip { }; - libtsm = callPackage ../development/libraries/libtsm { }; libgeotiff = callPackage ../development/libraries/libgeotiff { }; @@ -17261,6 +17593,8 @@ in libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; libva1-minimal = libva1.override { minimal = true; }; + libvarlink = callPackage ../development/libraries/libvarlink { }; + libvdpau = callPackage ../development/libraries/libvdpau { }; libmodulemd = callPackage ../development/libraries/libmodulemd { }; @@ -17276,6 +17610,8 @@ in libvisio = callPackage ../development/libraries/libvisio { }; + libvisio2svg = callPackage ../development/libraries/libvisio2svg { }; + libvisual = callPackage ../development/libraries/libvisual { }; libvmaf = callPackage ../development/libraries/libvmaf { }; @@ -17519,7 +17855,7 @@ in mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { + mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; }; @@ -17585,7 +17921,7 @@ in mvapich = callPackage ../development/libraries/mvapich { }; - mygpoclient = pythonPackages.mygpoclient; + mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; mygui = callPackage ../development/libraries/mygui { ogre = ogre1_9; @@ -17797,11 +18133,16 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; + pythonPackages = python3Packages; }; opencv = opencv4; - openexr = callPackage ../development/libraries/openexr { }; + imath = callPackage ../development/libraries/imath { }; + + openexr = openexr_2; + openexr_2 = callPackage ../development/libraries/openexr { }; + openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -17837,7 +18178,6 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_1 libressl_3_2; # Please keep this pointed to the latest version. See also @@ -17868,6 +18208,8 @@ in openrct2 = callPackage ../games/openrct2 { }; + optparse-bash = callPackage ../development/libraries/optparse-bash { }; + orcania = callPackage ../development/libraries/orcania { }; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; @@ -17964,7 +18306,9 @@ in }; }); - portmidi = callPackage ../development/libraries/portmidi {}; + portmidi = callPackage ../development/libraries/portmidi { + inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; + }; presage = callPackage ../development/libraries/presage { }; @@ -18079,45 +18423,27 @@ in (import ../development/libraries/qt-5/5.12) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { @@ -18147,8 +18473,6 @@ in qtEnv = qt5.env; qt5Full = qt5.full; - qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -18217,9 +18541,6 @@ in lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - leksah = throw ("To use leksah, refer to the instructions in " + - "https://github.com/leksah/leksah."); - libgme = callPackage ../development/libraries/audio/libgme { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -18245,7 +18566,7 @@ in qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt514.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; randomx = callPackage ../development/libraries/randomx { }; @@ -18274,12 +18595,14 @@ in ronn = callPackage ../development/tools/ronn { }; - rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; rubberband = callPackage ../development/libraries/rubberband { }; + rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; + s2geometry = callPackage ../development/libraries/s2geometry { }; /* This package references ghc844, which we no longer have. Unfortunately, I @@ -18401,10 +18724,15 @@ in buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { inherit cleanPackaging; }; + buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { }; skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; + execline-man-pages = callPackage ../data/documentation/execline-man-pages { + inherit buildManPages; + }; + s6 = callPackage ../tools/system/s6 { }; s6-dns = callPackage ../tools/networking/s6-dns { }; s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; @@ -18412,6 +18740,12 @@ in s6-networking = callPackage ../tools/networking/s6-networking { }; s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + s6-man-pages = callPackage ../data/documentation/s6-man-pages { + inherit buildManPages; + }; + s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages { + inherit buildManPages; + }; mdevd = callPackage ../os-specific/linux/mdevd { }; nsss = callPackage ../development/libraries/nsss { }; @@ -18693,13 +19027,9 @@ in theft = callPackage ../development/libraries/theft { }; - thrift = callPackage ../development/libraries/thrift { - inherit (pythonPackages) twisted; - }; + thrift = callPackage ../development/libraries/thrift { }; - thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { - inherit (pythonPackages) twisted; - }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; tidyp = callPackage ../development/libraries/tidyp { }; @@ -18746,6 +19076,8 @@ in tremor = callPackage ../development/libraries/tremor { }; + triehash = callPackage ../tools/misc/triehash { }; + trillian = callPackage ../tools/misc/trillian { buildGoModule = buildGo115Module; }; @@ -18912,7 +19244,7 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - inherit (darwin.apple_sdk) sdk; + inherit (darwin) apple_sdk; }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -19026,6 +19358,8 @@ in ]; }; + xmlada = callPackage ../development/libraries/ada/xmlada { }; + xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; xmlsec = callPackage ../development/libraries/xmlsec { }; @@ -19207,9 +19541,6 @@ in ### DEVELOPMENT / GO MODULES - buildGo114Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_14; - }; buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; @@ -19219,9 +19550,6 @@ in buildGoPackage = buildGo116Package; - buildGo114Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_14; - }; buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; @@ -19580,7 +19908,7 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -19625,6 +19953,8 @@ in hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + ic-keysmith = callPackage ../tools/security/ic-keysmith { }; + icecream = callPackage ../servers/icecream { }; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; @@ -19707,6 +20037,10 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + listadmin = callPackage ../applications/networking/listadmin {}; + + maker-panel = callPackage ../tools/misc/maker-panel { }; + mastodon = callPackage ../servers/mastodon { }; materialize = callPackage ../servers/sql/materialize { @@ -19785,6 +20119,8 @@ in neard = callPackage ../servers/neard { }; + networkaudiod = callPackage ../servers/networkaudiod { }; + unit = callPackage ../servers/http/unit { }; ncdns = callPackage ../servers/dns/ncdns { }; @@ -19817,7 +20153,7 @@ in modules = [ nginxModules.dav nginxModules.moreheaders ]; }; - nginxModules = callPackage ../servers/http/nginx/modules.nix { }; + nginxModules = recurseIntoAttrs (callPackage ../servers/http/nginx/modules.nix { }); # We should move to dynmaic modules and create a nginxFull package with all modules nginxShibboleth = nginxStable.override { @@ -19873,6 +20209,8 @@ in postfix = callPackage ../servers/mail/postfix { }; + postfixadmin = callPackage ../servers/postfixadmin { }; + postsrsd = callPackage ../servers/mail/postsrsd { }; rspamd = callPackage ../servers/mail/rspamd { }; @@ -20022,7 +20360,7 @@ in }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { - inherit (darwin) cctools developer_cmds; + inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost173; # Configure checks for specific version. protobuf = protobuf3_11; @@ -20127,9 +20465,11 @@ in postgresql_13 postgresql_14 ; - postgresql = postgresql_11.override { this = postgresql; }; + postgresql = postgresql_13.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql11Packages = pkgs.postgresqlPackages; + postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; + postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; + postgresql13Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -20152,6 +20492,7 @@ in 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-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -20216,8 +20557,6 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = beam_nox.interpreters.elixir_1_8; - erlang = beam_nox.interpreters.erlangR23; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; @@ -20230,6 +20569,8 @@ in rake = callPackage ../development/tools/build-managers/rake { }; + rakkess = callPackage ../development/tools/rakkess { }; + redis = callPackage ../servers/nosql/redis { }; redstore = callPackage ../servers/http/redstore { }; @@ -20258,6 +20599,8 @@ in roon-bridge = callPackage ../servers/roon-bridge { }; + rpiplay = callPackage ../servers/rpiplay { }; + roon-server = callPackage ../servers/roon-server { }; s6 = skawarePackages.s6; @@ -20270,10 +20613,7 @@ in deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba4 = callPackage ../servers/samba/4.x.nix { - rpcgen = netbsd.rpcgen; - python = python3; - }; + samba4 = callPackage ../servers/samba/4.x.nix { }; samba = samba4; @@ -20410,10 +20750,16 @@ in urserver = callPackage ../servers/urserver { }; + vouch-proxy = callPackage ../servers/vouch-proxy { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtualenv = with python3Packages; toPythonApplication virtualenv; + + virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { openssl = openssl_1_0_2; }; @@ -20434,8 +20780,6 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; - xinetd = callPackage ../servers/xinetd { }; zookeeper = callPackage ../servers/zookeeper { @@ -20856,7 +21200,7 @@ in linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -20993,14 +21337,14 @@ in ]; }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { + linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -21085,9 +21429,7 @@ in acpi_call = callPackage ../os-specific/linux/acpi-call {}; - akvcam = callPackage ../os-specific/linux/akvcam { - inherit (qt5) qmake; - }; + akvcam = callPackage ../os-specific/linux/akvcam { }; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; @@ -21224,7 +21566,7 @@ in oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -21299,7 +21641,7 @@ in # 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_13; + linuxPackages_latest = linuxPackages_5_14; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -21323,8 +21665,8 @@ 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_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); + linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -21355,11 +21697,8 @@ in linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); # 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_12; - kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; - in linuxPackagesFor (kernel.override { + hardenedLinuxPackagesFor = kernel: overrides: + linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit lib; inherit (kernel) version; @@ -21374,8 +21713,17 @@ in linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); - linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_4_14_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_14 { }); + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + + linuxPackages_4_19_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_19 { }); + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + + linuxPackages_5_4_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_4 { }); + linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + + linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); + linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); @@ -21408,12 +21756,17 @@ in inherit name src; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + postPatch = '' + patchShebangs scripts/ + ''; buildPhase = '' + ( set -x make \ ARCH=${stdenv.hostPlatform.linuxArch} \ HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ ${makeTarget} + ) ''; installPhase = '' cp .config $out @@ -21666,8 +22019,6 @@ in odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; - ofp = callPackage ../os-specific/linux/ofp { }; - ofono = callPackage ../tools/networking/ofono { }; openpam = callPackage ../development/libraries/openpam { }; @@ -22309,6 +22660,8 @@ in envdir = callPackage ../tools/misc/envdir-go { }; + execline-man-pages = skawarePackages.execline-man-pages; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -22803,6 +23156,8 @@ in recursive = callPackage ../data/fonts/recursive { }; + rubik = callPackage ../data/fonts/rubik { }; + rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; @@ -22823,6 +23178,10 @@ in open-fonts = callPackage ../data/fonts/open-fonts { }; + s6-man-pages = skawarePackages.s6-man-pages; + + s6-networking-man-pages = skawarePackages.s6-networking-man-pages; + scientifica = callPackage ../data/fonts/scientifica { }; siji = callPackage ../data/fonts/siji @@ -22953,17 +23312,23 @@ in victor-mono = callPackage ../data/fonts/victor-mono { }; - vimix-gtk-themes = callPackage ../data/themes/vimix {}; + vimix-gtk-themes = callPackage ../data/themes/vimix { + inherit (gnome) gnome-shell; + }; vistafonts = callPackage ../data/fonts/vista-fonts { }; vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; + vistafonts-cht = callPackage ../data/fonts/vista-fonts-cht { }; + vollkorn = callPackage ../data/fonts/vollkorn { }; weather-icons = callPackage ../data/fonts/weather-icons { }; - whitesur-gtk-theme = callPackage ../data/themes/whitesur { }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { + inherit (gnome) gnome-shell; + }; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; @@ -23096,6 +23461,8 @@ in anup = callPackage ../applications/misc/anup {}; + anytype = callPackage ../applications/misc/anytype { }; + ao = libfive; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; @@ -23147,7 +23514,11 @@ in aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; - astroid = callPackage ../applications/networking/mailreaders/astroid { }; + assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; + + astroid = callPackage ../applications/networking/mailreaders/astroid { + vim = vim_configurable.override { features = "normal"; gui = "auto"; }; + }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -23178,6 +23549,8 @@ in cheesecutter = callPackage ../applications/audio/cheesecutter { }; + corefm = libsForQt5.callPackage ../applications/misc/corefm { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -23199,8 +23572,6 @@ in autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - aesop = callPackage ../applications/office/aesop { }; - AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; @@ -23223,6 +23594,8 @@ in backintime = backintime-qt; + ballerburg = callPackage ../games/ballerburg { } ; + balsa = callPackage ../applications/networking/mailreaders/balsa { }; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -23421,12 +23794,16 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + cyanrip = callPackage ../applications/audio/cyanrip { }; + centerim = callPackage ../applications/networking/instant-messengers/centerim { }; cgit = callPackage ../applications/version-management/git-and-tools/cgit { inherit (python3Packages) python wrapPython pygments markdown; }; + chatty = callPackage ../applications/networking/instant-messengers/chatty { }; + chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -23514,6 +23891,8 @@ in copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; + corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -23551,6 +23930,7 @@ in comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; + containerd_1_4 = callPackage ../applications/virtualization/containerd/1.4.nix { }; convchain = callPackage ../tools/graphics/convchain {}; @@ -23566,7 +23946,9 @@ in python3Packages = python37Packages; }; - cqrlog = callPackage ../applications/radio/cqrlog { }; + cqrlog = callPackage ../applications/radio/cqrlog { + hamlib = hamlib_4; + }; crun = callPackage ../applications/virtualization/crun {}; @@ -23630,6 +24012,7 @@ in infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { @@ -23644,7 +24027,9 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/radio/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { + hamlib = hamlib_4; + }; dirt = callPackage ../applications/audio/dirt {}; @@ -23696,6 +24081,8 @@ in docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; + dockfmt = callPackage ../development/tools/dockfmt { }; + afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; @@ -23716,12 +24103,14 @@ in drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; + drawterm = callPackage ../tools/admin/drawterm { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -23732,6 +24121,8 @@ in du-dust = callPackage ../tools/misc/dust { }; + dutree = callPackage ../tools/misc/dutree { }; + devede = callPackage ../applications/video/devede { }; denemo = callPackage ../applications/audio/denemo { }; @@ -23780,7 +24171,7 @@ in jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { + ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -23844,8 +24235,8 @@ in }; emacsPackagesFor = emacs: import ./emacs-packages.nix { - inherit (lib) makeScope makeOverridable; - inherit emacs; + inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; + emacs' = emacs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; @@ -23853,8 +24244,6 @@ in enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; - envelope = callPackage ../applications/office/envelope { }; - eolie = callPackage ../applications/networking/browsers/eolie { }; epdfview = callPackage ../applications/misc/epdfview { }; @@ -23896,6 +24285,8 @@ in expenses = callPackage ../applications/misc/expenses { }; + fnott = callPackage ../applications/misc/fnott { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -23976,7 +24367,9 @@ in flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { }; + fldigi = callPackage ../applications/radio/fldigi { + hamlib = hamlib_4; + }; flink = callPackage ../applications/networking/cluster/flink { }; @@ -24044,6 +24437,8 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + genact = callPackage ../applications/misc/genact { }; + genxword = callPackage ../applications/misc/genxword { }; geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; @@ -24231,8 +24626,6 @@ in }; wireshark-qt = wireshark; - # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -24265,13 +24658,18 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; - firefox-esr-unwrapped = firefox-esr-78-unwrapped; - firefox-beta-unwrapped = firefoxPackages.firefox-beta; + firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; + firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr = firefox-esr-78; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; + firefox-beta = wrapFirefox firefox-beta-unwrapped { }; + firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; @@ -24279,7 +24677,7 @@ in }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-bin"; desktopName = "Firefox"; }; @@ -24290,7 +24688,7 @@ in }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -24301,7 +24699,7 @@ in }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - browserName = "firefox"; + applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; @@ -24620,7 +25018,9 @@ in gollum = callPackage ../applications/misc/gollum { }; - gonic = callPackage ../servers/gonic { }; + gonic = callPackage ../servers/gonic { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; + }; googleearth = callPackage ../applications/misc/googleearth { }; @@ -24819,6 +25219,8 @@ in musikcube = callPackage ../applications/audio/musikcube {}; + pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; + pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; pinboard = with python3Packages; toPythonApplication pinboard; @@ -24829,6 +25231,8 @@ in pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { }; + shepherd = nodePackages."@nerdwallet/shepherd"; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-cli = callPackage ../tools/networking/slack-cli { }; @@ -24930,7 +25334,7 @@ in i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { - inherit (xorg) xrdb; + inherit (xorg) xdpyinfo xrandr xset; }; multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; @@ -24979,7 +25383,7 @@ in ikiwiki = callPackage ../applications/misc/ikiwiki { python = python3; - inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; + inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; }; iksemel = callPackage ../development/libraries/iksemel { }; @@ -25085,6 +25489,8 @@ in inspectrum = callPackage ../applications/radio/inspectrum { }; + inputplug = callPackage ../tools/X11/inputplug { }; + ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; @@ -25175,6 +25581,7 @@ in stdenv = gcc6Stdenv; boost = boost155.override { enablePython = true; + python = python2; stdenv = gcc6Stdenv; buildPackages = buildPackages // { stdenv = gcc6Stdenv; @@ -25345,6 +25752,8 @@ in kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { @@ -25533,6 +25942,8 @@ in lscolors = callPackage ../applications/misc/lscolors { }; + luddite = with python3Packages; toPythonApplication luddite; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; @@ -25570,8 +25981,6 @@ in magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; - mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; @@ -25599,6 +26008,8 @@ in mark = callPackage ../tools/text/mark { }; + markets = callPackage ../applications/misc/markets { }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -25671,6 +26082,8 @@ in merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + meshcentral = callPackage ../tools/admin/meshcentral { }; + meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { }; @@ -25720,6 +26133,8 @@ in ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; + mlvwm = callPackage ../applications/window-managers/mlvwm { }; + MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { @@ -25745,6 +26160,8 @@ in xmrig = callPackage ../applications/misc/xmrig { }; + xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; @@ -25816,7 +26233,10 @@ in mpc123 = callPackage ../applications/audio/mpc123 { }; - mpg123 = callPackage ../applications/audio/mpg123 { }; + mpg123 = callPackage ../applications/audio/mpg123 { + inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; + jack = libjack2; + }; mpg321 = callPackage ../applications/audio/mpg321 { }; @@ -26023,6 +26443,8 @@ in pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; + pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { }; @@ -26053,6 +26475,8 @@ in yambar = callPackage ../applications/misc/yambar { }; + yambar-wayland = callPackage ../applications/misc/yambar { waylandSupport = true; }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -26270,8 +26694,6 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; - ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -26428,6 +26850,8 @@ in inherit (gnome2) libgnomecanvas; }; + pdfchain = callPackage ../tools/typesetting/pdfchain { }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -26489,6 +26913,8 @@ in plugins = []; }; + pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; + pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; @@ -26582,9 +27008,7 @@ in polylith = callPackage ../development/tools/misc/polylith { }; - polymake = callPackage ../applications/science/math/polymake { - openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + polymake = callPackage ../applications/science/math/polymake { }; pond = callPackage ../applications/networking/instant-messengers/pond { }; @@ -26602,6 +27026,8 @@ in qiv = callPackage ../applications/graphics/qiv { }; + premid = callPackage ../applications/misc/premid { }; + processing = callPackage ../applications/graphics/processing { jdk = oraclejdk8; }; @@ -26767,9 +27193,9 @@ in tag = "-daemon-qt5"; }; - quirc = callPackage ../tools/graphics/quirc {}; + quill-qr = callPackage ../tools/security/quill-qr { }; - quilter = callPackage ../applications/editors/quilter { }; + quirc = callPackage ../tools/graphics/quirc {}; quisk = python38Packages.callPackage ../applications/radio/quisk { }; @@ -26924,8 +27350,6 @@ in rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; librtlsdr = callPackage ../development/libraries/librtlsdr { }; - rtv = callPackage ../applications/misc/rtv { }; - rubyripper = callPackage ../applications/audio/rubyripper {}; runc = callPackage ../applications/virtualization/runc {}; @@ -27004,8 +27428,6 @@ in skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; slmenu = callPackage ../applications/misc/slmenu {}; @@ -27018,6 +27440,8 @@ in sniproxy = callPackage ../applications/networking/sniproxy { }; + snixembed = callPackage ../applications/misc/snixembed { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sops = callPackage ../tools/security/sops { }; @@ -27375,10 +27799,14 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (xorg) libpthreadstubs libXdmcp; + }; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; + telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; @@ -27420,22 +27848,28 @@ in thonny = callPackage ../applications/editors/thonny { }; - thunderbird = thunderbird-78; + thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { + callPackage = pkgs.newScope { + inherit (rustPackages) cargo rustc; + libpng = libpng_apng; + gnused = gnused_422; + inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling + Kerberos AVFoundation MediaToolbox + CoreLocation Foundation AddressBook; + inherit (darwin) libobjc; + }; + }); - thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - # Using older Rust for workaround: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 - inherit (rustPackages_1_45) cargo rustc; - libpng = libpng_apng; - icu = icu67; - libvpx = libvpx_1_8; - gtk3Support = true; - }; + thunderbird-unwrapped = thunderbirdPackages.thunderbird; + thunderbird-78-unwrapped = thunderbirdPackages.thunderbird-78; + thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-78 = wrapThunderbird thunderbird-78-unwrapped { }; + thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = thunderbird-bin-78; - thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + thunderbird-bin = thunderbird-bin-91; + thunderbird-bin-91 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; @@ -27565,6 +27999,8 @@ in trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; + ttyper = callPackage ../applications/misc/ttyper { }; + tudu = callPackage ../applications/office/tudu { }; tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; @@ -27575,7 +28011,10 @@ in tut = callPackage ../applications/misc/tut { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { + jre = jre8; + swt = swt_jdk8; + }; twister = callPackage ../applications/networking/p2p/twister { }; @@ -27603,7 +28042,7 @@ in umurmur = callPackage ../applications/networking/umurmur { }; - udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + udocker = callPackage ../tools/virtualization/udocker { }; uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; @@ -27712,31 +28151,11 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64: - # ./luarocks init - # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: - # no field package.preload['luarocks.core.hardcoded'] - # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' - # no file './luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file './luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/loadall.so' - # no file './luarocks.so' - # no file '/usr/local/lib/lua/5.1/luarocks.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' - # no file '/usr/local/lib/lua/5.1/loadall.so') - # make: *** [GNUmakefile:57: luarocks] Error 1 - # - # See https://github.com/NixOS/nixpkgs/issues/129099 - # Possibly related: https://github.com/neovim/neovim/issues/7879 + # See: + # - https://github.com/NixOS/nixpkgs/issues/129099 + # - https://github.com/NixOS/nixpkgs/issues/128959 lua = - if stdenv.isAarch64 then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else luajit; }; @@ -27746,8 +28165,6 @@ in 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 { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { gtk = pkgs.gtk3; }; @@ -27940,9 +28357,6 @@ in 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 = recurseIntoAttrs ( @@ -28052,6 +28466,8 @@ in wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; + wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { }; + wp-cli = callPackage ../development/tools/wp-cli { }; retroArchCores = @@ -28330,6 +28746,8 @@ in xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; + xplugd = callPackage ../tools/X11/xplugd { }; + xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; xkb-switch = callPackage ../tools/X11/xkb-switch { }; @@ -28457,6 +28875,10 @@ in youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; + yt-dlp = with python3Packages; toPythonApplication yt-dlp; + + yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; + youtube-viewer = perlPackages.WWWYoutubeViewer; ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; @@ -28514,9 +28936,6 @@ in zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; - # Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build - # with rust 1.53. This should be fixed in the next version. - rustPlatform = rustPackages_1_45.rustPlatform; }; zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; @@ -28529,6 +28948,8 @@ in zsteg = callPackage ../tools/security/zsteg { }; + inherit (nodePackages) zx; + zynaddsubfx = zyn-fusion; zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { @@ -28556,38 +28977,62 @@ in 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; }; + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { + miniupnpc = miniupnpc_2; + withGui = true; + }; + + bitcoind = callPackage ../applications/blockchains/bitcoin { + miniupnpc = miniupnpc_2; + withGui = false; + }; - bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; cgminer = callPackage ../applications/blockchains/cgminer { }; chia = callPackage ../applications/blockchains/chia { }; - clightning = callPackage ../applications/blockchains/clightning.nix { }; + chia-plotter = callPackage ../applications/blockchains/chia-plotter { }; - bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { + clightning = callPackage ../applications/blockchains/clightning { }; + + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { + boost = boost165; + withGui = true; + }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; mkDerivation = stdenv.mkDerivation; withGui = false; }; - bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; - bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = false; }; - bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; - bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic { + boost = boost165; + withGui = true; + }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic { + boost = boost165; + withGui = false; + }; - bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; - bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold { + boost = boost165; + withGui = true; + }; + bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold { + boost = boost165; + withGui = false; + }; btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; @@ -28595,33 +29040,47 @@ in cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; - dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + dashpay = callPackage ../applications/blockchains/dashpay { }; - dcrd = callPackage ../applications/blockchains/dcrd.nix { }; - dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + dcrd = callPackage ../applications/blockchains/dcrd { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + dero = callPackage ../applications/blockchains/dero { boost = boost165; }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; - digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; }; + digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; }; - dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; - dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + dogecoin = callPackage ../applications/blockchains/dogecoin { + boost = boost165; + withGui = true; + }; + dogecoind = callPackage ../applications/blockchains/dogecoin { + boost = boost165; + withGui = false; + }; - eclair = callPackage ../applications/blockchains/eclair.nix { }; + eclair = callPackage ../applications/blockchains/eclair { }; - electrs = callPackage ../applications/blockchains/electrs.nix { }; + electrs = callPackage ../applications/blockchains/electrs { }; - elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; - elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; + elements = libsForQt5.callPackage ../applications/blockchains/elements { + miniupnpc = miniupnpc_2; + withGui = true; + }; + elementsd = callPackage ../applications/blockchains/elements { + miniupnpc = miniupnpc_2; + withGui = false; + }; ergo = callPackage ../applications/blockchains/ergo { }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; + exodus = callPackage ../applications/blockchains/exodus { }; faraday = callPackage ../applications/blockchains/faraday { }; - go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { + go-ethereum = callPackage ../applications/blockchains/go-ethereum { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -28634,18 +29093,18 @@ in lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; livedl = callPackage ../tools/misc/livedl { }; - lnd = callPackage ../applications/blockchains/lnd.nix { }; + lnd = callPackage ../applications/blockchains/lnd { }; lndconnect = callPackage ../applications/blockchains/lndconnect { }; - lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; + lndmanage = callPackage ../applications/blockchains/lndmanage { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -28660,18 +29119,21 @@ in boost = boost17x; }; - masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + masari = callPackage ../applications/blockchains/masari { boost = boost165; }; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; - namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { + pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx { withGui = false; + qtbase = null; + qttools = null; + wrapQtAppsHook = null; autoreconfHook = buildPackages.autoreconfHook269; }; @@ -28679,22 +29141,26 @@ in pycoin = with python3Packages; toPythonApplication pycoin; - stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; - - sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + stellar-core = callPackage ../applications/blockchains/stellar-core { }; - tessera = callPackage ../applications/blockchains/tessera.nix { }; + sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; }; - turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { }; + tessera = callPackage ../applications/blockchains/tessera { }; - vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; - vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { + boost = boost165; + withGui = true; + }; + vertcoind = callPackage ../applications/blockchains/vertcoin { + boost = boost165; + withGui = false; + }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; + wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; - wownero = callPackage ../applications/blockchains/wownero.nix {}; + wownero = callPackage ../applications/blockchains/wownero { }; zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; @@ -28706,9 +29172,9 @@ in polkadot = callPackage ../applications/blockchains/polkadot { }; - particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; - quorum = callPackage ../applications/blockchains/quorum.nix { }; + quorum = callPackage ../applications/blockchains/quorum { }; whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; @@ -28794,10 +29260,6 @@ in beret = callPackage ../games/beret { }; - bitsnbots = callPackage ../games/bitsnbots { - lua = lua5; - }; - black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; }; @@ -28814,6 +29276,8 @@ in brogue = callPackage ../games/brogue { }; + brutalmaze = callPackage ../games/brutalmaze { }; + bsdgames = callPackage ../games/bsdgames { }; btanks = callPackage ../games/btanks { }; @@ -28832,6 +29296,8 @@ in cdogs-sdl = callPackage ../games/cdogs-sdl { }; + cgoban = callPackage ../games/cgoban { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; @@ -28848,6 +29314,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; + vintagestory = callPackage ../games/vintagestory/default.nix { }; + cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -28926,6 +29394,8 @@ in eboard = callPackage ../games/eboard { }; + ecwolf = callPackage ../games/ecwolf { }; + eduke32 = callPackage ../games/eduke32 { }; egoboo = callPackage ../games/egoboo { }; @@ -29048,6 +29518,8 @@ in gmad = callPackage ../games/gmad { }; + gnonograms = callPackage ../games/gnonograms { }; + gnubg = callPackage ../games/gnubg { }; gnuchess = callPackage ../games/gnuchess { }; @@ -29142,6 +29614,8 @@ in liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; + liberation-circuit = callPackage ../games/liberation-circuit { }; + lincity = callPackage ../games/lincity {}; lincity_ng = callPackage ../games/lincity/ng.nix { @@ -29359,6 +29833,8 @@ in racer = callPackage ../games/racer { }; + randtype = callPackage ../games/randtype { }; + redeclipse = callPackage ../games/redeclipse { }; residualvm = callPackage ../games/residualvm { }; @@ -29390,6 +29866,12 @@ in rocksndiamonds = callPackage ../games/rocksndiamonds { }; + rott = callPackage ../games/rott { }; + + rott-shareware = rott.override { + buildShareware = true; + }; + rrootage = callPackage ../games/rrootage { }; saga = libsForQt5.callPackage ../applications/gis/saga { @@ -29502,6 +29984,8 @@ in inherit (gnome) zenity; }; + protonup = with python3Packages; toPythonApplication protonup; + sdlpop = callPackage ../games/sdlpop { }; stepmania = callPackage ../games/stepmania { @@ -29759,8 +30243,8 @@ in keen4 = callPackage ../games/keen4 { }; - zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { - wxGTK = wxGTK30; + zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { + wxGTK = wxGTK31; }); zeroad = zeroadPackages.zeroad; @@ -29847,10 +30331,20 @@ in eigen = eigen2; }; + avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { }; + + molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { }; + + avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; + chemtool = callPackage ../applications/science/chemistry/chemtool { }; + cp2k = callPackage ../applications/science/chemistry/cp2k { }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; + ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; jmol = callPackage ../applications/science/chemistry/jmol { @@ -29951,6 +30445,8 @@ in conglomerate = callPackage ../applications/science/biology/conglomerate { }; + dalfox = callPackage ../tools/security/dalfox { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; deepdiff = with python3Packages; toPythonApplication deepdiff; @@ -30125,6 +30621,8 @@ in ### SCIENCE/MACHINE LEARNING + nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { }; + sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; ### SCIENCE/MATH @@ -30385,7 +30883,7 @@ in cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; - crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet.nix { }; + crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; caprice32 = callPackage ../misc/emulators/caprice32 { }; @@ -30463,6 +30961,8 @@ in logisim = callPackage ../applications/science/logic/logisim {}; + logisim-evolution = callPackage ../applications/science/logic/logisim-evolution {}; + ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; metis-prover = callPackage ../applications/science/logic/metis-prover { }; @@ -30546,6 +31046,8 @@ in boolector = callPackage ../applications/science/logic/boolector {}; + bitwuzla = callPackage ../applications/science/logic/bitwuzla {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; mcy = callPackage ../applications/science/logic/mcy {}; @@ -30608,6 +31110,8 @@ in openems = callPackage ../applications/science/electronics/openems { }; + openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; + pcb = callPackage ../applications/science/electronics/pcb { }; qucs = callPackage ../applications/science/electronics/qucs { }; @@ -30709,7 +31213,9 @@ in scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; + mininet = callPackage ../tools/virtualization/mininet { + python = python3; + }; msieve = callPackage ../applications/science/math/msieve { }; @@ -31005,6 +31511,8 @@ in emu2 = callPackage ../misc/emulators/emu2 { }; + apt = callPackage ../tools/package-management/apt { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -31055,7 +31563,7 @@ in faustStk = callPackage ../applications/audio/faustStk { }; - fceux = callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -31096,6 +31604,8 @@ in gobuster = callPackage ../tools/security/gobuster { }; + gotestwaf = callPackage ../tools/security/gotestwaf { }; + guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; @@ -31104,6 +31614,8 @@ in hatari = callPackage ../misc/emulators/hatari { }; + hck = callPackage ../tools/text/hck { }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; @@ -31453,10 +31965,8 @@ in nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + - (lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) - "ugrade your Nix installation to a newer version and ") + - "use `nix repl` instead. " + - "Also see https://github.com/NixOS/nixpkgs/pull/44903" + (lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") + + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; @@ -31653,6 +32163,8 @@ in run-scaled = callPackage ../tools/X11/run-scaled { }; + runiq = callPackage ../tools/text/runiq { }; + runit = callPackage ../tools/system/runit { }; refind = callPackage ../tools/bootloaders/refind { }; @@ -31708,6 +32220,8 @@ in sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); + sane-drivers = callPackage ../applications/graphics/sane/drivers.nix {}; + senv = callPackage ../applications/misc/senv { }; brlaser = callPackage ../misc/cups/drivers/brlaser { }; @@ -31898,7 +32412,7 @@ in unicode-paracode = callPackage ../tools/misc/unicode { }; - unixcw = callPackage ../applications/radio/unixcw { }; + unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; vault = callPackage ../tools/security/vault { }; @@ -31929,10 +32443,14 @@ in viewnior = callPackage ../applications/graphics/viewnior { }; - vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; + + vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { + inherit (lua51Packages) hasLuaModule; + }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { llvmPackages = llvmPackages_6; + luaPackages = lua51Packages; }); vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; @@ -32030,6 +32548,8 @@ in wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.stubs) setfile rez derez; }; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { @@ -32097,8 +32617,7 @@ in xzoom = callPackage ../tools/X11/xzoom {}; yabai = callPackage ../os-specific/darwin/yabai { - inherit (darwin.apple_sdk.frameworks) - Carbon Cocoa ScriptingBridge; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; }; yabause = libsForQt5.callPackage ../misc/emulators/yabause { @@ -32172,6 +32691,11 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; + yapesdl = callPackage ../misc/emulators/yapesdl { }; x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; @@ -32390,7 +32914,7 @@ in stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; + omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; }; wasmtime = callPackage ../development/interpreters/wasmtime {}; @@ -32458,9 +32982,11 @@ in fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; - btcdeb = callPackage ../applications/blockchains/btcdeb {}; + btcdeb = callPackage ../applications/blockchains/btcdeb { }; - jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; + jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { + electron = electron_13; + }; zenstates = callPackage ../os-specific/linux/zenstates {}; |