diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1182 |
1 files changed, 638 insertions, 544 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc90840a8..f7db2a98208 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 { }; - uxn = callPackage ../misc/emulators/uxn { }; + btdu = callPackage ../tools/misc/btdu { }; + + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -337,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; }; @@ -347,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 {}; @@ -367,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 { }; @@ -431,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 {}); @@ -448,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 {}; @@ -519,9 +540,7 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - packer = callPackage ../development/tools/packer { - buildGoModule = buildGo117Module; - }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -651,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 { @@ -695,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 @@ -797,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; @@ -1009,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 { }; @@ -1031,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 { } ; @@ -1074,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 { @@ -1081,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 { }; @@ -1103,20 +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 { }; - - logseq = callPackage ../applications/misc/logseq { }; + kitty-themes = callPackage ../misc/kitty-themes {}; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -1130,26 +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 { }; - - popsicle = callPackage ../tools/misc/popsicle { }; - 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 { @@ -1162,16 +1189,12 @@ with pkgs; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; - snowflake = callPackage ../tools/networking/snowflake { }; - stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -1181,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 { }; @@ -1221,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; }; @@ -1295,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 { }; @@ -1477,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 {}; @@ -1691,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 { @@ -1711,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 { }; @@ -1761,9 +1802,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 { }; @@ -1885,8 +1924,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 { }; @@ -1937,6 +1982,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 { }; @@ -2270,7 +2317,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2326,9 +2373,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 { }; @@ -2336,9 +2383,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 { }; @@ -2455,19 +2500,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 { }; @@ -2521,7 +2566,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 { }; @@ -2605,6 +2650,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 { }; @@ -2754,10 +2801,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 { }; @@ -2839,9 +2882,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 { }; @@ -2880,7 +2923,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 { }; @@ -2927,9 +2970,9 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; + electron = electron_15; }; - element-desktop-wayland = writeScript "element-desktop-wayland" '' + element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" ''; @@ -2976,6 +3019,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 { @@ -2986,6 +3031,8 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; + findimagedupes = callPackage ../tools/graphics/findimagedupes { }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -3113,6 +3160,8 @@ with pkgs; 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 { }; @@ -3161,11 +3210,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 { }; @@ -3175,7 +3228,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 { }; @@ -3367,6 +3422,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 { }; @@ -3451,6 +3508,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 { }; @@ -3459,6 +3518,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 { }; @@ -3513,6 +3574,8 @@ 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 { }; @@ -3618,7 +3681,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3640,7 +3703,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -3853,14 +3916,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 { }; @@ -4113,7 +4169,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 { }; @@ -4183,10 +4239,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 { }; @@ -4244,9 +4306,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 { }; @@ -4294,18 +4354,16 @@ with pkgs; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; - age = callPackage ../tools/security/age { - buildGoModule = buildGo117Module; - }; + age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { - buildGoModule = buildGo117Module; - }; + agebox = callPackage ../tools/security/agebox { }; age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { 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; @@ -4342,6 +4400,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 { }; @@ -4739,11 +4799,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; }; @@ -4924,7 +4984,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" '' + schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" ''; @@ -4981,16 +5041,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; @@ -5115,14 +5181,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 { }; @@ -5244,12 +5312,16 @@ with pkgs; 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 { }; @@ -5329,7 +5401,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 { }; @@ -5557,6 +5629,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 {}; @@ -5892,19 +5966,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 { }; @@ -5986,7 +6058,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 { }; @@ -6013,16 +6087,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 { }; @@ -6368,9 +6446,7 @@ with pkgs; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { - buildGoModule = buildGo117Module; - }; + headscale = callPackage ../servers/headscale { }; heisenbridge = callPackage ../servers/heisenbridge { }; @@ -6575,6 +6651,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 { }; @@ -6608,8 +6686,6 @@ with pkgs; ioping = callPackage ../tools/system/ioping { }; - iops = callPackage ../tools/system/iops { }; - ior = callPackage ../tools/system/ior { }; iouyap = callPackage ../tools/networking/iouyap { }; @@ -6624,8 +6700,12 @@ with pkgs; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + 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; }; @@ -6695,6 +6775,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; + jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -6711,6 +6793,8 @@ with pkgs; jet = callPackage ../development/tools/jet { }; + jfmt = callPackage ../development/tools/jfmt { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -6730,6 +6814,8 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; + jless = callPackage ../development/tools/jless { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -7139,6 +7225,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; }; @@ -7283,7 +7373,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7579,6 +7669,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + lziprecover = callPackage ../tools/compression/lziprecover { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; @@ -7712,11 +7804,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 { }; @@ -7732,7 +7824,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -7748,9 +7840,7 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoModule = buildGo117Module; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -7813,6 +7903,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 {}; @@ -7831,6 +7923,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 { }; @@ -7893,10 +7989,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 { }; @@ -7952,7 +8044,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -8079,11 +8171,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; @@ -8099,6 +8186,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 { }; @@ -8277,7 +8366,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 { }; @@ -8477,6 +8568,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 { }; @@ -8690,8 +8782,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 { }; @@ -8706,6 +8796,8 @@ with pkgs; pcapc = callPackage ../tools/networking/pcapc { }; + pdm = callPackage ../tools/package-management/pdm { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; @@ -8760,6 +8852,8 @@ 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 { }; @@ -8857,6 +8951,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 { @@ -9186,7 +9282,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 { }; @@ -9301,6 +9399,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 { }; @@ -9372,7 +9474,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -9476,7 +9578,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 { }; @@ -9506,6 +9608,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 { }; @@ -9606,10 +9710,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 { }; @@ -9669,6 +9769,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 { }; @@ -10138,9 +10242,7 @@ with pkgs; pythonPackages = python3Packages; }; - telepresence2 = callPackage ../tools/networking/telepresence2 { - buildGoModule = buildGo116Module; - }; + telepresence2 = callPackage ../tools/networking/telepresence2 { }; teler = callPackage ../tools/security/teler { }; @@ -10228,9 +10330,7 @@ with pkgs; 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 { }; @@ -10240,8 +10340,6 @@ with pkgs; timetagger = callPackage ../servers/timetagger { }; - timekeeper = callPackage ../applications/office/timekeeper { }; - timezonemap = callPackage ../development/libraries/timezonemap { }; tzupdate = callPackage ../applications/misc/tzupdate { }; @@ -10256,9 +10354,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 { }; @@ -10572,13 +10670,9 @@ with pkgs; uwufetch = callPackage ../tools/misc/uwufetch { }; - v2ray = callPackage ../tools/networking/v2ray { - buildGoModule = buildGo117Module; - }; + v2ray = callPackage ../tools/networking/v2ray { }; - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { - pkgsBuildBuild.buildGoModule = pkgsBuildBuild.buildGo117Module; - }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; @@ -10700,6 +10794,8 @@ with pkgs; SDL = SDL_sixel; }; + witness = callPackage ../tools/security/witness { }; + openconnect = openconnect_gnutls; openconnect_openssl = callPackage ../tools/networking/openconnect { @@ -10792,6 +10888,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 { }; @@ -10824,7 +10924,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 { }; @@ -10880,10 +10982,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 { }; @@ -11230,7 +11328,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 { }; @@ -11767,7 +11867,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 @@ -11801,9 +11901,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 { }; @@ -12379,21 +12477,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; @@ -12407,7 +12505,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 { }; @@ -12457,8 +12555,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; @@ -12555,7 +12653,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 { @@ -12670,10 +12781,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 @@ -12950,18 +13058,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; @@ -13138,6 +13246,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; @@ -13278,6 +13387,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { @@ -13524,9 +13635,7 @@ with pkgs; io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { - buildGoModule = buildGo117Module; - }; + ivy = callPackage ../development/interpreters/ivy { }; j = callPackage ../development/interpreters/j { stdenv = clangStdenv; @@ -13536,6 +13645,8 @@ with pkgs; janet = callPackage ../development/interpreters/janet {}; + jpm = callPackage ../development/interpreters/janet/jpm.nix {}; + jelly = callPackage ../development/interpreters/jelly {}; jimtcl = callPackage ../development/interpreters/jimtcl {}; @@ -13627,6 +13738,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 { }; @@ -13894,7 +14007,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 { }; @@ -13970,12 +14082,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 { }; @@ -14019,7 +14125,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 {}; @@ -14056,9 +14162,7 @@ with pkgs; abuild = callPackage ../development/tools/abuild { }; - actionlint = callPackage ../development/tools/analysis/actionlint { - buildGoModule = buildGo117Module; - }; + actionlint = callPackage ../development/tools/analysis/actionlint { }; adtool = callPackage ../tools/admin/adtool { }; @@ -14138,8 +14242,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_7 - electron_8 electron_9 electron_10 electron_11 @@ -14147,7 +14249,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -14261,13 +14364,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 { }; @@ -14334,6 +14431,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 { @@ -14442,11 +14541,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 { }; @@ -14719,6 +14820,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 { }; @@ -14925,6 +15028,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 { }; @@ -15175,12 +15280,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; }; @@ -15503,7 +15605,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 { }; @@ -15552,9 +15654,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 { }; @@ -15587,9 +15687,7 @@ with pkgs; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; - terraformer = callPackage ../development/tools/misc/terraformer { - buildGoModule = buildGo117Module; - }; + terraformer = callPackage ../development/tools/misc/terraformer { }; terrascan = callPackage ../tools/security/terrascan { }; @@ -15636,7 +15734,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 { }; @@ -15779,7 +15879,9 @@ with pkgs; 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 { }; @@ -15829,11 +15931,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; @@ -16314,7 +16412,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 {}; @@ -16422,6 +16520,8 @@ with pkgs; 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 { @@ -16556,10 +16656,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 { }; @@ -16632,8 +16729,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 { }; @@ -16652,32 +16747,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 { }; @@ -16864,8 +16946,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 { }; @@ -16920,8 +17000,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 { }; @@ -17012,8 +17090,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 { }; @@ -17056,17 +17132,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 { }; @@ -17332,8 +17400,7 @@ 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 { @@ -17872,9 +17939,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 { }; @@ -17973,8 +18038,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 { }; @@ -18288,7 +18351,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 { }; @@ -19066,10 +19129,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 {}; @@ -19221,10 +19280,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 { @@ -19234,6 +19295,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; @@ -19798,6 +19860,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 {}; @@ -19853,6 +19917,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; @@ -20217,9 +20283,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 { }; @@ -20352,7 +20416,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 { }; @@ -20390,7 +20454,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 { }; @@ -20414,21 +20481,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 { @@ -20443,10 +20503,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; @@ -20645,10 +20702,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 }; @@ -20691,39 +20744,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 { }; @@ -20845,7 +20888,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - alps = callPackage ../servers/alps {}; + alps = callPackage ../servers/alps { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -21012,7 +21055,6 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_15; jdk = openjdk11; gn = gn1924; }; @@ -21036,6 +21078,7 @@ 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 { }; @@ -21090,9 +21133,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 { }; @@ -21212,7 +21259,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; @@ -21231,25 +21278,19 @@ 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 { }; micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - buildGoModule = buildGo117Module; - }; + minio = callPackage ../servers/minio { }; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; @@ -21268,7 +21309,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; @@ -21294,7 +21334,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 { }; @@ -21471,9 +21513,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; @@ -21511,6 +21551,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; @@ -21554,12 +21596,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. @@ -21638,8 +21676,7 @@ with pkgs; openfire = callPackage ../servers/xmpp/openfire { }; - softether_4_29 = callPackage ../servers/softether/4.29.nix { }; - softether = softether_4_29; + softether = callPackage ../servers/softether { }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; @@ -21845,7 +21882,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -21910,9 +21949,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 { }; @@ -21952,7 +21989,9 @@ with pkgs; inherit (callPackages ../servers/unifi { }) unifiLTS unifi5 - unifi6; + unifi6 + unifi7; + unifi = unifi6; unifi-video = callPackage ../servers/unifi-video { }; @@ -21963,10 +22002,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; @@ -22310,7 +22353,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 { }; @@ -22447,6 +22490,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 { }; @@ -22604,6 +22649,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 { }; @@ -22803,19 +22850,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 { }; @@ -22923,6 +22964,8 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); + 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 { }; @@ -23547,7 +23590,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 { }; @@ -23639,6 +23684,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 {}; @@ -23907,6 +23954,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 { @@ -23942,6 +23991,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 { }; @@ -23982,8 +24033,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 { }; @@ -24009,7 +24058,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 { }; @@ -24025,7 +24074,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 {}; @@ -24132,7 +24181,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -24467,9 +24516,7 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - blocky = callPackage ../applications/networking/blocky { - buildGoModule = buildGo117Module; - }; + blocky = callPackage ../applications/networking/blocky { }; cadence = libsForQt5.callPackage ../applications/audio/cadence { }; @@ -24760,6 +24807,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; @@ -24812,6 +24861,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; @@ -24881,9 +24932,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 {}; @@ -24932,7 +24981,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; }; }; @@ -25018,13 +25067,9 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; - docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; - docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin) cctools; @@ -25037,9 +25082,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { - buildGoModule = buildGo117Module; - }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25091,11 +25134,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 @@ -25107,7 +25148,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 { }; @@ -25147,6 +25188,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 { }; @@ -25440,8 +25483,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 { @@ -25609,6 +25650,8 @@ with pkgs; fftw = fftwSinglePrec; }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gjay = callPackage ../applications/audio/gjay { }; photivo = callPackage ../applications/graphics/photivo { }; @@ -25685,9 +25728,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25697,7 +25738,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25709,12 +25749,22 @@ 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 { }; @@ -25920,6 +25970,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 { @@ -26050,7 +26102,7 @@ with pkgs; 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"; }; @@ -26134,13 +26186,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 { }; @@ -26248,6 +26298,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 {}; @@ -26262,6 +26318,8 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -26297,7 +26355,7 @@ 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; @@ -26320,6 +26378,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 {}; @@ -26410,8 +26470,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 { }; @@ -26524,9 +26582,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 { }; @@ -26632,7 +26687,9 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s = callPackage ../applications/networking/cluster/k3s {}; + k3s = callPackage ../applications/networking/cluster/k3s { }; + + k3sup = callPackage ../applications/networking/cluster/k3sup {}; kconf = callPackage ../applications/networking/cluster/kconf { }; @@ -26673,7 +26730,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 { }; @@ -26766,9 +26823,7 @@ with pkgs; 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 { }; @@ -26792,10 +26847,7 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { - # Fix-Me: This locking should be removed once PR #154059 is merged. - buildGoModule = buildGo117Module; - }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; @@ -26850,12 +26902,12 @@ with pkgs; 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 { }; @@ -26900,8 +26952,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; @@ -26981,7 +27035,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -27030,6 +27084,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 { }; @@ -27164,7 +27220,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 { }; @@ -27227,7 +27283,6 @@ with pkgs; minikube = callPackage ../applications/networking/cluster/minikube { inherit (darwin.apple_sdk.frameworks) vmnet; - buildGoModule = buildGo117Module; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -27285,8 +27340,6 @@ with pkgs; monkeysphere = callPackage ../tools/security/monkeysphere { }; - monodevelop = callPackage ../applications/editors/monodevelop {}; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; @@ -27342,6 +27395,8 @@ with pkgs; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -27523,6 +27578,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 { }; @@ -27807,11 +27864,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 {}); @@ -27962,9 +28017,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; }; @@ -28028,6 +28083,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 { }; @@ -28132,8 +28189,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 { }; @@ -28354,7 +28410,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; @@ -28397,6 +28453,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 { @@ -28461,7 +28519,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 { }; @@ -28488,7 +28549,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 { }; @@ -28529,7 +28590,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 { }; @@ -28553,6 +28614,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 { }; @@ -28637,6 +28700,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + sptlrx = callPackage ../applications/audio/sptlrx { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; @@ -28655,7 +28720,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -29015,9 +29080,7 @@ with pkgs; tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo116Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; termdbms = callPackage ../development/tools/database/termdbms { }; @@ -29306,7 +29369,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 { @@ -29624,7 +29687,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; @@ -29669,6 +29732,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; }; @@ -29752,6 +29817,8 @@ with pkgs; gtk = gtk2; }; + xxh = with python3Packages; toPythonApplication xxh; + kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { @@ -29771,7 +29838,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 { }; @@ -29984,8 +30051,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; @@ -30028,7 +30093,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 { }; @@ -30144,6 +30210,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; @@ -30235,6 +30303,8 @@ 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; @@ -30341,7 +30411,7 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; @@ -30353,8 +30423,6 @@ with pkgs; quorum = callPackage ../applications/blockchains/quorum { }; - whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; - saga = libsForQt5.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -30396,8 +30464,6 @@ with pkgs; tts = callPackage ../tools/audio/tts { }; - fslint = callPackage ../applications/misc/fslint { }; - ### GAMES _1oom = callPackage ../games/1oom { }; @@ -30970,10 +31036,11 @@ with pkgs; 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; @@ -31112,9 +31179,14 @@ with pkgs; 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 { }; @@ -31390,9 +31462,7 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; - uchess = callPackage ../games/uchess { - buildGoModule = buildGo116Module; - }; + uchess = callPackage ../games/uchess { }; udig = callPackage ../applications/gis/udig { }; @@ -31552,6 +31622,8 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + _7kaa = callPackage ../games/7kaa { }; + hhexen = callPackage ../games/hhexen { }; wyvern = callPackage ../games/wyvern { }; @@ -31605,6 +31677,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 { @@ -32083,6 +32157,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 { }; @@ -32153,6 +32231,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 { }; @@ -32206,7 +32286,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; @@ -32230,6 +32310,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 {}; @@ -32451,6 +32533,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 @@ -32711,11 +32799,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 { }; @@ -32729,7 +32817,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 { }; @@ -32751,7 +32839,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 { }; @@ -32829,13 +32917,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 { }; @@ -32851,13 +32939,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 { }; @@ -32869,7 +32955,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32879,7 +32965,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32913,7 +32999,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 { }; @@ -32929,7 +33015,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; @@ -32938,7 +33024,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 { }; @@ -32964,9 +33050,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; @@ -33012,13 +33098,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima { - buildGoModule = buildGo117Module; - }; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { - buildGoModule = buildGo117Module; - }; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -33081,7 +33163,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; @@ -33089,7 +33171,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; }; @@ -33109,7 +33191,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 { }; @@ -33117,15 +33199,17 @@ 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 { }; - nixVersions = callPackage ../tools/package-management/nix { + 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; @@ -33209,6 +33293,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. @@ -33345,6 +33443,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 { }; @@ -33428,7 +33528,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33458,13 +33558,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 { }; @@ -33474,11 +33574,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; @@ -33504,12 +33604,12 @@ 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; }; @@ -33522,11 +33622,11 @@ with pkgs; (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 { }; @@ -33538,6 +33638,8 @@ with pkgs; ricty = callPackage ../data/fonts/ricty { }; + rmfakecloud = callPackage ../servers/rmfakecloud { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; rmount = callPackage ../tools/filesystems/rmount {}; @@ -33706,9 +33808,7 @@ 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_13 terraform_0_14 @@ -33722,9 +33822,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 { }; @@ -33745,7 +33843,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 {}; @@ -33818,9 +33916,7 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vault = callPackage ../tools/security/vault { - buildGoModule = buildGo117Module; - }; + vault = callPackage ../tools/security/vault { }; vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; @@ -33839,11 +33935,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 { }; @@ -33943,7 +34039,7 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -33963,8 +34059,6 @@ with pkgs; wraith = callPackage ../applications/networking/irc/wraith { }; - wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; - wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -34035,7 +34129,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; }; @@ -34058,11 +34152,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; }; @@ -34085,34 +34179,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 { }; + 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; }; @@ -34383,9 +34477,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo117Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34403,7 +34495,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; @@ -34413,6 +34505,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 { }; @@ -34431,7 +34525,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 {}; @@ -34474,7 +34568,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; |