diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 91 |
1 files changed, 56 insertions, 35 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..311a9d48e68c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1968,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 { }; @@ -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 { }; @@ -5869,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 { }; @@ -6401,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; @@ -6838,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 { }; @@ -10274,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; @@ -10619,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 { }; @@ -11723,8 +11723,6 @@ in 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; @@ -12081,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; }); @@ -13082,8 +13080,6 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { }; - liblcf = callPackage ../development/libraries/liblcf { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { }; @@ -13817,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 { }; @@ -14217,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; @@ -14357,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 { }; @@ -14369,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 { }; @@ -15149,6 +15147,9 @@ in wxGTK = wxGTK28; + wxGTK30 = wxGTK30-gtk2; + wxGTK31 = wxGTK31-gtk2; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; }; @@ -15159,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; @@ -15525,6 +15540,8 @@ in kerberos = libkrb5; }; + adguardhome = callPackage ../servers/adguardhome {}; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; @@ -15663,6 +15680,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 { }; @@ -15753,7 +15771,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { + home-assistant = callPackage ../servers/home-assistant { python3 = python37; }; @@ -18855,7 +18873,6 @@ in bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { - ffmpeg = ffmpeg_4; glew = glew110; }; @@ -19124,7 +19141,7 @@ in ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; + cubicsdr = callPackage ../applications/radio/cubicsdr { }; cum = callPackage ../applications/misc/cum { }; @@ -20069,6 +20086,8 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; + hamster = callPackage ../applications/misc/hamster { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; @@ -20217,6 +20236,8 @@ in pulseSupport = config.pulseaudio or false; }; + hikari = callPackage ../applications/window-managers/hikari { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -20847,6 +20868,10 @@ in meld = callPackage ../applications/version-management/meld { }; + meli = callPackage ../applications/networking/mailreaders/meli { }; + + melonDS = callPackage ../misc/emulators/melonDS { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { @@ -21046,6 +21071,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 { }; @@ -21363,7 +21389,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 { }; @@ -22191,9 +22217,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; @@ -23646,7 +23670,6 @@ in inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; - ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -23846,8 +23869,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 {}; @@ -26353,9 +26376,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; |