diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 131 |
1 files changed, 77 insertions, 54 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c7690bf3efa..67ad4717dbfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -624,7 +624,7 @@ in airfield = callPackage ../tools/networking/airfield { }; - apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; + apache-airflow = with python37.pkgs; toPythonApplication apache-airflow; airsonic = callPackage ../servers/misc/airsonic { }; @@ -777,7 +777,7 @@ in iamy = callPackage ../tools/admin/iamy { }; - azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; + azure-cli = callPackage ../tools/admin/azure-cli { python = python37; }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; @@ -1133,9 +1133,7 @@ in atftp = callPackage ../tools/networking/atftp { }; - autogen = callPackage ../development/tools/misc/autogen { - guile = guile_2_0; - }; + autogen = callPackage ../development/tools/misc/autogen { }; autojump = callPackage ../tools/misc/autojump { }; @@ -1970,7 +1968,7 @@ in interlock = callPackage ../servers/interlock {}; - jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -2174,6 +2172,8 @@ in rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -3527,7 +3527,7 @@ in fontforge-gtk = fontforge.override { withSpiro = true; withGTK = true; - gtk2 = gtk2-x11; + gtk3 = gtk3-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -4684,6 +4684,8 @@ in kippo = callPackage ../servers/kippo { }; + kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; ma1sd = callPackage ../servers/ma1sd { }; @@ -5232,7 +5234,9 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { }; + mitmproxy = callPackage ../tools/networking/mitmproxy { + python3Packages = python37Packages; + }; mjpegtools = callPackage ../tools/video/mjpegtools { }; @@ -5867,8 +5871,6 @@ in patchage = callPackage ../applications/audio/patchage { }; - patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { }; - pcapfix = callPackage ../tools/networking/pcapfix { }; pbzip2 = callPackage ../tools/compression/pbzip2 { }; @@ -6399,7 +6401,9 @@ in rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; - rpm = callPackage ../tools/package-management/rpm { }; + rpm = callPackage ../tools/package-management/rpm { + python = python3; + }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; @@ -6836,7 +6840,7 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { }; + ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -7914,7 +7918,11 @@ in zssh = callPackage ../tools/networking/zssh { }; - zstd = callPackage ../tools/compression/zstd { }; + zstd = callPackage ../tools/compression/zstd { + cmake = cmake.override { + libarchive = libarchive.override { zstd = null; }; + }; + }; zsync = callPackage ../tools/compression/zsync { }; @@ -9656,7 +9664,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python37; + python3 = python38; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; @@ -10139,6 +10147,8 @@ in buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; bpftool = callPackage ../os-specific/linux/bpftool { }; @@ -10151,10 +10161,6 @@ in cask = callPackage ../development/tools/cask { }; - casperjs = callPackage ../development/tools/casperjs { - inherit (texFunctions) fontsConf; - }; - cbrowser = callPackage ../development/tools/misc/cbrowser { }; ccache = callPackage ../development/tools/misc/ccache { }; @@ -10270,12 +10276,6 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; - cquery = callPackage ../development/tools/misc/cquery { - # 7 is the default, but only on Linux, so keep this for now - llvmPackages = llvmPackages_7; - }; - - ccls = callPackage ../development/tools/misc/ccls { llvmPackages = llvmPackages_8; stdenv = llvmPackages_8.stdenv; @@ -10379,7 +10379,7 @@ in dolt = callPackage ../servers/sql/dolt { }; - dot2tex = pythonPackages.dot2tex; + dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; @@ -10615,6 +10615,10 @@ in jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; + julius = callPackage ../games/julius { }; + + augustus = callPackage ../games/augustus { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; @@ -11140,7 +11144,9 @@ in vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { }; + vulnix = callPackage ../tools/security/vulnix { + python3Packages = python37Packages; + }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -11712,11 +11718,11 @@ in # Aliases ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; - ffmpeg = ffmpeg_3; + # Please make sure this is updated to the latest version on the next major + # update to ffmpeg + ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - ffmpeg = ffmpeg_4; - # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; @@ -12073,7 +12079,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg_4; }; + callPackage = newScope { libav = pkgs.ffmpeg; }; inherit (darwin.apple_sdk.frameworks) CoreServices; }); @@ -13074,8 +13080,6 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; - liblcf = callPackage ../development/libraries/liblcf { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { }; @@ -13809,7 +13813,7 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -14209,6 +14213,8 @@ in flatbuffers = callPackage ../development/libraries/flatbuffers { }; + nanopb = callPackage ../development/libraries/nanopb { }; + gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; @@ -14349,6 +14355,8 @@ in libktorrent = callPackage ../development/libraries/libktorrent { }; + liblastfm = callPackage ../development/libraries/liblastfm { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; @@ -14361,9 +14369,7 @@ in kpmcore = callPackage ../development/libraries/kpmcore { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_4; - }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; @@ -15141,6 +15147,9 @@ in wxGTK = wxGTK28; + wxGTK30 = wxGTK30-gtk2; + wxGTK31 = wxGTK31-gtk2; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; }; @@ -15151,18 +15160,32 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { + wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 { + 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 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; + wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { + withGtk2 = false; + inherit (darwin.stubs) setfile; + 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; inherit (darwin.stubs) setfile rez derez; @@ -15655,6 +15678,7 @@ in dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; + dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { }; dspam = callPackage ../servers/mail/dspam { }; @@ -15745,7 +15769,9 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { }; + home-assistant = callPackage ../servers/home-assistant { + python3 = python37; + }; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; @@ -16253,8 +16279,9 @@ in libtool = darwin.cctools; }; + # Fails to compile with boost >= 1.72 rippled = callPackage ../servers/rippled { - boost = boost17x; + boost = boost171; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { @@ -18844,7 +18871,6 @@ in bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { - ffmpeg = ffmpeg_4; glew = glew110; }; @@ -19113,7 +19139,7 @@ in ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; + cubicsdr = callPackage ../applications/radio/cubicsdr { }; cum = callPackage ../applications/misc/cum { }; @@ -20058,6 +20084,8 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; + hamster = callPackage ../applications/misc/hamster { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; @@ -20196,6 +20224,7 @@ in swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; @@ -21036,6 +21065,7 @@ in mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -21353,7 +21383,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -22181,9 +22211,7 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { - ffmpeg = ffmpeg_2; - }; + spek = callPackage ../applications/audio/spek { }; spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; @@ -23636,7 +23664,6 @@ in inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; - ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -23836,8 +23863,8 @@ in katagoWithCuda = katago.override { cudaSupport = true; - cudnn = cudnn_cudatoolkit_10_1; - cudatoolkit = cudatoolkit_10_1; + cudnn = cudnn_cudatoolkit_10_2; + cudatoolkit = cudatoolkit_10_2; }; klavaro = callPackage ../games/klavaro {}; @@ -25414,8 +25441,6 @@ in cernlib = callPackage ../development/libraries/physics/cernlib { }; - g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { @@ -26345,9 +26370,7 @@ in vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { - ffmpeg = ffmpeg_4; - }; + vbam = callPackage ../misc/emulators/vbam { }; vice = callPackage ../misc/emulators/vice { giflib = giflib_4_1; |