diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26a5e269629a..a2d8893f2060 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 { }; @@ -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; }; @@ -5232,7 +5232,9 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { }; + mitmproxy = callPackage ../tools/networking/mitmproxy { + python3Packages = python37Packages; + }; mjpegtools = callPackage ../tools/video/mjpegtools { }; @@ -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; @@ -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 { }; @@ -10375,7 +10385,7 @@ in dolt = callPackage ../servers/sql/dolt { }; - dot2tex = pythonPackages.dot2tex; + dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; @@ -11136,7 +11146,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 { }; @@ -13072,8 +13084,6 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; - liblcf = callPackage ../development/libraries/liblcf { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { }; @@ -14347,6 +14357,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 { }; @@ -15743,7 +15755,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 { }; @@ -16251,8 +16265,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 { @@ -20194,6 +20209,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 { }; @@ -25410,8 +25426,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 { |