diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1928 |
1 files changed, 1122 insertions, 806 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274b38377ba4a..787ea39ae4944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -182,6 +182,8 @@ with pkgs; althttpd = callPackage ../servers/althttpd { }; + anders = callPackage ../applications/science/logic/anders { }; + ankisyncd = callPackage ../servers/ankisyncd { }; aocd = with python3Packages; toPythonApplication aocd; @@ -200,16 +202,22 @@ with pkgs; fission = callPackage ../development/tools/fission { }; + appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bada-bib = callPackage ../applications/science/misc/bada-bib {}; + bakelite = callPackage ../tools/backup/bakelite { }; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bingo = callPackage ../development/tools/bingo {}; + breakpad = callPackage ../development/misc/breakpad { }; buf = callPackage ../development/tools/buf { }; @@ -247,9 +255,11 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; + + btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -315,12 +325,16 @@ with pkgs; deadcode = callPackage ../development/tools/deadcode { }; + deadnix = callPackage ../development/tools/deadnix { }; + each = callPackage ../tools/text/each { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; evans = callPackage ../development/tools/evans { }; + firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; + frugal = callPackage ../development/tools/frugal { }; glade = callPackage ../development/tools/glade { }; @@ -333,6 +347,10 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; @@ -343,7 +361,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -363,7 +381,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -427,11 +445,7 @@ with pkgs; dotfiles = callPackage ../applications/misc/dotfiles { }; - dotnetenv = callPackage ../build-support/dotnetenv { - dotnetfx = dotnetfx40; - }; - - dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; + # Dotnet dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); @@ -444,6 +458,17 @@ with pkgs; dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; + buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; + nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; + + dotnetenv = callPackage ../build-support/dotnet/dotnetenv { + dotnetfx = dotnetfx40; + }; + + buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; + fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; + dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; + dumb-init = callPackage ../applications/virtualization/dumb-init {}; umoci = callPackage ../applications/virtualization/umoci {}; @@ -529,6 +554,8 @@ with pkgs; run = callPackage ../development/tools/run { }; + mblock-mlink = callPackage ../development/tools/mblock-mlink { }; + mod = callPackage ../development/tools/mod { }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -643,11 +670,6 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - fetchNuGet = callPackage ../build-support/fetchnuget { }; - buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; - buildDotnetModule = callPackage ../build-support/build-dotnet-module { }; - nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; - fetchgx = callPackage ../build-support/fetchgx { }; resolveMirrorURLs = {url}: fetchurl { @@ -687,12 +709,20 @@ with pkgs; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; + makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { }; + makeAutostartItem = callPackage ../build-support/make-startupitem { }; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } - ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook + { deps = [ dieHook ]; + substitutions = { + shell = targetPackages.runtimeShell; + passthru.tests = tests.makeWrapper; + }; + } + ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = let f = { cc, sanitizers }: let @@ -789,6 +819,11 @@ with pkgs; substitutions = { inherit (binutils) targetPrefix; }; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; + writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; + + desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; } + ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; @@ -968,8 +1003,6 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; - airtame = callPackage ../applications/misc/airtame { }; - aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { @@ -993,6 +1026,8 @@ with pkgs; libgamemode32 = pkgsi686Linux.gamemode.lib; }; + gay = callPackage ../tools/misc/gay { }; + elkhound = callPackage ../development/tools/elkhound { }; weidu = callPackage ../tools/games/weidu { }; @@ -1001,6 +1036,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; + gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; @@ -1009,6 +1046,10 @@ with pkgs; godspeed = callPackage ../tools/networking/godspeed { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; + + headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; linux-router = callPackage ../tools/networking/linux-router { }; @@ -1019,7 +1060,7 @@ with pkgs; pferd = callPackage ../tools/misc/pferd {}; - qflipper = callPackage ../tools/misc/qflipper { }; + qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; quich = callPackage ../tools/misc/quich { } ; @@ -1062,6 +1103,10 @@ with pkgs; stdenv = clangStdenv; }; + archi = callPackage ../tools/misc/archi { }; + + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1069,8 +1114,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - archi = callPackage ../tools/misc/archi { }; - contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1081,8 +1124,6 @@ with pkgs; eterm = callPackage ../applications/terminal-emulators/eterm { }; - evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); - foot = callPackage ../applications/terminal-emulators/foot { }; germinal = callPackage ../applications/terminal-emulators/germinal { }; @@ -1093,30 +1134,16 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; - iqueue = callPackage ../development/libraries/iqueue {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; - lifecycled = callPackage ../tools/misc/lifecycled { }; - - lilo = callPackage ../tools/misc/lilo { }; - - lilyterm = callPackage ../applications/terminal-emulators/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - - logseq = callPackage ../applications/misc/logseq { }; + kitty-themes = callPackage ../misc/kitty-themes {}; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -1130,24 +1157,26 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - natls = callPackage ../tools/misc/natls { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; - - pikchr = callPackage ../tools/graphics/pikchr { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + rxvt-unicode-emoji = rxvt-unicode.override { + rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; + }; + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override { + emojiSupport = true; + }; + sakura = callPackage ../applications/terminal-emulators/sakura { }; st = callPackage ../applications/terminal-emulators/st { @@ -1166,8 +1195,6 @@ with pkgs; terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -1177,36 +1204,56 @@ with pkgs; termonad = termonad-with-packages; - termsyn = callPackage ../data/fonts/termsyn { }; - tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; tilix = callPackage ../applications/terminal-emulators/tilix { }; - timedoctor = callPackage ../applications/office/timedoctor { }; - - tvnamer = callPackage ../tools/misc/tvnamer { }; - - twine = with python3Packages; toPythonApplication twine; - wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; - writefreely = callPackage ../applications/misc/writefreely { }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { }; yaft = callPackage ../applications/terminal-emulators/yaft { }; + writefreely = callPackage ../applications/misc/writefreely { }; + + iqueue = callPackage ../development/libraries/iqueue { }; + + lifecycled = callPackage ../tools/misc/lifecycled { }; + + lilo = callPackage ../tools/misc/lilo { }; + + logseq = callPackage ../applications/misc/logseq { + electron = electron_15; + }; + + natls = callPackage ../tools/misc/natls { }; + + notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; + + pikchr = callPackage ../tools/graphics/pikchr { }; + + popsicle = callPackage ../tools/misc/popsicle { }; + + terminal-colors = callPackage ../applications/misc/terminal-colors { }; + + termsyn = callPackage ../data/fonts/termsyn { }; + + timedoctor = callPackage ../applications/office/timedoctor { }; + + tvnamer = callPackage ../tools/misc/tvnamer { }; + + twine = with python3Packages; toPythonApplication twine; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -1217,6 +1264,8 @@ with pkgs; amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; + amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { }; + amber = callPackage ../tools/text/amber { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1291,7 +1340,7 @@ with pkgs; ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; - archivebox = python3Packages.callPackage ../applications/misc/archivebox { }; + archivebox = callPackage ../applications/misc/archivebox { }; archivemount = callPackage ../tools/filesystems/archivemount { }; @@ -1473,8 +1522,6 @@ with pkgs; ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; - ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; - exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; altermime = callPackage ../tools/networking/altermime {}; @@ -1493,7 +1540,7 @@ with pkgs; client = true; }); - antennas = callPackage ../servers/antennas { }; + antennas = nodePackages.antennas; apg = callPackage ../tools/security/apg { }; @@ -1629,8 +1676,6 @@ with pkgs; corsair = with python3Packages; toPythonApplication corsair-scan; - corsmisc = callPackage ../tools/security/corsmisc { }; - cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; }; @@ -1661,6 +1706,8 @@ with pkgs; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + dcap = callPackage ../tools/networking/dcap { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { @@ -1687,6 +1734,8 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; + dontgo403 = callPackage ../tools/security/dontgo403 { }; + dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; dot-http = callPackage ../development/tools/dot-http { @@ -1707,10 +1756,6 @@ with pkgs; emplace = callPackage ../tools/package-management/emplace { }; - encryptr = callPackage ../tools/security/encryptr { - gconf = gnome2.GConf; - }; - enchive = callPackage ../tools/security/enchive { }; enjarify = callPackage ../tools/misc/enjarify { }; @@ -1747,6 +1792,8 @@ with pkgs; fspy = callPackage ../applications/misc/fspy { }; + fluffychat = callPackage ../applications/networking/instant-messengers/fluffychat { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genann = callPackage ../development/libraries/genann { }; @@ -1757,9 +1804,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo115Module; - }; + galene = callPackage ../servers/web-apps/galene { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1787,7 +1832,7 @@ with pkgs; github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; - gitless = callPackage ../applications/version-management/gitless { python = python3; }; + gitless = callPackage ../applications/version-management/gitless { }; gistyc = with python3Packages; toPythonApplication gistyc; @@ -1881,8 +1926,14 @@ with pkgs; ipgrep = callPackage ../tools/networking/ipgrep { }; + itch = callPackage ../games/itch {}; + + itch-setup = callPackage ../games/itch-setup {}; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; lsix = callPackage ../tools/graphics/lsix { }; @@ -1933,6 +1984,8 @@ with pkgs; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; @@ -2036,7 +2089,6 @@ with pkgs; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (python3Packages) sphinx; }; aria = aria2; @@ -2072,7 +2124,7 @@ with pkgs; avro-c = callPackage ../development/libraries/avro-c { }; - avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; + avro-cpp = callPackage ../development/libraries/avro-c++ { }; aws = callPackage ../tools/virtualization/aws { }; @@ -2123,6 +2175,8 @@ with pkgs; badvpn = callPackage ../tools/networking/badvpn {}; + baget = callPackage ../servers/web-apps/baget { }; + barcode = callPackage ../tools/graphics/barcode {}; bashmount = callPackage ../tools/filesystems/bashmount {}; @@ -2188,8 +2242,6 @@ with pkgs; bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; - blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; - blitz = callPackage ../development/libraries/blitz { }; blockbook = callPackage ../servers/blockbook { }; @@ -2267,7 +2319,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2323,9 +2375,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2333,9 +2385,7 @@ with pkgs; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - btrbk = callPackage ../tools/backup/btrbk { - asciidoc = asciidoc-full; - }; + btrbk = callPackage ../tools/backup/btrbk { }; buildpack = callPackage ../development/tools/buildpack { }; @@ -2452,19 +2502,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2518,7 +2568,7 @@ with pkgs; clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; }; cloudbrute = callPackage ../tools/security/cloudbrute { }; @@ -2546,6 +2596,8 @@ with pkgs; comma = callPackage ../tools/package-management/comma { }; + commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; + common-licenses = callPackage ../data/misc/common-licenses {}; compactor = callPackage ../applications/networking/compactor { }; @@ -2600,6 +2652,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swaytools = callPackage ../tools/wayland/swaytools { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -2749,10 +2803,6 @@ with pkgs; dehydrated = callPackage ../tools/admin/dehydrated { }; - deis = callPackage ../development/tools/deis {}; - - deisctl = callPackage ../development/tools/deisctl {}; - deja-dup = callPackage ../applications/backup/deja-dup { }; dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { }; @@ -2834,9 +2884,9 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -2866,6 +2916,8 @@ with pkgs; dtools = callPackage ../development/tools/dtools { }; + dtrx = callPackage ../tools/compression/dtrx { }; + dua = callPackage ../tools/misc/dua { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -2873,7 +2925,7 @@ with pkgs; duf = callPackage ../tools/misc/duf { }; inherit (ocaml-ng.ocamlPackages_4_10) dune_1; - inherit (ocamlPackages) dune_2 dune-release; + inherit (ocamlPackages) dune_2 dune_3 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -2920,11 +2972,12 @@ with pkgs; 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; + electron = electron_15; }; + element-desktop-wayland = writeScriptBin "element-desktop" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" + ''; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { conf = config.element-web.conf or {}; @@ -2968,6 +3021,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extrude = callPackage ../tools/security/extrude { }; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { @@ -2978,6 +3033,8 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; + findimagedupes = callPackage ../tools/graphics/findimagedupes { }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -3101,8 +3158,12 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; + ghidra = callPackage ../tools/security/ghidra/build.nix { }; + ghidra-bin = callPackage ../tools/security/ghidra { }; + gh2md = callPackage ../tools/backup/gh2md { }; + gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; giph = callPackage ../applications/video/giph { }; @@ -3151,11 +3212,15 @@ with pkgs; goa = callPackage ../development/tools/goa { }; + goawk = callPackage ../tools/text/goawk { }; + gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { }; + godu = callPackage ../tools/misc/godu { + buildGoModule = buildGo116Module; + }; goss = callPackage ../tools/misc/goss { }; @@ -3165,7 +3230,9 @@ with pkgs; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; - gping = callPackage ../tools/networking/gping { }; + gping = callPackage ../tools/networking/gping { + inherit (darwin.apple_sdk.frameworks) Security; + }; gpu-burn = callPackage ../applications/misc/gpu-burn { }; @@ -3233,6 +3300,8 @@ with pkgs; ifm = callPackage ../tools/graphics/ifm {}; + iina = callPackage ../applications/video/iina { }; + ink = callPackage ../tools/misc/ink { }; inklecate = callPackage ../development/compilers/inklecate {}; @@ -3243,6 +3312,8 @@ with pkgs; interlock = callPackage ../servers/interlock {}; + invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; + iotools = callPackage ../tools/misc/iotools { }; jellyfin = callPackage ../servers/jellyfin { }; @@ -3353,6 +3424,8 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; + mandown = callPackage ../tools/misc/mandown { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; @@ -3381,9 +3454,7 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - # TODO: call a sprintable to deprecate Meson 0.57 as soon as possible - meson = callPackage ../development/tools/build-managers/meson/0.57 { }; - meson_0_60 = callPackage ../development/tools/build-managers/meson/0.60 { }; + meson = callPackage ../development/tools/build-managers/meson { }; meson-tools = callPackage ../misc/meson-tools { }; @@ -3391,8 +3462,6 @@ with pkgs; midicsv = callPackage ../tools/audio/midicsv { }; - mididings = callPackage ../tools/audio/mididings { }; - miniscript = callPackage ../applications/blockchains/miniscript { }; miniserve = callPackage ../tools/misc/miniserve { @@ -3441,6 +3510,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; @@ -3449,6 +3520,8 @@ with pkgs; mrkd = with python3Packages; toPythonApplication mrkd; + nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -3483,6 +3556,8 @@ with pkgs; nrsc5 = callPackage ../applications/misc/nrsc5 { }; + nsync = callPackage ../development/libraries/nsync { }; + nwipe = callPackage ../tools/security/nwipe { }; nx2elf = callPackage ../tools/compression/nx2elf { }; @@ -3501,6 +3576,10 @@ with pkgs; oneshot = callPackage ../tools/networking/oneshot { }; + orjail = callPackage ../tools/security/orjail { }; + + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; + xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; @@ -3588,10 +3667,9 @@ with pkgs; reg = callPackage ../tools/virtualization/reg { }; - river = callPackage ../applications/window-managers/river { - wlroots = wlroots_0_14; - zig = zig_0_8_1; - }; + river = callPackage ../applications/window-managers/river { }; + + rivercarro = callPackage ../applications/misc/rivercarro { }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; @@ -3605,7 +3683,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3627,7 +3705,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -3840,14 +3918,7 @@ with pkgs; bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { - # developed for a compiler with C++20 support - stdenv = - if stdenv.isDarwin then - overrideCC stdenv clang_10 - else - stdenv; - }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; beanstalkd = callPackage ../servers/beanstalkd { }; @@ -3941,6 +4012,8 @@ with pkgs; buku = callPackage ../applications/misc/buku { }; + bukut = callPackage ../applications/misc/bukut { }; + byzanz = callPackage ../applications/video/byzanz {}; ori = callPackage ../tools/backup/ori { }; @@ -4098,7 +4171,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4168,10 +4241,16 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; + uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; + unify = with python3Packages; toPythonApplication unify; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; + unparam = callPackage ../tools/misc/unparam { }; + + inherit (nodePackages) uppy-companion; + usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; @@ -4229,9 +4308,7 @@ with pkgs; ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_15; - }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4287,6 +4364,8 @@ with pkgs; inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + artim-dark = callPackage ../data/themes/artim-dark {}; + bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -4323,6 +4402,8 @@ with pkgs; checkmate = callPackage ../development/tools/checkmate { }; + circup = callPackage ../development/tools/circup { }; + civetweb = callPackage ../development/libraries/civetweb { }; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; @@ -4462,10 +4543,19 @@ with pkgs; curlFull = curl.override { ldapSupport = true; + gsaslSupport = true; + rtmpSupport = true; + pslSupport = true; + }; + + curlHTTP3 = curl.override { + openssl = quictls; + http3Support = true; }; curl = curlMinimal.override ({ idnSupport = true; + zstdSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; @@ -4651,7 +4741,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { - inherit (pythonPackages) mutagen python wrapPython; + inherit (python2Packages) mutagen python wrapPython; }; dirdiff = callPackage ../tools/text/dirdiff { @@ -4695,8 +4785,6 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; - docbookrx = callPackage ../tools/typesetting/docbookrx { }; - docear = callPackage ../applications/office/docear { }; dockbarx = callPackage ../applications/misc/dockbarx { }; @@ -4713,11 +4801,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; - dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -4882,6 +4970,10 @@ with pkgs; s-tar = callPackage ../tools/archivers/s-tar {}; + solo2-cli = callPackage ../tools/security/solo2-cli { + inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit; + }; + sonota = callPackage ../tools/misc/sonota { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; @@ -4894,9 +4986,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = schildichat-desktop.override { - useWayland = true; - }; + schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" + ''; schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { conf = config.schildichat-web.conf or {}; @@ -4914,8 +5007,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -4950,16 +5043,22 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { }; + utahfs = callPackage ../applications/networking/utahfs { + buildGoPackage = buildGo116Package; + }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; wallutils = callPackage ../tools/graphics/wallutils { }; + worker-build = callPackage ../development/tools/worker-build { }; + wrangler = callPackage ../development/tools/wrangler { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; + snowflake = callPackage ../tools/networking/snowflake { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -5084,14 +5183,16 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { - electron = electron_14; + electron = electron_12; }; + ethercalc = callPackage ../servers/web-apps/ethercalc { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -5209,14 +5310,20 @@ with pkgs; }; }; + fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { }; + fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; + fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; @@ -5296,7 +5403,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -5312,6 +5419,8 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + frr = callPackage ../servers/frr { }; + hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -5326,6 +5435,8 @@ with pkgs; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; + faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { }; + faraday-cli = callPackage ../tools/security/faraday-cli { }; fastlane = callPackage ../tools/admin/fastlane { }; @@ -5520,6 +5631,8 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garage = callPackage ../tools/filesystems/garage { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -5568,8 +5681,6 @@ with pkgs; geteltorito = callPackage ../tools/misc/geteltorito { }; - getmail = callPackage ../tools/networking/getmail { }; - getmail6 = callPackage ../tools/networking/getmail6 { }; getopt = callPackage ../tools/misc/getopt { }; @@ -5584,6 +5695,8 @@ with pkgs; gfbgraph = callPackage ../development/libraries/gfbgraph { }; + gfold = callPackage ../applications/version-management/git-and-tools/gfold { }; + ggobi = callPackage ../tools/graphics/ggobi { }; gh = callPackage ../applications/version-management/git-and-tools/gh { }; @@ -5800,8 +5913,6 @@ with pkgs; github-runner = callPackage ../development/tools/continuous-integration/github-runner { }; - gitinspector = callPackage ../applications/version-management/gitinspector { }; - gitkraken = callPackage ../applications/version-management/gitkraken { }; gitlab = callPackage ../applications/version-management/gitlab { }; @@ -5857,19 +5968,17 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gnash = callPackage ../misc/gnash { - autoreconfHook = buildPackages.autoreconfHook269; - }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; - gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { }; + gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; @@ -5951,7 +6060,9 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { }; + goofys = callPackage ../tools/filesystems/goofys { + buildGoModule = buildGo116Module; + }; go-sct = callPackage ../tools/X11/go-sct { }; @@ -5978,16 +6089,20 @@ with pkgs; google-fonts = callPackage ../data/fonts/google-fonts { }; - google-clasp = callPackage ../development/misc/google-clasp { }; + google-clasp = nodePackages."@google/clasp"; google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; - google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; + google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; + google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { }; + + google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { }; + gdown = with python3Packages; toPythonApplication gdown; gopro = callPackage ../tools/video/gopro { }; @@ -5996,6 +6111,8 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; + gost = callPackage ../tools/networking/gost { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -6025,6 +6142,8 @@ with pkgs; hamlib = hamlib_4; }; + gprojector = callPackage ../applications/science/astronomy/gprojector { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -6188,9 +6307,7 @@ with pkgs; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gvpe = callPackage ../tools/networking/gvpe { - openssl = openssl_1_0_2; - }; + gvpe = callPackage ../tools/networking/gvpe {}; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -6536,6 +6653,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; inql = callPackage ../tools/security/inql { }; @@ -6569,8 +6688,6 @@ with pkgs; ioping = callPackage ../tools/system/ioping { }; - iops = callPackage ../tools/system/iops { }; - ior = callPackage ../tools/system/ior { }; iouyap = callPackage ../tools/networking/iouyap { }; @@ -6585,9 +6702,15 @@ with pkgs; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo116Module; + }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { + buildGoModule = buildGo116Module; + }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo116Module; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -6654,6 +6777,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; + jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -6670,6 +6795,8 @@ with pkgs; jet = callPackage ../development/tools/jet { }; + jfmt = callPackage ../development/tools/jfmt { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -6689,6 +6816,8 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; + jless = callPackage ../development/tools/jless { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -6911,7 +7040,9 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; - ligo = callPackage ../development/compilers/ligo { }; + ligo = callPackage ../development/compilers/ligo { + coq = coq_8_14; + }; ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -7096,6 +7227,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { + inherit (darwin.apple_sdk.frameworks) Security; + }; + mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7240,7 +7375,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7398,6 +7533,9 @@ with pkgs; libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; + libportal-gtk3 = libportal.override { variant = "gtk3"; }; + libportal-gtk4 = libportal.override { variant = "gtk4"; }; + libportal-qt5 = libportal.override { variant = "qt5"; }; libmicrodns = callPackage ../development/libraries/libmicrodns { }; @@ -7533,6 +7671,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + lziprecover = callPackage ../tools/compression/lziprecover { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; @@ -7545,6 +7685,8 @@ with pkgs; lzop = callPackage ../tools/compression/lzop { }; + lzwolf = callPackage ../games/lzwolf { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; macchina = callPackage ../tools/misc/macchina { @@ -7575,8 +7717,6 @@ with pkgs; mailsend = callPackage ../tools/networking/mailsend { }; - mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; - mailutils = callPackage ../tools/networking/mailutils { sasl = gsasl; }; @@ -7666,11 +7806,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7680,15 +7820,13 @@ with pkgs; mencal = callPackage ../applications/misc/mencal { } ; - metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; - metar = callPackage ../applications/misc/metar { }; mfcuk = callPackage ../tools/security/mfcuk { }; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -7767,6 +7905,8 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + modsecurity-crs = callPackage ../tools/security/modsecurity-crs { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; molotov = callPackage ../applications/video/molotov {}; @@ -7785,6 +7925,10 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; + morgen = callPackage ../applications/office/morgen { + electron = electron_15; + }; + mosh = callPackage ../tools/networking/mosh { }; mpage = callPackage ../tools/text/mpage { }; @@ -7817,6 +7961,8 @@ with pkgs; mtr = callPackage ../tools/networking/mtr {}; + mtr-exporter = callPackage ../tools/networking/mtr-exporter {}; + mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; mtx = callPackage ../tools/backup/mtx {}; @@ -7845,10 +7991,6 @@ with pkgs; munge = callPackage ../tools/security/munge { }; - munt = libsForQt5.callPackage ../applications/audio/munt { - jack = libjack2; - }; - mutagen = callPackage ../tools/misc/mutagen { }; mycli = callPackage ../tools/admin/mycli { }; @@ -7904,7 +8046,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -7938,6 +8080,8 @@ with pkgs; netboot = callPackage ../tools/networking/netboot {}; + netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; + netcat = libressl.nc; netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -8029,11 +8173,6 @@ with pkgs; # 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_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 { buildGoModule = buildGo116Module; inherit (linuxPackages) nvidia_x11; @@ -8049,6 +8188,8 @@ with pkgs; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + nomad-pack = callPackage ../applications/networking/cluster/nomad-pack { }; + nomino = callPackage ../tools/misc/nomino { }; notable = callPackage ../applications/misc/notable { }; @@ -8077,8 +8218,12 @@ with pkgs; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + panicparse = callPackage ../tools/misc/panicparse { }; + patray = callPackage ../tools/audio/patray { }; pasystray = callPackage ../tools/audio/pasystray { }; @@ -8223,7 +8368,9 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + buildGoModule = buildGo116Module; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -8354,6 +8501,8 @@ with pkgs; luaPackages = lua53Packages; }; + opensbi = callPackage ../misc/opensbi { }; + opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; @@ -8421,6 +8570,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8428,7 +8578,9 @@ with pkgs; openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; - optifine = callPackage ../tools/games/minecraft/optifine { }; + optifinePackages = callPackage ../tools/games/minecraft/optifine { }; + + optifine = optifinePackages.optifine-latest; optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; @@ -8503,6 +8655,8 @@ with pkgs; page = callPackage ../tools/misc/page { }; + PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; @@ -8583,11 +8737,6 @@ with pkgs; pngout = callPackage ../tools/graphics/pngout { }; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { - flex = flex_2_5_35; - openssl = openssl_1_0_2; - }; - patch = gnupatch; patchage = callPackage ../applications/audio/patchage { }; @@ -8635,8 +8784,6 @@ with pkgs; pdfminer = with python3Packages; toPythonApplication pdfminer; - pdfmod = callPackage ../applications/misc/pdfmod { }; - pdf-quench = callPackage ../applications/misc/pdf-quench { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -8651,6 +8798,8 @@ with pkgs; pcapc = callPackage ../tools/networking/pcapc { }; + pdm = callPackage ../tools/package-management/pdm { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; @@ -8681,11 +8830,13 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_12; + wlroots = wlroots_0_14; }; phodav = callPackage ../tools/networking/phodav { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; + pim6sd = callPackage ../servers/pim6sd { }; phosh = callPackage ../applications/window-managers/phosh { }; @@ -8703,10 +8854,14 @@ with pkgs; xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; + pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; + pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { }; + pinsel = callPackage ../tools/misc/pinsel { }; + piping-server-rust = callPackage ../servers/piping-server-rust { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -8798,6 +8953,8 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; + podman-tui = callPackage ../applications/virtualization/podman-tui { }; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { @@ -8888,8 +9045,6 @@ with pkgs; pastebinit = callPackage ../tools/misc/pastebinit { }; - pifi = callPackage ../applications/audio/pifi { }; - pmacct = callPackage ../tools/networking/pmacct { }; pmix = callPackage ../development/libraries/pmix { }; @@ -9027,6 +9182,8 @@ with pkgs; qmk = callPackage ../tools/misc/qmk { }; + qodem = callPackage ../tools/networking/qodem { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; @@ -9095,8 +9252,12 @@ with pkgs; rarian = callPackage ../development/libraries/rarian { }; + ratman = callPackage ../tools/networking/ratman { }; + ratools = callPackage ../tools/networking/ratools { }; + ratt = callPackage ../applications/misc/ratt { }; + rc = callPackage ../shells/rc { }; rcon = callPackage ../tools/networking/rcon { }; @@ -9109,6 +9270,8 @@ with pkgs; real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; + realesrgan-ncnn-vulkan = callPackage ../tools/graphics/realesrgan-ncnn-vulkan { }; + react-native-debugger = callPackage ../development/tools/react-native-debugger { }; read-edid = callPackage ../os-specific/linux/read-edid { }; @@ -9121,7 +9284,9 @@ with pkgs; rep = callPackage ../development/tools/rep { }; - reicast = callPackage ../misc/emulators/reicast { }; + repseek = callPackage ../applications/science/biology/repseek { }; + + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9236,6 +9401,10 @@ with pkgs; rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnote = callPackage ../applications/graphics/rnote { + inherit (gst_all_1) gstreamer; + }; + rnp = callPackage ../tools/security/rnp { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -9307,7 +9476,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -9411,7 +9580,7 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = callPackage ../applications/science/misc/sasview {}; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -9441,6 +9610,8 @@ with pkgs; screenkey = callPackage ../applications/video/screenkey { }; + scrub = callPackage ../tools/misc/scrub { }; + scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; scriptaculous = callPackage ../development/libraries/scriptaculous { }; @@ -9459,6 +9630,8 @@ with pkgs; sdate = callPackage ../tools/misc/sdate { }; + sdat2img = callPackage ../tools/filesystems/sdat2img { }; + sdcv = callPackage ../applications/misc/sdcv { }; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; @@ -9539,10 +9712,6 @@ with pkgs; shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { - openssl = openssl_1_0_2; - }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -9559,6 +9728,8 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signald = callPackage ../applications/networking/instant-messengers/signald { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -9600,6 +9771,10 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair {}; + sketchybar = callPackage ../os-specific/darwin/sketchybar { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight; + }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; @@ -9686,6 +9861,11 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; + spire = callPackage ../tools/security/spire { }; + # to match naming of other package repositories + spire-agent = spire.agent; + spire-server = spire.server; + spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; @@ -9961,6 +10141,8 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper {}; + syft = callPackage ../tools/admin/syft { }; + Sylk = callPackage ../applications/networking/Sylk {}; privoxy = callPackage ../tools/networking/privoxy { @@ -10125,9 +10307,9 @@ with pkgs; getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg) (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs); in - { - plugins = getPackagesWithPrefix "plugin"; - themes = getPackagesWithPrefix "theme"; + recurseIntoAttrs { + plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin"); + themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); }; thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; @@ -10144,13 +10326,13 @@ with pkgs; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; + tile38 = callPackage ../servers/tile38 { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; - - tilp2 = callPackage ../applications/science/math/tilp2 { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10158,7 +10340,7 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; - timekeeper = callPackage ../applications/office/timekeeper { }; + timetagger = callPackage ../servers/timetagger { }; timezonemap = callPackage ../development/libraries/timezonemap { }; @@ -10174,9 +10356,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -10358,6 +10540,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuhi = callPackage ../applications/misc/tuhi { }; + tuir = callPackage ../applications/misc/tuir { }; tunnelto = callPackage ../tools/networking/tunnelto { @@ -10612,6 +10796,8 @@ with pkgs; SDL = SDL_sixel; }; + witness = callPackage ../tools/security/witness { }; + openconnect = openconnect_gnutls; openconnect_openssl = callPackage ../tools/networking/openconnect { @@ -10648,7 +10834,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -10704,6 +10890,10 @@ with pkgs; wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; + wg-netmanager = callPackage ../tools/networking/wg-netmanager { + inherit (darwin.apple_sdk.frameworks) Security; + }; + woff2 = callPackage ../development/web/woff2 { }; woof = callPackage ../tools/misc/woof { }; @@ -10736,7 +10926,9 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; + textql = callPackage ../development/tools/textql { + buildGoPackage = buildGo116Package; + }; html2text = callPackage ../tools/text/html2text { }; @@ -10792,10 +10984,6 @@ with pkgs; ts = callPackage ../tools/system/ts { }; - transfig = callPackage ../tools/graphics/transfig { - libpng = libpng12; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; @@ -11142,7 +11330,9 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { }; + yajsv = callPackage ../tools/misc/yajsv { + buildGoModule = buildGo116Module; + }; yallback = callPackage ../development/tools/analysis/yallback { }; @@ -11679,7 +11869,7 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) crystal_1_0 crystal_1_1 @@ -11713,9 +11903,7 @@ with pkgs; elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix; - elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { - inherit (darwin.apple_sdk.frameworks) Security; - }); + elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; @@ -12291,21 +12479,21 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ + go_1_18 = callPackage ../development/compilers/go/1.18.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; @@ -12319,7 +12507,7 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_16; + go = go_1_17; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -12369,8 +12557,8 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15; - openjfx = openjfx15; + inherit (javaPackages) openjfx11 openjfx15 openjfx17; + openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -12426,6 +12614,8 @@ with pkgs; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + lingua-franca = callPackage ../development/compilers/lingua-franca { }; + openspin = callPackage ../development/compilers/openspin { }; oraclejdk = jdkdistro true false; @@ -12465,7 +12655,20 @@ with pkgs; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2_0_27; + libgit2 = libgit2.overrideAttrs (_: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + patches = []; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; + }); }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { @@ -12580,10 +12783,7 @@ with pkgs; /**/ if platform.isDarwin then 11 else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then - /**/ if platform.isRiscV then 11 - else if platform.isMusl then 11 - else 7 + else if platform.isLinux then 11 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the @@ -12815,7 +13015,6 @@ with pkgs; }; pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; - pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; qbe = callPackage ../development/compilers/qbe { }; @@ -12861,18 +13060,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_57 = callPackage ../development/compilers/rust/1_57.nix { + rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_57; + rust = rust_1_58; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_57 = rust_1_57.packages.stable; - rustPackages = rustPackages_1_57; + rustPackages_1_58 = rust_1_58.packages.stable; + rustPackages = rustPackages_1_58; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -13049,6 +13248,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; + rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -13189,6 +13389,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { @@ -13202,7 +13404,6 @@ with pkgs; vala-lint = callPackage ../development/tools/vala-lint { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_40 vala_0_48 vala_0_52 vala_0_54 @@ -13220,7 +13421,11 @@ with pkgs; # Others should instead delegate to the next stage's choice with # `targetPackages.stdenv.cc.bintools`. This one is different just to # provide the default choice, avoiding infinite recursion. - bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils + # See the bintools attribute for the logic and reasoning. We need to provide + # a default here, since eval will hit this function when bootstrapping + # stdenv where the bintools attribute doesn't exist, but will never actually + # be evaluated -- callPackage ends up being too eager. + bintools ? pkgs.bintools , libc ? bintools.libc , # libc++ from the default LLVM version is bound at the top level, but we # want the C++ library to be explicitly chosen by the caller, and null by @@ -13271,6 +13476,7 @@ with pkgs; yosys = callPackage ../development/compilers/yosys { }; yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { }; yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { }; + yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { }; z88dk = callPackage ../development/compilers/z88dk { }; @@ -13431,12 +13637,18 @@ with pkgs; io = callPackage ../development/interpreters/io { }; + ivy = callPackage ../development/interpreters/ivy { }; + j = callPackage ../development/interpreters/j { stdenv = clangStdenv; }; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc921.jacinda; + janet = callPackage ../development/interpreters/janet {}; + jpm = callPackage ../development/interpreters/janet/jpm.nix {}; + jelly = callPackage ../development/interpreters/jelly {}; jimtcl = callPackage ../development/interpreters/jimtcl {}; @@ -13476,11 +13688,8 @@ with pkgs; lolcode = callPackage ../development/interpreters/lolcode { }; - love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; }; - love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; - love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love_11 = callPackage ../development/interpreters/love/11.1.nix { }; + love_11 = callPackage ../development/interpreters/love/11.nix { }; love = love_0_10; wabt = callPackage ../development/tools/wabt { }; @@ -13531,6 +13740,8 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nextflow = callPackage ../development/interpreters/nextflow { }; + ngn-k = callPackage ../development/interpreters/ngn-k { }; obb = callPackage ../development/interpreters/clojure/obb.nix { }; @@ -13604,7 +13815,6 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python = python2; python2 = python27; python3 = python39; pypy = pypy2; @@ -13613,11 +13823,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override { - self = pythonFull; - pythonAttr = "pythonFull"; - x11Support = true; - }; python2Full = python2.override { self = python2Full; pythonAttr = "python2Full"; @@ -13654,7 +13859,6 @@ with pkgs; }; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python.pkgs; python2Packages = python2.pkgs; python3Packages = python3.pkgs; @@ -13721,12 +13925,6 @@ with pkgs; pyradio = callPackage ../applications/audio/pyradio {}; - pyrex = pyrex095; - - pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; - - pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - racket = callPackage ../development/interpreters/racket { # racket 6.11 doesn't build with gcc6 + recent glibc: # https://github.com/racket/racket/pull/1886 @@ -13759,8 +13957,6 @@ with pkgs; inherit (ocamlPackages) reason; - renpy = callPackage ../development/interpreters/renpy { }; - pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; @@ -13813,7 +14009,6 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; @@ -13840,6 +14035,7 @@ with pkgs; wasm3 = callPackage ../development/interpreters/wasm3 { }; + yex-lang = callPackage ../development/interpreters/yex-lang { }; ### DEVELOPMENT / MISC @@ -13888,12 +14084,6 @@ with pkgs; guile-git = callPackage ../development/guile-modules/guile-git { }; - guile-gnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome2.GConf; - guile = guile_2_0; - inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; - }; - guile-json = callPackage ../development/guile-modules/guile-json { }; guile-lib = callPackage ../development/guile-modules/guile-lib { }; @@ -13937,7 +14127,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -14054,12 +14244,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_3 - electron_4 - electron_5 - electron_6 - electron_7 - electron_8 electron_9 electron_10 electron_11 @@ -14067,7 +14251,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -14153,6 +14338,15 @@ with pkgs; bazel_self = bazel_4; }; + bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_5; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -14172,13 +14366,7 @@ with pkgs; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - 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; - }; + bear = callPackage ../development/tools/build-managers/bear { }; bingrep = callPackage ../development/tools/analysis/bingrep { }; @@ -14245,6 +14433,8 @@ with pkgs; bloaty = callPackage ../development/tools/bloaty { }; + bloomrpc = callPackage ../development/web/bloomrpc { }; + bloop = callPackage ../development/tools/build-managers/bloop { }; bossa = callPackage ../development/embedded/bossa { @@ -14353,11 +14543,13 @@ with pkgs; cfr = callPackage ../development/tools/java/cfr { }; + cfripper = callPackage ../tools/security/cfripper { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { }; chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { }; @@ -14399,9 +14591,9 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; - ctmg = callPackage ../tools/security/ctmg { }; + cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; + ctmg = callPackage ../tools/security/ctmg { }; cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -14496,9 +14688,12 @@ with pkgs; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; - libsigrok = callPackage ../development/tools/libsigrok { }; + libsigrok = callPackage ../development/tools/libsigrok { + python = python3; + }; # old version: libsigrok_0_3 = libsigrok.override { + python = python3; version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; doInstallCheck = false; @@ -14593,6 +14788,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dura = callPackage ../development/tools/misc/dura { }; + dwfv = callPackage ../applications/science/electronics/dwfv { }; dwz = callPackage ../development/tools/misc/dwz { }; @@ -14613,6 +14810,8 @@ with pkgs; egypt = callPackage ../development/tools/analysis/egypt { }; + elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs { }; + elfinfo = callPackage ../development/tools/misc/elfinfo { }; elfkickers = callPackage ../development/tools/misc/elfkickers { }; @@ -14623,6 +14822,8 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; + ent-go = callPackage ../development/tools/ent { }; + epm = callPackage ../development/tools/misc/epm { }; eresi = callPackage ../development/tools/analysis/eresi { }; @@ -14631,6 +14832,19 @@ with pkgs; eweb = callPackage ../development/tools/literate-programming/eweb { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; + + Literate = callPackage ../development/tools/literate-programming/Literate { }; + + md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; + + # NOTE: Override and set useIcon = false to use Awk instead of Icon. + noweb = callPackage ../development/tools/literate-programming/noweb { }; + + nuweb = callPackage ../development/tools/literate-programming/nuweb { + tex = texlive.combined.scheme-medium; + }; + eztrace = callPackage ../development/tools/profiling/EZTrace { }; faas-cli = callPackage ../development/tools/faas-cli { }; @@ -14679,8 +14893,6 @@ with pkgs; fundoc = callPackage ../development/tools/fundoc { }; - funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -14818,6 +15030,8 @@ with pkgs; ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + confluent-cli = callPackage ../development/tools/confluent-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -14844,8 +15058,6 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/embedded/arduino/ino { }; - inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { }; @@ -14858,6 +15070,8 @@ with pkgs; jam = callPackage ../development/tools/build-managers/jam { }; + ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { }; + javacc = callPackage ../development/tools/parsing/javacc { jdk = jdk8; }; @@ -14950,8 +15164,6 @@ with pkgs; laminar = callPackage ../development/tools/continuous-integration/laminar { }; - Literate = callPackage ../development/tools/literate-programming/Literate {}; - lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -15021,7 +15233,7 @@ with pkgs; mkcert = callPackage ../development/tools/misc/mkcert { }; - mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mkdocs = with python3Packages; toPythonApplication mkdocs; mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; @@ -15070,12 +15282,9 @@ with pkgs; jre_headless = jre8_headless; }; - nwjs = callPackage ../development/tools/nwjs { - gconf = gnome2.GConf; - }; + nwjs = callPackage ../development/tools/nwjs { }; nwjs-sdk = callPackage ../development/tools/nwjs { - gconf = gnome2.GConf; sdk = true; }; @@ -15084,11 +15293,6 @@ with pkgs; gconf = gnome2.GConf; }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. - noweb = callPackage ../development/tools/literate-programming/noweb { }; - - nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; - nrfutil = callPackage ../development/tools/misc/nrfutil { }; obelisk = callPackage ../development/tools/ocaml/obelisk { }; @@ -15215,7 +15419,6 @@ with pkgs; r10k = callPackage ../tools/system/r10k { }; radare2 = callPackage ../development/tools/analysis/radare2 ({ - inherit (gnome2) vte; lua = lua5; } // (config.radare or {})); @@ -15404,7 +15607,7 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { }; + spruce = callPackage ../development/tools/misc/spruce {}; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -15453,9 +15656,7 @@ with pkgs; c2ffi = callPackage ../development/tools/misc/c2ffi { }; - c3c = callPackage ../development/compilers/c3c { - llvmPackages = llvmPackages_11; - }; + c3c = callPackage ../development/compilers/c3c { }; swfmill = callPackage ../tools/video/swfmill { }; @@ -15535,7 +15736,9 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_3_0; + }; tweak = callPackage ../applications/editors/tweak { }; @@ -15670,13 +15873,17 @@ with pkgs; nsis = callPackage ../development/tools/nsis { }; + tockloader = callPackage ../development/tools/misc/tockloader { }; + ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; + abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -15726,11 +15933,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; @@ -16211,7 +16414,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -16227,6 +16430,14 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + vapoursynth = callPackage ../development/libraries/vapoursynth { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + + vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; + + vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; + vmmlib = callPackage ../development/libraries/vmmlib { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; @@ -16271,6 +16482,7 @@ with pkgs; far2l = callPackage ../applications/misc/far2l { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; }; farbfeld = callPackage ../development/libraries/farbfeld { }; @@ -16302,11 +16514,16 @@ with pkgs; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; }; + ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + }; # Aliases ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -16441,10 +16658,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - # https://github.com/burrowers/garble/issues/124 - buildGoModule = buildGo115Module; - }; + garble = callPackage ../build-support/go/garble.nix { }; gcab = callPackage ../development/libraries/gcab { }; @@ -16517,8 +16731,6 @@ with pkgs; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - giblib = callPackage ../development/libraries/giblib { }; - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { }; @@ -16537,32 +16749,19 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 { + libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - - libgit2_1_1 = libgit2.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { + libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; + patches = []; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -16579,10 +16778,10 @@ with pkgs; glew110 = callPackage ../development/libraries/glew/1.10.nix { inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; - glew-egl = glew.overrideAttrs (oldAttrs: { - pname = "glew-egl"; - makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ]; - }); + glew-egl = callPackage ../development/libraries/glew { + inherit (darwin.apple_sdk.frameworks) OpenGL; + enableEGL = true; + }; glfw = glfw3; glfw-wayland = glfw.override { @@ -16749,8 +16948,6 @@ with pkgs; gflags = callPackage ../development/libraries/gflags { }; - gfm = callPackage ../applications/science/math/gfm { }; - gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; @@ -16805,8 +17002,6 @@ with pkgs; pgweb = callPackage ../development/tools/database/pgweb { }; - gpgstats = callPackage ../tools/security/gpgstats { }; - gpshell = callPackage ../development/tools/misc/gpshell { }; grantlee = callPackage ../development/libraries/grantlee { }; @@ -16897,8 +17092,6 @@ with pkgs; gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; - gnome-menus = callPackage ../development/libraries/gnome-menus { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -16916,7 +17109,7 @@ with pkgs; gtkextra = callPackage ../development/libraries/gtkextra { }; gtk3 = callPackage ../development/libraries/gtk/3.x.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore; }; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { @@ -16941,17 +17134,9 @@ with pkgs; gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; @@ -17187,6 +17372,8 @@ with pkgs; indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; + indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; @@ -17215,11 +17402,12 @@ with pkgs; iso-flags = callPackage ../data/icons/iso-flags { }; ispc = callPackage ../development/compilers/ispc { - stdenv = llvmPackages_11.stdenv; - llvmPackages = llvmPackages_11; + inherit (llvmPackages) stdenv; }; - isso = callPackage ../servers/isso { }; + isso = callPackage ../servers/isso { + nodejs = nodejs-14_x; + }; itk4 = callPackage ../development/libraries/itk/4.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -17739,8 +17927,6 @@ with pkgs; libgringotts = callPackage ../development/libraries/libgringotts { }; - libgroove = callPackage ../development/libraries/libgroove { }; - libgrss = callPackage ../development/libraries/libgrss { }; libgweather = callPackage ../development/libraries/libgweather { }; @@ -17755,9 +17941,7 @@ with pkgs; libinklevel = callPackage ../development/libraries/libinklevel { }; - libnats-c = callPackage ../development/libraries/libnats-c { - openssl = openssl_1_0_2; - }; + libnats-c = callPackage ../development/libraries/libnats-c { }; liburing = callPackage ../development/libraries/liburing { }; @@ -17832,6 +18016,9 @@ with pkgs; libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; + libffiBoot = libffi.override { + doCheck = false; + }; libfreeaptx = callPackage ../development/libraries/libfreeaptx { }; @@ -17853,8 +18040,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - libgksu = callPackage ../development/libraries/libgksu { }; - libgnt = callPackage ../development/libraries/libgnt { }; libgpg-error = callPackage ../development/libraries/libgpg-error { }; @@ -17898,6 +18083,8 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libhwy = callPackage ../development/libraries/libhwy { }; + libHX = callPackage ../development/libraries/libHX { }; libibmad = callPackage ../development/libraries/libibmad { }; @@ -18126,6 +18313,8 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; + llama = callPackage ../applications/misc/llama { }; + malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; @@ -18164,7 +18353,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -18317,6 +18506,8 @@ with pkgs; libpst = callPackage ../development/libraries/libpst { }; + libptytty = callPackage ../development/libraries/libptytty { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -18420,9 +18611,7 @@ with pkgs; libtiff = if stdenv.isDarwin && stdenv.isAarch64 then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } - else callPackage ../development/libraries/libtiff { - inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; - }; + else callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -18509,6 +18698,8 @@ with pkgs; udev = systemdMinimal; }; + libusbgx = callPackage ../development/libraries/libusbgx { }; + libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libutempter = callPackage ../development/libraries/libutempter { }; @@ -18637,7 +18828,9 @@ with pkgs; libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { }; + libxslt = callPackage ../development/libraries/libxslt { + python = python3; + }; libxsmm = callPackage ../development/libraries/libxsmm { }; @@ -18653,6 +18846,8 @@ with pkgs; libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + libyang = callPackage ../development/libraries/libyang { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; @@ -18895,9 +19090,7 @@ with pkgs; ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { - openssl = openssl_1_0_2; - }; + mysocketw = callPackage ../development/libraries/mysocketw { }; mythes = callPackage ../development/libraries/mythes { }; @@ -18907,6 +19100,8 @@ with pkgs; nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; + ncnn = callPackage ../development/libraries/ncnn { }; + ndpi = callPackage ../development/libraries/ndpi { }; nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; @@ -18936,10 +19131,6 @@ with pkgs; neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - openssl = openssl_1_0_2; - }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {}; @@ -19065,7 +19256,9 @@ with pkgs; openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackage ../development/libraries/openbabel { }; + openbabel3 = callPackage ../development/libraries/openbabel { + python = python3; + }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -19089,10 +19282,12 @@ with pkgs; opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; + ffmpeg = ffmpeg_4; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + ffmpeg = ffmpeg_4; }; opencv3WithoutCuda = opencv3.override { @@ -19102,6 +19297,7 @@ with pkgs; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; pythonPackages = python3Packages; + ffmpeg = ffmpeg_4; }; opencv = opencv4; @@ -19170,6 +19366,8 @@ with pkgs; opensubdiv = callPackage ../development/libraries/opensubdiv { }; + opensupaplex = callPackage ../games/opensupaplex { }; + open-wbo = callPackage ../applications/science/logic/open-wbo {}; openwsman = callPackage ../development/libraries/openwsman {}; @@ -19597,6 +19795,8 @@ with pkgs; rubberband = callPackage ../development/libraries/rubberband { }; + rure = callPackage ../development/libraries/rure { }; + rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; s2geometry = callPackage ../development/libraries/s2geometry { }; @@ -19662,6 +19862,8 @@ with pkgs; SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; sdrplay = callPackage ../applications/radio/sdrplay {}; @@ -19717,6 +19919,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; @@ -19947,7 +20151,7 @@ with pkgs; subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil = callPackage ../development/libraries/audio/suil { }; @@ -20081,9 +20285,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo115Module; - }; + trillian = callPackage ../tools/misc/trillian { }; twolame = callPackage ../development/libraries/twolame { }; @@ -20134,17 +20336,9 @@ with pkgs; gnutls = gnutls; }); - v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ - inherit (python2Packages) python gyp; - icu = icu58; # v8-5.4.232 fails against icu4c-59.1 - } // lib.optionalAttrs stdenv.isLinux { - # doesn't build with gcc7 - stdenv = gcc6Stdenv; - }); + v8 = callPackage ../development/libraries/v8 { }; - v8 = callPackage ../development/libraries/v8 { - inherit (python2Packages) python; - }; + v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; @@ -20224,7 +20418,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; @@ -20262,7 +20456,10 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; + # bump when majoring of packages have updated + webrtc-audio-processing = webrtc-audio-processing_0_3; wildmidi = callPackage ../development/libraries/wildmidi { }; @@ -20286,21 +20483,14 @@ with pkgs; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; - }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { @@ -20315,10 +20505,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) setfile rez derez; - }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; @@ -20517,10 +20704,6 @@ with pkgs; httpunit = callPackage ../development/libraries/java/httpunit { }; - gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { }; - - gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -20563,39 +20746,29 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo115Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_15; - }; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoPackage != buildGo117Package`. buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; + buildGo118Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_18; + }; - buildGoPackage = buildGo116Package; + buildGoPackage = buildGo117Package; - buildGo115Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_15; - }; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoModule != buildGo117Module`. buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; + buildGo118Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_18; + }; - buildGoModule = buildGo116Module; + buildGoModule = buildGo117Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -20701,6 +20874,8 @@ with pkgs; packages = []; }; + rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; }; + rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (_: {})) pkgs; }); @@ -20715,6 +20890,8 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; + alps = callPackage ../servers/alps { }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -20727,6 +20904,7 @@ with pkgs; mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; + mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; @@ -20879,11 +21057,12 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_15; jdk = openjdk11; gn = gn1924; }; + ergochat = callPackage ../servers/irc/ergochat { }; + etcd = etcd_3_3; etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -20901,8 +21080,11 @@ with pkgs; # _compat can probably be removed on next minor version after 0.10.0 lua = lua5_2_compat; withExtraLibs = []; + withExtraLuaPackages = _: []; }; + prosody-filer = callPackage ../servers/xmpp/prosody-filer { }; + biboumi = callPackage ../servers/xmpp/biboumi { }; elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { @@ -20953,9 +21135,13 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo116Module; - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + + promtail = grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; + }); grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -20991,6 +21177,8 @@ with pkgs; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; + home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; + hqplayerd = callPackage ../servers/hqplayerd { }; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; @@ -21073,7 +21261,7 @@ with pkgs; mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; + mailman-rss = callPackage ../tools/misc/mailman-rss { }; mailman-web = with python3.pkgs; toPythonApplication mailman-web; @@ -21092,16 +21280,12 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - buildGoModule = buildGo117Module; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; mbtileserver = callPackage ../servers/mbtileserver { }; - mediatomb = callPackage ../servers/mediatomb { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -21127,7 +21311,6 @@ with pkgs; mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { - stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small mpdWithFeatures; @@ -21153,7 +21336,9 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; + mycorrhiza = callPackage ../servers/mycorrhiza { + buildGoModule = buildGo116Module; + }; myserver = callPackage ../servers/http/myserver { }; @@ -21169,7 +21354,9 @@ with pkgs; unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoModule = buildGo116Module; + }; nginx = nginxStable; @@ -21293,7 +21480,6 @@ with pkgs; }; pulseaudio = callPackage ../servers/pulseaudio ({ - inherit (darwin) Libc; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; } // lib.optionalAttrs stdenv.isDarwin { # Default autoreconfHook (2.70) fails on darwin, @@ -21329,9 +21515,7 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; - easyeffects = callPackage ../applications/audio/easyeffects { - glibmm = glibmm_2_68; - }; + easyeffects = callPackage ../applications/audio/easyeffects { }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; @@ -21362,10 +21546,17 @@ with pkgs; asio = asio_1_10; }; - mariadb = callPackage ../servers/sql/mariadb { + inherit (callPackage ../servers/sql/mariadb { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + }) + mariadb_104 + mariadb_105 + mariadb_106 + mariadb_107 + mariadb_108 + ; + mariadb = mariadb_106; mongodb = hiPrio mongodb-3_4; @@ -21407,12 +21598,8 @@ with pkgs; }; influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { - buildGoModule = buildGo117Module; - }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { - buildGoModule = buildGo117Module; - }; + influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; + influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -21491,9 +21678,7 @@ with pkgs; openfire = callPackage ../servers/xmpp/openfire { }; - softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; }; - softether_4_29 = callPackage ../servers/softether/4.29.nix { }; - softether = softether_4_29; + softether = callPackage ../servers/softether { }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; @@ -21623,7 +21808,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; - inherit (pythonPackages) buildPythonPackage qpid-python; + inherit (python2Packages) buildPythonPackage qpid-python; }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; @@ -21699,7 +21884,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -21731,8 +21918,6 @@ with pkgs; sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; - sigurlx = callPackage ../tools/security/sigurlx { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -21766,9 +21951,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo117Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -21808,7 +21991,9 @@ with pkgs; inherit (callPackages ../servers/unifi { }) unifiLTS unifi5 - unifi6; + unifi6 + unifi7; + unifi = unifi6; unifi-video = callPackage ../servers/unifi-video { }; @@ -21819,10 +22004,14 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; + vouch-proxy = callPackage ../servers/vouch-proxy { + buildGoModule = buildGo116Module; + }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + virtiofsd = callPackage ../servers/misc/virtiofsd { }; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -21993,6 +22182,10 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + bluez5-experimental = callPackage ../os-specific/linux/bluez { + withExperimental = true; + }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { # pulseaudio-modules-bt is most likely to be used with pulseaudioFull pulseaudio = pulseaudioFull; @@ -22110,6 +22303,8 @@ with pkgs; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -22162,7 +22357,7 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; + gmailctl = callPackage ../applications/networking/gmailctl { }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22182,6 +22377,8 @@ with pkgs; gradm = callPackage ../os-specific/linux/gradm { }; + gt = callPackage ../os-specific/linux/gt { }; + inherit (nodePackages) gtop; hd-idle = callPackage ../os-specific/linux/hd-idle { }; @@ -22214,9 +22411,7 @@ with pkgs; ifmetric = callPackage ../os-specific/linux/ifmetric {}; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { - openssl = openssl_1_0_2; - }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils {}; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; @@ -22236,7 +22431,7 @@ with pkgs; iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); - # hiPrio for collisions with inetutils (ping and tftpd.8.gz) + # hiPrio for collisions with inetutils (ping) iptables = callPackage ../os-specific/linux/iptables { }; iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; @@ -22299,6 +22494,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linthesia = callPackage ../games/linthesia/default.nix { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -22456,6 +22653,8 @@ with pkgs; lockdep = callPackage ../os-specific/linux/lockdep { }; + lsirec = callPackage ../os-specific/linux/lsirec { }; + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; @@ -22655,19 +22854,13 @@ with pkgs; quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { - openssl = openssl_1_0_2; - }; - linux-pam = callPackage ../os-specific/linux/pam { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { - llvmPackages = llvmPackages_11; - }; + odin = callPackage ../development/compilers/odin { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -22775,7 +22968,9 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + quick-lint-js = callPackage ../development/tools/quick-lint-js { }; + + linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; @@ -22840,6 +23035,8 @@ with pkgs; sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; + sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; + sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -22983,6 +23180,7 @@ with pkgs; ubootNovena ubootOdroidC2 ubootOdroidXU3 + ubootOlimexA64Olinuxino ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -23202,8 +23400,6 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cdetheme { }; - charis-sil = callPackage ../data/fonts/charis-sil { }; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; @@ -23398,7 +23594,9 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; - graphite-gtk-theme = callPackage ../data/themes/graphite { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; + + graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; greybird = callPackage ../data/themes/greybird { }; @@ -23432,6 +23630,8 @@ with pkgs; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; + hannom = callPackage ../data/fonts/hannom { }; + hanazono = callPackage ../data/fonts/hanazono { }; hermit = callPackage ../data/fonts/hermit { }; @@ -23488,6 +23688,8 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -23544,6 +23746,8 @@ with pkgs; libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linux-manual = callPackage ../data/documentation/linux-manual { }; @@ -23662,8 +23866,15 @@ with pkgs; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; + nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; + inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + noto-fonts-emoji-blob-bin + noto-fonts-extra; nuclear = callPackage ../applications/audio/nuclear { }; @@ -23747,6 +23958,8 @@ with pkgs; penna = callPackage ../data/fonts/penna { }; + pitch-black = callPackage ../data/themes/pitch-black {}; + plano-theme = callPackage ../data/themes/plano { }; plata-theme = callPackage ../data/themes/plata { @@ -23782,6 +23995,8 @@ with pkgs; publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + phinger-cursors = callPackage ../data/icons/phinger-cursors { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; qogir-theme = callPackage ../data/themes/qogir { }; @@ -23822,8 +24037,6 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; - mime-types = callPackage ../data/misc/mime-types { }; - shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -23849,7 +24062,7 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; starship = callPackage ../tools/misc/starship { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security Foundation; }; stig = callPackage ../applications/networking/p2p/stig { }; @@ -23865,7 +24078,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -23953,6 +24166,8 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { }; + tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; template-glib = callPackage ../development/libraries/template-glib { }; @@ -23970,7 +24185,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -24132,7 +24347,15 @@ with pkgs; foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { }; - pdfstudio = callPackage ../applications/misc/pdfstudio { }; + pdfstudio = import ../applications/misc/pdfstudio { + program = "pdfstudio"; + inherit callPackage fetchurl libgccjit; + }; + + pdfstudioviewer = import ../applications/misc/pdfstudio { + program = "pdfstudioviewer"; + inherit callPackage fetchurl libgccjit; + }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -24161,7 +24384,7 @@ with pkgs; alock = callPackage ../misc/screensavers/alock { }; - inherit (python3Packages) alot; + alot = callPackage ../applications/networking/mailreaders/alot { }; alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; @@ -24297,6 +24520,8 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + blocky = callPackage ../applications/networking/blocky { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -24378,7 +24603,13 @@ with pkgs; berry = callPackage ../applications/window-managers/berry { }; - bespokesynth = callPackage ../applications/audio/bespokesynth { }; + bespokesynth = callPackage ../applications/audio/bespokesynth { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit CoreServices CoreAudioKit; + }; + + bespokesynth-with-vst2 = bespokesynth.override { + enableVST2 = true; + }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; @@ -24434,6 +24665,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix {}; + blflash = callPackage ../tools/misc/blflash { }; blogc = callPackage ../applications/misc/blogc { }; @@ -24578,6 +24811,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; @@ -24630,6 +24865,8 @@ with pkgs; cmatrix = callPackage ../applications/misc/cmatrix { }; + cmctl = callPackage ../applications/networking/cluster/cmctl { }; + cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; @@ -24699,9 +24936,7 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim { - buildGoPackage = buildGo115Package; - }; + coyim = callPackage ../applications/networking/instant-messengers/coyim { }; cozy-drive = callPackage ../applications/networking/cozy-drive {}; @@ -24750,7 +24985,7 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; darktable = callPackage ../applications/graphics/darktable { - lua = lua5_3; + lua = lua5_4; pugixml = pugixml.override { shared = true; }; }; @@ -24903,11 +25138,9 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff {}; + dyff = callPackage ../development/tools/dyff { }; - dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_14; - }; + dwl = callPackage ../applications/window-managers/dwl { }; dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to @@ -24919,7 +25152,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -24959,6 +25192,8 @@ with pkgs; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; + electrum-grs = libsForQt5.callPackage ../applications/misc/electrum-grs { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -25252,8 +25487,6 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; - gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -25288,19 +25521,20 @@ with pkgs; }; }; }; - gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { + gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; }; }; - gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; - # A build without gui components and other utilites not needed if gnuradio is - # used as a c++ library. - gnuradio3_8Minimal = gnuradio3_8.override { + gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio.pkgs; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradio3_9Minimal = gnuradio.override { doWrap = false; - unwrapped = gnuradio3_8.unwrapped.override { + unwrapped = gnuradio.unwrapped.override { volk = volk.override { + # So it will not reference python enableModTool = false; }; features = { @@ -25310,6 +25544,7 @@ with pkgs; gr-qtgui = false; gr-utils = false; gr-modtool = false; + gr-blocktool = false; sphinx = false; doxygen = false; # Doesn't make it reference python eventually, but makes reverse @@ -25318,31 +25553,33 @@ with pkgs; }; }; }; - gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python2; - # Incompatible with uhd4+ - uhd = uhd3_5; + python = python3; }; }; - gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs; + gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. - gnuradio3_7Minimal = gnuradio3_7.override { + gnuradio3_8Minimal = gnuradio3_8.override { doWrap = false; - unwrapped = gnuradio3_7.unwrapped.override { + unwrapped = gnuradio3_8.unwrapped.override { volk = volk.override { enableModTool = false; }; features = { gnuradio-companion = false; python-support = false; + examples = false; gr-qtgui = false; gr-utils = false; + gr-modtool = false; sphinx = false; doxygen = false; - gr-wxgui = false; + # Doesn't make it reference python eventually, but makes reverse + # depdendencies require python to use cmake files of GR. + gr-ctrlport = false; }; }; }; @@ -25403,9 +25640,7 @@ with pkgs; grip-search = callPackage ../tools/text/grip-search { }; - grip = callPackage ../applications/misc/grip { - inherit (gnome2) libgnome libgnomeui vte; - }; + grip = callPackage ../applications/misc/grip { }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -25419,6 +25654,8 @@ with pkgs; fftw = fftwSinglePrec; }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gjay = callPackage ../applications/audio/gjay { }; photivo = callPackage ../applications/graphics/photivo { }; @@ -25495,9 +25732,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25507,7 +25742,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25519,12 +25753,24 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; }; + librewolf-unwrapped = firefoxPackages.librewolf; + + librewolf = wrapFirefox librewolf-unwrapped { + inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; + libName = "librewolf"; + }; + + librewolf-wayland = librewolf.override { + forceWayland = true; + }; + + firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; + flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -25537,10 +25783,6 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; - fme = callPackage ../applications/misc/fme { - inherit (gnome2) libglademm; - }; - fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -25732,6 +25974,8 @@ with pkgs; jmusicbot = callPackage ../applications/audio/jmusicbot { }; + lemonade = callPackage ../applications/misc/lemonade { }; + libquvi = callPackage ../applications/video/quvi/library.nix { }; librespot = callPackage ../applications/audio/librespot { @@ -25860,11 +26104,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; }; - googleearth = callPackage ../applications/misc/googleearth { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -25948,13 +26190,11 @@ with pkgs; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; - heme = callPackage ../applications/editors/heme { }; - herbe = callPackage ../applications/misc/herbe { }; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26062,6 +26302,12 @@ with pkgs; musikcube = callPackage ../applications/audio/musikcube {}; + libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; + + mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; + + mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { }; + p2pool = callPackage ../applications/misc/p2pool { }; pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; @@ -26076,6 +26322,8 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -26111,11 +26359,10 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; super-productivity = callPackage ../applications/office/super-productivity { - electron = electron_13; + electron = electron_17; }; wlroots = wlroots_0_15; - wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { inherit (xorg) xcbutilrenderutil; }; @@ -26123,9 +26370,7 @@ with pkgs; inherit (xorg) xcbutilrenderutil; }; - sway-unwrapped = callPackage ../applications/window-managers/sway { - wlroots = wlroots_0_14; - }; + sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; @@ -26137,6 +26382,8 @@ with pkgs; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; @@ -26227,8 +26474,6 @@ with pkgs; icewm = callPackage ../applications/window-managers/icewm {}; - icecat-bin = callPackage ../applications/networking/browsers/icecat-bin { }; - icon-library = callPackage ../applications/graphics/icon-library { }; id3v2 = callPackage ../applications/audio/id3v2 { }; @@ -26341,9 +26586,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { }; - index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -26449,20 +26691,9 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3d = callPackage ../applications/graphics/k3d { - inherit (gnome2) gtkglext; - stdenv = gcc6Stdenv; - boost = boost155.override { - enablePython = true; - python = python2; - stdenv = gcc6Stdenv; - buildPackages = buildPackages // { - stdenv = gcc6Stdenv; - }; - }; - }; + k3s = callPackage ../applications/networking/cluster/k3s { }; - k3s = callPackage ../applications/networking/cluster/k3s {}; + k3sup = callPackage ../applications/networking/cluster/k3sup {}; kconf = callPackage ../applications/networking/cluster/kconf { }; @@ -26503,7 +26734,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26584,6 +26815,7 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; @@ -26593,13 +26825,9 @@ with pkgs; kubecolor = callPackage ../applications/networking/cluster/kubecolor { }; - kubectl = callPackage ../applications/networking/cluster/kubectl { }; - kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo115Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -26672,16 +26900,18 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; + kup = libsForQt5.callPackage ../applications/misc/kup { }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; labwc = callPackage ../applications/window-managers/labwc { - wlroots = wlroots_0_14; + wlroots = wlroots_0_15; }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -26726,8 +26956,10 @@ with pkgs; boost = boost175; }; - libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped = libreoffice.libreoffice; + libreoffice = if stdenv.isDarwin + then callPackage ../applications/office/libreoffice/darwin.nix {} + else hiPrio libreoffice-still; + libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -26807,7 +27039,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -26856,6 +27088,8 @@ with pkgs; inherit (luajitPackages) luafilesystem; }; + lookatme = callPackage ../tools/misc/lookatme {}; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; @@ -26990,7 +27224,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27016,6 +27250,10 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + mepo = callPackage ../applications/misc/mepo { + zig = zig_0_8_1; + }; + meshcentral = callPackage ../tools/admin/meshcentral { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -27106,8 +27344,6 @@ with pkgs; monkeysphere = callPackage ../tools/security/monkeysphere { }; - monodevelop = callPackage ../applications/editors/monodevelop {}; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; @@ -27117,7 +27353,9 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; }; - monitor = callPackage ../applications/system/monitor { }; + monitor = callPackage ../applications/system/monitor { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; @@ -27161,6 +27399,8 @@ with pkgs; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -27180,7 +27420,7 @@ with pkgs; mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc_cli = callPackage ../applications/audio/mpc { + mpc-cli = callPackage ../applications/audio/mpc { inherit (python3Packages) sphinx; }; @@ -27311,8 +27551,6 @@ with pkgs; n8n = callPackage ../applications/networking/n8n {}; - neap = callPackage ../applications/misc/neap { }; - neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -27344,6 +27582,8 @@ with pkgs; nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + novnc = callPackage ../applications/networking/novnc { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; @@ -27394,6 +27634,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul { }; + pijuice = with python3Packages; toPythonApplication pijuice; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; @@ -27488,8 +27730,6 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; - synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; @@ -27628,11 +27868,9 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { - inherit (gnome2) libglade; - }; + obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -27783,9 +28021,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -27849,6 +28087,8 @@ with pkgs; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phrase-cli = callPackage ../tools/misc/phrase-cli { }; + phraseapp-client = callPackage ../tools/misc/phraseapp-client { }; phwmon = callPackage ../applications/misc/phwmon { }; @@ -27931,6 +28171,8 @@ with pkgs; purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; + purpur = callPackage ../games/purpur { }; + pikopixel = callPackage ../applications/graphics/pikopixel { }; pithos = callPackage ../applications/audio/pithos { @@ -27951,8 +28193,7 @@ with pkgs; plexamp = callPackage ../applications/audio/plexamp { }; - # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails - plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -27972,6 +28213,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomotroid = callPackage ../applications/misc/pomotroid { + electron = electron_9; + }; + pond = callPackage ../applications/networking/instant-messengers/pond { }; ponymix = callPackage ../applications/audio/ponymix { }; @@ -28063,9 +28308,7 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { - withGrass = false; - }; + qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; qgis = callPackage ../applications/gis/qgis { }; @@ -28171,7 +28414,7 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -28214,6 +28457,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + redux = callPackage ../applications/audio/redux { }; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; radiotray-ng = callPackage ../applications/audio/radiotray-ng { @@ -28278,7 +28523,10 @@ with pkgs; ries = callPackage ../applications/science/math/ries { }; - ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { }; + ripcord = if stdenv.isLinux then + qt5.callPackage ../applications/networking/instant-messengers/ripcord { } + else + callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -28288,6 +28536,10 @@ with pkgs; rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; + rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { }; + rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix { + rofi-unwrapped = rofi-wayland-unwrapped; + }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -28301,7 +28553,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28309,6 +28561,8 @@ with pkgs; jdk = jdk8; }; + rstudio-server = rstudio.override { server = true; }; + rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; @@ -28322,6 +28576,10 @@ with pkgs; rubyripper = callPackage ../applications/audio/rubyripper {}; + rucredstash = callPackage ../tools/security/rucredstash { + inherit (darwin.apple_sdk.frameworks) Security; + }; + runc = callPackage ../applications/virtualization/runc {}; rymcast = callPackage ../applications/audio/rymcast { @@ -28336,7 +28594,7 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28360,6 +28618,8 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seahub = callPackage ../applications/networking/seahub { }; + seatd = callPackage ../applications/misc/seatd { }; secretscanner = callPackage ../tools/security/secretscanner { }; @@ -28432,7 +28692,9 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { }; + split2flac = callPackage ../applications/audio/split2flac { + inherit (python3.pkgs) mutagen; + }; spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; @@ -28442,6 +28704,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + sptlrx = callPackage ../applications/audio/sptlrx { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; @@ -28460,7 +28724,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -28530,8 +28794,6 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaByDagoma = callPackage ../applications/misc/curabydagoma { }; - peru = callPackage ../applications/version-management/peru {}; petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; @@ -28619,6 +28881,7 @@ with pkgs; src = callPackage ../applications/version-management/src { git = gitMinimal; + python = python3; }; sslyze = with python3Packages; toPythonApplication sslyze; @@ -28708,6 +28971,8 @@ with pkgs; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; + syncterm = callPackage ../applications/terminal-emulators/syncterm { }; + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-discovery @@ -28752,6 +29017,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talentedhack = callPackage ../applications/audio/talentedhack { }; tambura = callPackage ../applications/audio/tambura { }; @@ -28942,9 +29209,7 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { - inherit (pythonPackages) wrapPython wxPython; - }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -29108,7 +29373,7 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; vengi-tools = callPackage ../applications/graphics/vengi-tools { - inherit (darwin.apple_sdk.frameworks) Carbon OpenCL; + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices OpenCL; }; verbiste = callPackage ../applications/misc/verbiste { @@ -29156,9 +29421,7 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; - qtile = callPackage ../applications/window-managers/qtile { - inherit (xorg) libxcb; - }; + qtile = callPackage ../applications/window-managers/qtile { }; vimpc = callPackage ../applications/audio/vimpc { }; @@ -29274,8 +29537,6 @@ with pkgs; libcaca = null; }; - vlc_qt5 = vlc; - libvlc = vlc.override { withQt5 = false; qtbase = null; @@ -29323,8 +29584,9 @@ with pkgs; }; code-server = callPackage ../servers/code-server { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin) cctools; + inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; @@ -29429,7 +29691,7 @@ with pkgs; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + weston = callPackage ../applications/window-managers/weston { }; whalebird = callPackage ../applications/misc/whalebird { electron = electron_14; @@ -29474,6 +29736,8 @@ with pkgs; wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + cl-wordle = callPackage ../games/cl-wordle { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -29557,6 +29821,8 @@ with pkgs; gtk = gtk2; }; + xxh = with python3Packages; toPythonApplication xxh; + kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { @@ -29576,7 +29842,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -29667,11 +29933,7 @@ with pkgs; }; xiphos = callPackage ../applications/misc/xiphos { - gconf = gnome2.GConf; - inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; - python = python27; - enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { @@ -29793,8 +30055,6 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; - yarssr = callPackage ../applications/misc/yarssr { }; - yate = callPackage ../applications/misc/yate { }; ydiff = with python3.pkgs; toPythonApplication ydiff; @@ -29837,7 +30097,8 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; - zathura = callPackage ../applications/misc/zathura { }; + zathuraPkgs = callPackage ../applications/misc/zathura { }; + zathura = zathuraPkgs.zathuraWrapper; zdns = callPackage ../tools/security/zdns { }; @@ -29953,6 +30214,8 @@ with pkgs; clightning = callPackage ../applications/blockchains/clightning { }; + besu = callPackage ../applications/blockchains/besu { }; + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; withGui = true; @@ -30044,11 +30307,24 @@ with pkgs; faraday = callPackage ../applications/blockchains/faraday { }; + fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; + groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { + boost = boost17x; + withGui = true; + inherit (darwin) autoSignDarwinBinariesHook; + }; + + groestlcoind = callPackage ../applications/blockchains/groestlcoin { + boost = boost17x; + inherit (darwin) autoSignDarwinBinariesHook; + }; + ledger_agent = with python3Packages; toPythonApplication ledger_agent; ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; @@ -30112,6 +30388,14 @@ with pkgs; sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; }; + solana-testnet = callPackage ../applications/blockchains/solana { + inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit; + }; + + snarkos = callPackage ../applications/blockchains/snarkos { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tessera = callPackage ../applications/blockchains/tessera { }; vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { @@ -30131,22 +30415,18 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; openethereum = callPackage ../applications/blockchains/openethereum { }; - parity-ui = callPackage ../applications/blockchains/parity-ui { }; - polkadot = callPackage ../applications/blockchains/polkadot { }; particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; quorum = callPackage ../applications/blockchains/quorum { }; - whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; - saga = libsForQt5.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -30172,10 +30452,22 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; - displaycal = callPackage ../applications/graphics/displaycal {}; - drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + + eureka-editor = callPackage ../applications/misc/eureka-editor { }; + + eureka-ideas = callPackage ../applications/misc/eureka-ideas { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + fava = callPackage ../applications/office/fava {}; + + nux = callPackage ../tools/misc/nux { }; + + tts = callPackage ../tools/audio/tts { }; + ### GAMES _1oom = callPackage ../games/1oom { }; @@ -30186,6 +30478,8 @@ with pkgs; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; + ace-of-penguins = callPackage ../games/ace-of-penguins { }; + among-sus = callPackage ../games/among-sus { }; antsimulator = callPackage ../games/antsimulator { }; @@ -30194,7 +30488,9 @@ with pkgs; ballerburg = callPackage ../games/ballerburg { } ; - colobot = callPackage ../games/colobot {}; + blockattack = callPackage ../games/blockattack { } ; + + colobot = callPackage ../games/colobot { }; doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; @@ -30289,7 +30585,7 @@ with pkgs; amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; - andyetitmoves = callPackage ../games/andyetitmoves {}; + andyetitmoves = callPackage ../games/andyetitmoves { }; angband = callPackage ../games/angband { }; @@ -30302,7 +30598,7 @@ with pkgs; armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; - arena = callPackage ../games/arena {}; + arena = callPackage ../games/arena { }; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; @@ -30316,17 +30612,17 @@ with pkgs; astromenace = callPackage ../games/astromenace { }; - atanks = callPackage ../games/atanks {}; + atanks = callPackage ../games/atanks { }; - azimuth = callPackage ../games/azimuth {}; + azimuth = callPackage ../games/azimuth { }; ballAndPaddle = callPackage ../games/ball-and-paddle { guile = guile_1_8; }; - banner = callPackage ../games/banner {}; + banner = callPackage ../games/banner { }; - bastet = callPackage ../games/bastet {}; + bastet = callPackage ../games/bastet { }; black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; @@ -30411,12 +30707,12 @@ with pkgs; inherit (import ../games/crossfire pkgs) crossfire-server crossfire-arch crossfire-maps crossfire-client; - crrcsim = callPackage ../games/crrcsim {}; + crrcsim = callPackage ../games/crrcsim { }; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; - cutemaze = libsForQt5.callPackage ../games/cutemaze {}; + cutemaze = libsForQt5.callPackage ../games/cutemaze { }; cuyo = callPackage ../games/cuyo { }; @@ -30431,7 +30727,7 @@ with pkgs; }; }; - dhewm3 = callPackage ../games/dhewm3 {}; + dhewm3 = callPackage ../games/dhewm3 { }; domination = callPackage ../games/domination { }; @@ -30479,12 +30775,6 @@ with pkgs; eternity = callPackage ../games/eternity-engine { }; - eureka-editor = callPackage ../applications/misc/eureka-editor { }; - - eureka-ideas = callPackage ../applications/misc/eureka-ideas { - inherit (darwin.apple_sdk.frameworks) Security; - }; - extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; @@ -30513,13 +30803,11 @@ with pkgs; factorio-utils = callPackage ../games/factorio/utils.nix { }; - fairymax = callPackage ../games/fairymax {}; - - fava = callPackage ../applications/office/fava {}; + fairymax = callPackage ../games/fairymax { }; - fheroes2 = callPackage ../games/fheroes2 {}; + fheroes2 = callPackage ../games/fheroes2 { }; - fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; fishfight = callPackage ../games/fishfight { inherit (xorg) libX11 libXi; @@ -30565,8 +30853,6 @@ with pkgs; }; }; - fslint = callPackage ../applications/misc/fslint {}; - galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -30585,9 +30871,9 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - gimx = callPackage ../games/gimx {}; + gimx = callPackage ../games/gimx { }; - gl117 = callPackage ../games/gl-117 {}; + gl117 = callPackage ../games/gl-117 { }; globulation2 = callPackage ../games/globulation { boost = boost155; @@ -30613,13 +30899,11 @@ with pkgs; gnushogi = callPackage ../games/gnushogi { }; - gogui = callPackage ../games/gogui {}; - - gscrabble = python3Packages.callPackage ../games/gscrabble {}; + gogui = callPackage ../games/gogui { }; - gshogi = python3Packages.callPackage ../games/gshogi {}; + gscrabble = python3Packages.callPackage ../games/gscrabble { }; - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + gshogi = python3Packages.callPackage ../games/gshogi { }; qtads = qt5.callPackage ../games/qtads { }; @@ -30633,14 +30917,12 @@ with pkgs; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled {}; + gweled = callPackage ../games/gweled { }; gzdoom = callPackage ../games/gzdoom { }; harmonist = callPackage ../games/harmonist { }; - hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -30681,7 +30963,7 @@ with pkgs; enableGPU = false; }; - klavaro = callPackage ../games/klavaro {}; + klavaro = callPackage ../games/klavaro { }; kobodeluxe = callPackage ../games/kobodeluxe { }; @@ -30703,7 +30985,7 @@ with pkgs; liberation-circuit = callPackage ../games/liberation-circuit { }; - lincity = callPackage ../games/lincity {}; + lincity = callPackage ../games/lincity { }; lincity_ng = callPackage ../games/lincity/ng.nix { # https://github.com/lincity-ng/lincity-ng/issues/25 @@ -30717,7 +30999,7 @@ with pkgs; liquidwar5 = callPackage ../games/liquidwar/5.nix { }; - lugaru = callPackage ../games/lugaru {}; + lugaru = callPackage ../games/lugaru { }; macopix = callPackage ../games/macopix { gtk = gtk2; @@ -30729,7 +31011,7 @@ with pkgs; mars = callPackage ../games/mars { }; - megaglest = callPackage ../games/megaglest {}; + megaglest = callPackage ../games/megaglest { }; methane = callPackage ../games/methane { }; @@ -30749,20 +31031,20 @@ with pkgs; minecraft = callPackage ../games/minecraft { }; - minecraft-server = callPackage ../games/minecraft-server { }; - - moon-buggy = callPackage ../games/moon-buggy {}; + minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; + minecraft-server = minecraftServers.vanilla; # backwards compatibility - multimc = libsForQt5.callPackage ../games/multimc { }; + moon-buggy = callPackage ../games/moon-buggy { }; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) - minetestclient_4 minetestserver_4 minetestclient_5 minetestserver_5; - minetest = minetestclient_5; + minetest = minetestclient; + minetestclient = minetestclient_5; + minetestserver = minetestserver_5; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -30774,6 +31056,10 @@ with pkgs; lua = lua5_1; }; + blightmud = callPackage ../games/blightmud { }; + + blightmud-tts = callPackage ../games/blightmud { withTTS = true; }; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -30795,15 +31081,14 @@ with pkgs; nexuiz = callPackage ../games/nexuiz { }; - nux = callPackage ../tools/misc/nux { }; - ninvaders = callPackage ../games/ninvaders { }; njam = callPackage ../games/njam { }; - newtonwars = callPackage ../games/newtonwars { }; + npush = callPackage ../games/npush { }; + run-npush = callPackage ../games/npush/run.nix { }; - nottetris2 = callPackage ../games/nottetris2 { }; + newtonwars = callPackage ../games/newtonwars { }; nudoku = callPackage ../games/nudoku { }; @@ -30833,12 +31118,14 @@ with pkgs; portmod = callPackage ../games/portmod { }; - tlauncher = callPackage ../games/tlauncher {}; + tetrio-desktop = callPackage ../games/tetrio-desktop { }; tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { }; + otto-matic = callPackage ../games/otto-matic { }; + openraPackages = import ../games/openra pkgs; openra = openraPackages.engines.release; @@ -30861,8 +31148,8 @@ with pkgs; static = true; }; }; - openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; - openttd-nml = callPackage ../games/openttd/nml.nix {}; + openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; + openttd-nml = callPackage ../games/openttd/nml.nix { }; opentyrian = callPackage ../games/opentyrian { }; @@ -30884,7 +31171,7 @@ with pkgs; pinball = callPackage ../games/pinball { }; - pingus = callPackage ../games/pingus {}; + pingus = callPackage ../games/pingus { }; pioneer = callPackage ../games/pioneer { }; @@ -30892,11 +31179,18 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; + polymc = libsForQt5.callPackage ../games/polymc { }; + pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + }; - pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + pokerth-server = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + target = "server"; + }; powermanga = callPackage ../games/powermanga { }; @@ -30928,7 +31222,7 @@ with pkgs; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; - quantumminigolf = callPackage ../games/quantumminigolf {}; + quantumminigolf = callPackage ../games/quantumminigolf { }; r2mod_cli = callPackage ../games/r2mod_cli { }; @@ -30955,8 +31249,6 @@ with pkgs; rili = callPackage ../games/rili { }; - rimshot = callPackage ../games/rimshot { love = love_0_7; }; - rogue = callPackage ../games/rogue { ncurses = ncurses5; }; @@ -30979,7 +31271,7 @@ with pkgs; openjdk = openjdk8; }; - sauerbraten = callPackage ../games/sauerbraten {}; + sauerbraten = callPackage ../games/sauerbraten { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -31052,7 +31344,7 @@ with pkgs; ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; - stardust = callPackage ../games/stardust {}; + stardust = callPackage ../games/stardust { }; starspace = callPackage ../applications/science/machine-learning/starspace { }; @@ -31104,6 +31396,8 @@ with pkgs; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; + snis = callPackage ../games/snis { }; + system-syzygy = callPackage ../games/system-syzygy { }; t4kcommon = callPackage ../games/t4kcommon { }; @@ -31112,6 +31406,8 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; + the-legend-of-edgar = callPackage ../games/the-legend-of-edgar { }; + the-powder-toy = callPackage ../games/the-powder-toy { lua = lua5_1; }; @@ -31138,8 +31434,6 @@ with pkgs; tinyfugue = callPackage ../games/tinyfugue { }; - tockloader = callPackage ../development/tools/misc/tockloader { }; - tome2 = callPackage ../games/tome2 { }; tome4 = callPackage ../games/tome4 { }; @@ -31152,8 +31446,6 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; - tts = callPackage ../tools/audio/tts { }; - tumiki-fighters = callPackage ../games/tumiki-fighters { }; tuxpaint = callPackage ../games/tuxpaint { }; @@ -31174,9 +31466,7 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; - uchess = callPackage ../games/uchess { - buildGoModule = buildGo116Module; - }; + uchess = callPackage ../games/uchess { }; udig = callPackage ../applications/gis/udig { }; @@ -31208,16 +31498,6 @@ with pkgs; ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; - vapor = callPackage ../games/vapor { love = love_0_8; }; - - vapoursynth = callPackage ../development/libraries/vapoursynth { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - - vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; - - vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; - vassal = callPackage ../games/vassal { }; vdrift = callPackage ../games/vdrift { }; @@ -31296,8 +31576,8 @@ with pkgs; xpilot-ng = callPackage ../games/xpilot { }; - bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {}; - bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {}; + bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; + bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; xskat = callPackage ../games/xskat { }; @@ -31346,6 +31626,12 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + _7kaa = callPackage ../games/7kaa { }; + + hhexen = callPackage ../games/hhexen { }; + + wyvern = callPackage ../games/wyvern { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -31375,8 +31661,6 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - hhexen = callPackage ../games/hhexen { }; - hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; @@ -31397,6 +31681,8 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; inherit (callPackages ../applications/misc/redshift { @@ -31596,8 +31882,6 @@ with pkgs; last = callPackage ../applications/science/biology/last { }; - lumpy = callPackage ../applications/science/biology/lumpy { }; - macse = callPackage ../applications/science/biology/macse { }; MACS2 = callPackage ../applications/science/biology/MACS2 { }; @@ -31622,7 +31906,7 @@ with pkgs; useMpi = true; }); - neuron-full = neuron-mpi.override { inherit python; }; + neuron-full = neuron-mpi.override { python = python2; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -31860,6 +32144,8 @@ with pkgs; sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; }; + sagetex = callPackage ../misc/sagetex { }; + subread = callPackage ../applications/science/biology/subread { }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; @@ -31875,6 +32161,10 @@ with pkgs; sympow = callPackage ../development/libraries/science/math/sympow { }; + trilinos = callPackage ../development/libraries/science/math/trilinos {}; + + trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; @@ -31945,6 +32235,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + shtns = callPackage ../applications/science/physics/shtns { }; + xfitter = callPackage ../applications/science/physics/xfitter {}; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -31998,7 +32290,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -32022,6 +32314,8 @@ with pkgs; eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; }; + formula = callPackage ../applications/science/logic/formula { }; + gappa = callPackage ../applications/science/logic/gappa { }; gfan = callPackage ../applications/science/math/gfan {}; @@ -32243,6 +32537,12 @@ with pkgs; xoscope = callPackage ../applications/science/electronics/xoscope { }; + xyce = callPackage ../applications/science/electronics/xyce { }; + + xyce-parallel = callPackage ../applications/science/electronics/xyce { + withMPI = true; + trilinos = trilinos-mpi; + }; ### SCIENCE / MATH @@ -32420,9 +32720,7 @@ with pkgs; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; - tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake_2_8; - }; + tulip = libsForQt5.callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; @@ -32505,11 +32803,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32523,7 +32821,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32545,7 +32843,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32586,6 +32884,8 @@ with pkgs; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; + epson-201401w = callPackage ../misc/drivers/epson-201401w { }; + epson-201106w = callPackage ../misc/drivers/epson-201106w { }; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; @@ -32621,13 +32921,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32643,13 +32943,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - demjson = with python3Packages; toPythonApplication demjson; - - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32661,7 +32959,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32671,7 +32969,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32705,7 +33003,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32721,7 +33019,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -32730,7 +33028,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -32756,9 +33054,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -32778,10 +33076,6 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - - hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; - hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -32808,9 +33102,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima {}; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima {}; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -32873,7 +33167,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -32881,7 +33175,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -32901,7 +33195,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -32909,21 +33203,19 @@ with pkgs; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mysides = callPackage ../os-specific/darwin/mysides { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; neo = callPackage ../applications/misc/neo { }; - inherit (callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; - }) - nix - nixStable - nix_2_3 - nix_2_4 - nix_2_5 - nixUnstable; + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + }); + + nix = nixVersions.stable; nixStatic = pkgsStatic.nix; @@ -33005,6 +33297,20 @@ with pkgs; in c.config.system.build // c; + /* + A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. + */ + pkgsModule = { lib, options, ... }: { + config = + if options?nixpkgs.pkgs then { + # legacy / nixpkgs.nix style + nixpkgs.pkgs = pkgs; + } + else { + # minimal + _module.args.pkgs = pkgs; + }; + }; /* * Run a NixOS VM network test using this evaluation of Nixpkgs. @@ -33096,7 +33402,7 @@ with pkgs; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); - nixos-option = callPackage ../tools/nix/nixos-option { nix = nix_2_3; }; + nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -33121,7 +33427,7 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; nix-top = callPackage ../tools/package-management/nix-top { }; @@ -33141,6 +33447,8 @@ with pkgs; nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + alejandra = callPackage ../tools/nix/alejandra { }; + nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -33172,7 +33480,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; + inherit (python2Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; @@ -33224,7 +33532,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33254,13 +33562,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33270,11 +33578,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33300,26 +33608,29 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; retroarch = wrapRetroArch { retroarch = retroarchBare; }; retroarchFull = retroarch.override { - cores = builtins.filter (c: c ? libretroCore) (builtins.attrValues libretro); + cores = builtins.filter + # Remove cores not supported on platform + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) + (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33331,6 +33642,8 @@ with pkgs; ricty = callPackage ../data/fonts/ricty { }; + rmfakecloud = callPackage ../servers/rmfakecloud { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; rmount = callPackage ../tools/filesystems/rmount {}; @@ -33499,11 +33812,8 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - buildGoModule = buildGo117Module; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_12 terraform_0_13 terraform_0_14 terraform_0_15 @@ -33516,9 +33826,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - buildGoModule = buildGo117Module; - } + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -33539,7 +33847,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt {}; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -33558,8 +33866,12 @@ with pkgs; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; + vcluster = callPackage ../applications/networking/cluster/vcluster {}; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; + sshportal = callPackage ../servers/sshportal { }; + ssh-audit = callPackage ../tools/security/ssh-audit { }; ssh-tools = callPackage ../applications/misc/ssh-tools { }; @@ -33627,11 +33939,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -33713,7 +34025,7 @@ with pkgs; inherit wineBuild; inherit (callPackage ./wine-packages.nix {}) - minimal base full stable stableFull unstable unstableFull staging stagingFull fonts; + minimal base full stable stableFull unstable unstableFull staging stagingFull wayland waylandFull fonts; }); winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); @@ -33727,7 +34039,11 @@ with pkgs; wineRelease = "staging"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + wine-wayland = lowPrio (winePackages.full.override { + wineRelease = "wayland"; + }); + + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -33745,11 +34061,7 @@ with pkgs; wprecon = callPackage ../tools/security/wprecon { }; - wraith = callPackage ../applications/networking/irc/wraith { - openssl = openssl_1_0_2; - }; - - wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; @@ -33761,8 +34073,6 @@ with pkgs; wxGTK = wxGTK30; }; - wyvern = callPackage ../games/wyvern { }; - x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -33823,7 +34133,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -33846,11 +34156,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -33873,36 +34183,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; - }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; }; @@ -33932,17 +34240,17 @@ with pkgs; discord = import ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-ptb = import ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-canary = import ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs; + inherit pkgs lib stdenv; }; golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; @@ -33951,8 +34259,6 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { }; - imatix_gsl = callPackage ../development/tools/imatix_gsl {}; sccache = callPackage ../development/tools/misc/sccache { @@ -33983,6 +34289,8 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; + pynitrokey = callPackage ../tools/security/pynitrokey { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; @@ -34173,7 +34481,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf {}; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34191,7 +34499,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; @@ -34201,6 +34509,8 @@ with pkgs; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; @@ -34219,7 +34529,7 @@ with pkgs; jami-daemon jami-libclient jami-client-gnome jami-client-qt; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { - electron = electron_13; + electron = electron_16; }; zenstates = callPackage ../os-specific/linux/zenstates {}; @@ -34262,7 +34572,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; @@ -34273,4 +34583,10 @@ with pkgs; }; zthrottle = callPackage ../tools/misc/zthrottle { }; + + honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { }; + + honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; + + honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; } |