aboutsummaryrefslogtreecommitdiff
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix16
-rw-r--r--pkgs/top-level/all-packages.nix1005
-rw-r--r--pkgs/top-level/coq-packages.nix2
-rw-r--r--pkgs/top-level/darwin-packages.nix8
-rw-r--r--pkgs/top-level/dhall-packages.nix18
-rw-r--r--pkgs/top-level/haskell-packages.nix2
-rw-r--r--pkgs/top-level/ocaml-packages.nix42
-rw-r--r--pkgs/top-level/perl-packages.nix343
-rw-r--r--pkgs/top-level/php-packages.nix16
-rw-r--r--pkgs/top-level/python-packages.nix216
-rw-r--r--pkgs/top-level/release-lib.nix4
-rw-r--r--pkgs/top-level/release-small.nix4
-rw-r--r--pkgs/top-level/release.nix7
-rw-r--r--pkgs/top-level/stage.nix3
-rw-r--r--pkgs/top-level/static.nix5
-rw-r--r--pkgs/top-level/unix-tools.nix32
16 files changed, 1290 insertions, 433 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8228f457012..8009208739a6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -41,6 +41,7 @@ mapAliases ({
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
alienfx = throw "alienfx has been removed."; # added 2019-12-08
+ aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
ammonite-repl = ammonite; # added 2017-05-02
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
@@ -92,6 +93,7 @@ mapAliases ({
coprthr = throw "coprthr has been removed."; # added 2019-12-08
corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16
+ cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30
cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02
@@ -187,6 +189,10 @@ mapAliases ({
gnuradio-limesdr = gr-limesdr; # added 2019-05-27
gnuradio-rds = gr-rds; # added 2019-05-27
gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27
+ # added 20-10-2020
+ gnuradio-with-packages = gnuradio3_7.override {
+ extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ];
+ };
gnustep-make = gnustep.make; # added 2016-7-6
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
@@ -307,7 +313,7 @@ mapAliases ({
mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
mess = mame; # added 2019-10-30
mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23
- mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
+ mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
@@ -363,6 +369,7 @@ mapAliases ({
openjpeg_2_1 = openjpeg_2; # added 2018-10-25
opensans-ttf = open-sans; # added 2018-12-04
openssh_with_kerberos = openssh; # added 2018-01-28
+ onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
osquery = throw "osquery has been removed."; # added 2019-11-24
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
owncloudclient = owncloud-client; # added 2016-08
@@ -470,10 +477,13 @@ mapAliases ({
phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
+ pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
+ qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
quake3game = ioquake3; # added 2016-01-14
qvim = throw "qvim has been removed."; # added 2020-08-31
qwt6 = libsForQt5.qwt; # added 2015-12-19
+ qtcurve = libsForQt5.qtcurve; # added 2020-11-07
qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
@@ -486,6 +496,7 @@ mapAliases ({
rssglx = rss-glx; #added 2015-03-25
rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
+ retroshare06 = retroshare;
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
@@ -501,6 +512,7 @@ mapAliases ({
ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby";
rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead";
rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
+ rubyMinimal = throw "rubyMinimal was removed due to being unused";
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
@@ -638,11 +650,13 @@ mapAliases ({
unicorn-emu = unicorn; # added 2020-10-29
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
+ utillinux = util-linux; # added 2020-11-24
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38";
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
+ vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
vimbWrapper = vimb; # added 2015-01
vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f881a85ccac..184632f49246 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -94,6 +94,8 @@ in
genericUpdater = callPackage ../common-updater/generic-updater.nix { };
+ unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { };
+
nix-update-script = callPackage ../common-updater/nix-update.nix { };
### Push NixOS tests inside the fixed point
@@ -192,6 +194,8 @@ in
comedilib = callPackage ../development/libraries/comedilib { };
+ cp437 = callPackage ../tools/misc/cp437 { };
+
cpu-x = callPackage ../applications/misc/cpu-x { };
dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
@@ -206,7 +210,7 @@ in
hobbes = callPackage ../development/tools/hobbes { };
- html5validator = python36Packages.callPackage ../applications/misc/html5validator { };
+ html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
proto-contrib = callPackage ../development/tools/proto-contrib {};
@@ -226,6 +230,8 @@ in
device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
+ devour = callPackage ../tools/X11/devour {};
+
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
@@ -234,10 +240,12 @@ in
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { };
+ gretl = callPackage ../applications/science/math/gretl { };
+
grsync = callPackage ../applications/misc/grsync { };
dockerTools = callPackage ../build-support/docker {
- writePython3 = writers.writePython3;
+ writePython3 = buildPackages.writers.writePython3;
};
snapTools = callPackage ../build-support/snap { };
@@ -357,6 +365,8 @@ in
fetchhg = callPackage ../build-support/fetchhg { };
+ fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {};
+
# `fetchurl' downloads a file from the network.
fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform
then buildPackages.fetchurl # No need to do special overrides twice,
@@ -455,6 +465,8 @@ in
madonctl = callPackage ../applications/misc/madonctl { };
+ copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh;
+
makeDesktopItem = callPackage ../build-support/make-desktopitem { };
makeAutostartItem = callPackage ../build-support/make-startupitem { };
@@ -477,6 +489,9 @@ in
ociTools = callPackage ../build-support/oci-tools { };
+ octant = callPackage ../applications/networking/cluster/octant { };
+ starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { };
+
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }
@@ -531,6 +546,8 @@ in
wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { };
+ wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; };
+
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh;
@@ -599,6 +616,8 @@ in
adlplug = callPackage ../applications/audio/adlplug { };
+ arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
+
tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; };
opnplug = callPackage ../applications/audio/adlplug {
@@ -686,6 +705,8 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
};
+ archi = callPackage ../tools/misc/archi { };
+
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
eterm = callPackage ../applications/terminal-emulators/eterm { };
@@ -838,6 +859,8 @@ in
archivemount = callPackage ../tools/filesystems/archivemount { };
+ archivy = python3Packages.callPackage ../applications/misc/archivy { };
+
arandr = callPackage ../tools/X11/arandr { };
inherit (callPackages ../servers/nosql/arangodb {
@@ -927,13 +950,13 @@ in
aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
- aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; };
+ aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
aws-vault = callPackage ../tools/admin/aws-vault { };
iamy = callPackage ../tools/admin/iamy { };
- azure-cli = callPackage ../tools/admin/azure-cli { python = python37; };
+ azure-cli = callPackage ../tools/admin/azure-cli { };
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
@@ -953,6 +976,10 @@ in
charm = callPackage ../applications/misc/charm { };
+ chars = callPackage ../tools/text/chars {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -1050,6 +1077,8 @@ in
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
+ fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
+
fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { };
ccextractor = callPackage ../applications/video/ccextractor { };
@@ -1064,6 +1093,8 @@ in
cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { };
+ coconut = with python3Packages; toPythonApplication coconut;
+
cod = callPackage ../tools/misc/cod { };
codespell = with python3Packages; toPythonApplication codespell;
@@ -1147,6 +1178,8 @@ in
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
+ flood = nodePackages.flood;
+
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genpass = callPackage ../tools/security/genpass {
@@ -1157,8 +1190,6 @@ in
gaia = callPackage ../development/libraries/gaia { };
- gama = callPackage ../applications/science/geometry/gama { };
-
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
gammy = qt5.callPackage ../tools/misc/gammy { };
@@ -1243,6 +1274,11 @@ in
pass = callPackage ../tools/security/pass { };
+ pass-nodmenu = callPackage ../tools/security/pass {
+ dmenuSupport = false;
+ pass = pass-nodmenu;
+ };
+
pass-wayland = callPackage ../tools/security/pass {
waylandSupport = true;
pass = pass-wayland;
@@ -1473,7 +1509,7 @@ in
bindfs = callPackage ../tools/filesystems/bindfs { };
- birdtray = libsForQt514.callPackage ../applications/misc/birdtray { };
+ birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
bitbucket-cli = python2Packages.bitbucket-cli;
@@ -1583,6 +1619,8 @@ in
bsod = callPackage ../misc/emulators/bsod { };
+ simh = callPackage ../misc/emulators/simh { };
+
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btrbk = callPackage ../tools/backup/btrbk {
@@ -2003,6 +2041,8 @@ in
dyncall = callPackage ../development/libraries/dyncall { };
+ dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
+
earlyoom = callPackage ../os-specific/linux/earlyoom { };
EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };
@@ -2145,6 +2185,8 @@ in
gdrive = callPackage ../applications/networking/gdrive { };
+ go-chromecast = callPackage ../applications/video/go-chromecast { };
+
go-rice = callPackage ../tools/misc/go.rice {};
go-2fa = callPackage ../tools/security/2fa {};
@@ -2224,9 +2266,7 @@ in
gringo = callPackage ../tools/misc/gringo { };
- grobi = callPackage ../tools/X11/grobi {
- buildGoModule = buildGo114Module;
- };
+ grobi = callPackage ../tools/X11/grobi { };
gscan2pdf = callPackage ../applications/graphics/gscan2pdf { };
@@ -2336,6 +2376,8 @@ in
mapproxy = callPackage ../applications/misc/mapproxy { };
+ marl = callPackage ../development/libraries/marl {};
+
marlin-calc = callPackage ../tools/misc/marlin-calc {};
masscan = callPackage ../tools/security/masscan {
@@ -2440,8 +2482,6 @@ in
oneshot = callPackage ../tools/networking/oneshot { };
- onnxruntime = callPackage ../development/libraries/onnxruntime { };
-
xkbd = callPackage ../applications/misc/xkbd { };
libpsm2 = callPackage ../os-specific/linux/libpsm2 { };
@@ -2460,6 +2500,8 @@ in
patool = with python3Packages; toPythonApplication patool;
+ pbgopy = callPackage ../tools/text/pbgopy { };
+
pbpst = callPackage ../applications/misc/pbpst { };
pbzx = callPackage ../tools/compression/pbzx { };
@@ -2470,6 +2512,8 @@ in
pev = callPackage ../development/tools/analysis/pev { };
+ phd2 = callPackage ../applications/science/astronomy/phd2 { };
+
phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { };
photon = callPackage ../tools/networking/photon { };
@@ -2482,7 +2526,7 @@ in
psstop = callPackage ../tools/system/psstop { };
- precice = callPackage ../development/libraries/precice { python3 = python37; };
+ precice = callPackage ../development/libraries/precice { };
pueue = callPackage ../applications/misc/pueue { };
@@ -2526,6 +2570,8 @@ in
socklog = callPackage ../tools/system/socklog { };
+ ssmsh = callPackage ../tools/admin/ssmsh { };
+
stagit = callPackage ../development/tools/stagit { };
starboard = callPackage ../applications/networking/cluster/starboard { };
@@ -2626,7 +2672,7 @@ in
mstflint = callPackage ../tools/misc/mstflint { };
mcelog = callPackage ../os-specific/linux/mcelog {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
};
sqlint = callPackage ../development/tools/sqlint { };
@@ -2748,6 +2794,8 @@ in
inherit (pythonPackages) gyp;
};
+ bumpver = callPackage ../applications/version-management/bumpver { };
+
bup = callPackage ../tools/backup/bup { };
burp = callPackage ../tools/backup/burp { };
@@ -2860,7 +2908,7 @@ in
clementineUnfree = clementine.unfree;
- mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { };
+ mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
ciopfs = callPackage ../tools/filesystems/ciopfs { };
@@ -2991,14 +3039,17 @@ in
libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
+ libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { };
+
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
- python = python2;
- inherit (python2Packages) gyp;
+ stdenv = clangStdenv;
protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
};
+ rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };
+
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese {
@@ -3355,7 +3406,9 @@ in
dog = callPackage ../tools/system/dog { };
- dogdns = callPackage ../tools/networking/dogdns { };
+ dogdns = callPackage ../tools/networking/dogdns {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
dosfstools = callPackage ../tools/filesystems/dosfstools { };
@@ -3398,7 +3451,7 @@ in
dropbear = callPackage ../tools/networking/dropbear { };
- dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { };
+ dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
dtach = callPackage ../tools/misc/dtach { };
@@ -3492,8 +3545,10 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ pax = callPackage ../tools/archivers/pax { };
+
rage = callPackage ../tools/security/rage {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) Foundation Security;
};
rar2fs = callPackage ../tools/filesystems/rar2fs { };
@@ -3504,7 +3559,7 @@ in
sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
- strawberry = libsForQt514.callPackage ../applications/audio/strawberry { };
+ strawberry = libsForQt5.callPackage ../applications/audio/strawberry { };
tealdeer = callPackage ../tools/misc/tealdeer {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -3556,6 +3611,8 @@ in
wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
+ wlsunset = callPackage ../tools/wayland/wlsunset { };
+
wob = callPackage ../tools/misc/wob { };
wtype = callPackage ../tools/wayland/wtype { };
@@ -3564,6 +3621,8 @@ in
wshowkeys = callPackage ../tools/wayland/wshowkeys { };
+ wsl-open = callPackage ../tools/misc/wsl-open { };
+
xkcdpass = with pythonPackages; toPythonApplication xkcdpass;
xob = callPackage ../tools/X11/xob { };
@@ -3608,21 +3667,21 @@ in
elk7Version = "7.5.1";
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
enableUnfree = false;
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
enableUnfree = false;
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch = elasticsearch6;
@@ -3667,6 +3726,8 @@ in
entr = callPackage ../tools/misc/entr { };
+ envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };
+
eot_utilities = callPackage ../tools/misc/eot-utilities { };
eplot = callPackage ../tools/graphics/eplot { };
@@ -3707,6 +3768,8 @@ in
exif = callPackage ../tools/graphics/exif { };
+ exifprobe = callPackage ../tools/graphics/exifprobe { };
+
exiftags = callPackage ../tools/graphics/exiftags { };
exiftool = perlPackages.ImageExifTool;
@@ -3792,6 +3855,8 @@ in
feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
+ fend = callPackage ../tools/misc/fend { };
+
ferm = callPackage ../tools/networking/ferm { };
ffsend = callPackage ../tools/misc/ffsend { };
@@ -4028,7 +4093,7 @@ in
galen = callPackage ../development/tools/galen {};
- gallery-dl = callPackage ../applications/misc/gallery-dl { };
+ gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
gandi-cli = callPackage ../tools/networking/gandi-cli { };
@@ -4122,16 +4187,27 @@ in
gitkraken = callPackage ../applications/version-management/gitkraken { };
- gitlab = callPackage ../applications/version-management/gitlab { };
- gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
+ gitlab = callPackage ../applications/version-management/gitlab {
+ ruby = ruby_2_7;
+ };
+ gitlab-ee = callPackage ../applications/version-management/gitlab {
+ ruby = ruby_2_7;
+ gitlabEnterprise = true;
+ };
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
- gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
+ gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell {
+ ruby = ruby_2_7;
+ };
+
+ gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
- gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
+ gitaly = callPackage ../applications/version-management/gitlab/gitaly {
+ ruby = ruby_2_7;
+ };
gitstats = callPackage ../applications/version-management/gitstats { };
@@ -4272,6 +4348,8 @@ in
gopro = callPackage ../tools/video/gopro { };
+ goreleaser = callPackage ../tools/misc/goreleaser { };
+
goreplay = callPackage ../tools/networking/goreplay { };
gource = callPackage ../applications/version-management/gource { };
@@ -4328,6 +4406,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ ucg = callPackage ../tools/text/ucg { };
+
grive2 = callPackage ../tools/filesystems/grive2 { };
groff = callPackage ../tools/text/groff {
@@ -4565,7 +4645,7 @@ in
hecate = callPackage ../applications/editors/hecate { };
- heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {};
+ heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};
heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
@@ -4683,7 +4763,9 @@ in
ifuse = callPackage ../tools/filesystems/ifuse { };
ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
- idevicerestore = callPackage ../tools/misc/idevicerestore { };
+ idevicerestore = callPackage ../tools/misc/idevicerestore {
+ inherit (darwin) IOKit;
+ };
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv;
@@ -4694,6 +4776,8 @@ in
irods
irods-icommands;
+ igmpproxy = callPackage ../tools/networking/igmpproxy { };
+
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ghcWithPackages;
@@ -5000,25 +5084,25 @@ in
krakenx = callPackage ../tools/system/krakenx { };
- partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { };
+ partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { };
kpcli = callPackage ../tools/security/kpcli { };
- krename = libsForQt514.callPackage ../applications/misc/krename { };
+ krename = libsForQt5.callPackage ../applications/misc/krename { };
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
- kronometer = libsForQt514.callPackage ../tools/misc/kronometer { };
+ kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
krop = callPackage ../applications/graphics/krop { };
- kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { };
+ kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
kube-router = callPackage ../applications/networking/cluster/kube-router { };
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
- peruse = libsForQt514.callPackage ../tools/misc/peruse { };
+ peruse = libsForQt5.callPackage ../tools/misc/peruse { };
ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { };
@@ -5110,6 +5194,8 @@ in
ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
+ lunar-client = callPackage ../games/lunar-client {};
+
lvmsync = callPackage ../tools/backup/lvmsync { };
kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
@@ -5181,6 +5267,8 @@ in
mmv = callPackage ../tools/misc/mmv { };
+ mmv-go = callPackage ../tools/misc/mmv-go { };
+
most = callPackage ../tools/misc/most { };
motion = callPackage ../applications/video/motion { };
@@ -5199,6 +5287,8 @@ in
nbench = callPackage ../tools/misc/nbench { };
+ ncrack = callPackage ../tools/security/ncrack { };
+
netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
@@ -5220,9 +5310,9 @@ in
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
- nodejs = hiPrio nodejs-12_x;
+ nodejs = hiPrio nodejs-14_x;
- nodejs-slim = nodejs-slim-12_x;
+ nodejs-slim = nodejs-slim-14_x;
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { };
@@ -5293,6 +5383,8 @@ in
libck = callPackage ../development/libraries/libck { };
+ libcork = callPackage ../development/libraries/libcork { };
+
libconfig = callPackage ../development/libraries/libconfig { };
libcmis = callPackage ../development/libraries/libcmis { };
@@ -5319,6 +5411,9 @@ in
libhandy = callPackage ../development/libraries/libhandy { };
+ # Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
+ libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
+
libgumath = callPackage ../development/libraries/libgumath { };
libinsane = callPackage ../development/libraries/libinsane { };
@@ -5373,6 +5468,8 @@ in
libngspice = callPackage ../development/libraries/libngspice { };
+ libnixxml = callPackage ../development/libraries/libnixxml { };
+
libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
libportal = callPackage ../development/libraries/libportal { };
@@ -5503,7 +5600,6 @@ in
mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
mailutils = callPackage ../tools/networking/mailutils {
- guile = guile_2_0; # compilation fails with guile 2.2
sasl = gsasl;
};
@@ -5668,6 +5764,8 @@ in
mmake = callPackage ../tools/misc/mmake { };
+ mmixware = callPackage ../development/tools/mmixware { };
+
modemmanager = callPackage ../tools/networking/modem-manager {};
modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {};
@@ -6170,7 +6268,9 @@ in
opentsdb = callPackage ../tools/misc/opentsdb {};
- openvpn = callPackage ../tools/networking/openvpn {};
+ inherit (callPackages ../tools/networking/openvpn {})
+ openvpn_24
+ openvpn;
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@@ -6188,6 +6288,8 @@ in
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
+ update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit;
+
update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };
@@ -6268,7 +6370,7 @@ in
paperless = callPackage ../applications/office/paperless { };
- paperwork = callPackage ../applications/office/paperwork { };
+ paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
papertrail = callPackage ../tools/text/papertrail { };
@@ -6413,6 +6515,8 @@ in
phodav = callPackage ../tools/networking/phodav { };
+ pim6sd = callPackage ../servers/pim6sd { };
+
pinentry = libsForQt5.callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
};
@@ -6464,7 +6568,7 @@ in
tab = callPackage ../tools/text/tab { };
- tautulli = callPackage ../servers/tautulli { python = python2; };
+ tautulli = python3Packages.callPackage ../servers/tautulli { };
ploticus = callPackage ../tools/graphics/ploticus {
libpng = libpng12;
@@ -6658,7 +6762,7 @@ in
qarte = libsForQt5.callPackage ../applications/video/qarte { };
- qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { };
+ qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
qnial = callPackage ../development/interpreters/qnial { };
@@ -6706,6 +6810,8 @@ in
quota = if stdenv.isLinux then linuxquota else unixtools.quota;
+ qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
+
qview = libsForQt5.callPackage ../applications/graphics/qview {};
wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };
@@ -6902,7 +7008,9 @@ in
rshijack = callPackage ../tools/networking/rshijack { };
- rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { };
+ rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };
+
+ rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { };
rss2email = callPackage ../applications/networking/feedreaders/rss2email {
pythonPackages = python3Packages;
@@ -6916,6 +7024,8 @@ in
rubocop = callPackage ../development/tools/rubocop { };
+ ruffle = callPackage ../misc/emulators/ruffle { };
+
runelite = callPackage ../games/runelite { };
runningx = callPackage ../tools/X11/runningx { };
@@ -7072,6 +7182,8 @@ in
sewer = callPackage ../tools/admin/sewer { };
+ sftpman = callPackage ../tools/filesystems/sftpman { };
+
screenfetch = callPackage ../tools/misc/screenfetch { };
sg3_utils = callPackage ../tools/system/sg3_utils { };
@@ -7126,7 +7238,7 @@ in
sigal = callPackage ../applications/misc/sigal { };
- sigil = libsForQt514.callPackage ../applications/editors/sigil { };
+ sigil = libsForQt5.callPackage ../applications/editors/sigil { };
signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
@@ -7206,7 +7318,9 @@ in
sn0int = callPackage ../tools/security/sn0int { };
- snabb = callPackage ../tools/networking/snabb { } ;
+ snabb = callPackage ../tools/networking/snabb { };
+
+ snallygaster = callPackage ../tools/security/snallygaster { };
snapcast = callPackage ../applications/audio/snapcast { };
@@ -7416,6 +7530,8 @@ in
swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
+ swapview = callPackage ../os-specific/linux/swapview/default.nix { };
+
swec = callPackage ../tools/networking/swec { };
svnfs = callPackage ../tools/filesystems/svnfs { };
@@ -7486,7 +7602,9 @@ in
tcpkali = callPackage ../applications/networking/tcpkali { };
- tcpreplay = callPackage ../tools/networking/tcpreplay { };
+ tcpreplay = callPackage ../tools/networking/tcpreplay {
+ inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
+ };
tdns-cli = callPackage ../tools/networking/tdns-cli { };
@@ -7558,6 +7676,8 @@ in
timetable = callPackage ../applications/office/timetable { };
+ timekeeper = callPackage ../applications/office/timekeeper { };
+
timezonemap = callPackage ../development/libraries/timezonemap { };
tzupdate = callPackage ../applications/misc/tzupdate { };
@@ -7578,6 +7698,8 @@ in
tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {};
+ tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
+
tinyprog = callPackage ../development/tools/misc/tinyprog { };
tinyproxy = callPackage ../tools/networking/tinyproxy {};
@@ -7740,6 +7862,8 @@ in
twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
+ twtxt = callPackage ../applications/networking/twtxt { };
+
txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; };
txt2man = callPackage ../tools/misc/txt2man { };
@@ -7824,6 +7948,8 @@ in
usync = callPackage ../applications/misc/usync { };
+ uwc = callPackage ../tools/text/uwc { };
+
uwsgi = callPackage ../servers/uwsgi { };
v2ray = callPackage ../tools/networking/v2ray { };
@@ -7862,6 +7988,8 @@ in
verilog = callPackage ../applications/science/electronics/verilog {};
+ versus = callPackage ../applications/networking/versus { };
+
vgrep = callPackage ../tools/text/vgrep { };
vhd2vl = callPackage ../applications/science/electronics/vhd2vl { };
@@ -8563,11 +8691,49 @@ in
### DEVELOPMENT / COMPILERS
+ _4th = callPackage ../development/compilers/4th { };
+
abcl = callPackage ../development/compilers/abcl {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
+ adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix;
+ adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
+
+ adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {}
+ else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-hotspot {};
+ adoptopenjdk-jre-hotspot-bin-15 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-15-packages-linux.jre-hotspot {}
+ else callPackage adoptopenjdk-bin-15-packages-darwin.jre-hotspot {};
+
+ adoptopenjdk-openj9-bin-15 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-15-packages-linux.jdk-openj9 {}
+ else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-openj9 {};
+
+ adoptopenjdk-jre-openj9-bin-15 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {}
+ else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {};
+
+ adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix;
+ adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix;
+
+ adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {}
+ else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-hotspot {};
+ adoptopenjdk-jre-hotspot-bin-14 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-14-packages-linux.jre-hotspot {}
+ else callPackage adoptopenjdk-bin-14-packages-darwin.jre-hotspot {};
+
+ adoptopenjdk-openj9-bin-14 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-14-packages-linux.jdk-openj9 {}
+ else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-openj9 {};
+
+ adoptopenjdk-jre-openj9-bin-14 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {}
+ else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {};
+
adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix;
adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix;
@@ -8635,6 +8801,8 @@ in
arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
+ asciigraph = callPackage ../tools/text/asciigraph { };
+
asn1c = callPackage ../development/compilers/asn1c { };
aspectj = callPackage ../development/compilers/aspectj { };
@@ -8653,7 +8821,9 @@ in
binaryen = callPackage ../development/compilers/binaryen { };
- bluespec = callPackage ../development/compilers/bluespec { };
+ bluespec = callPackage ../development/compilers/bluespec {
+ gmp-static = gmp.override { withStatic = true; };
+ };
ciao = callPackage ../development/compilers/ciao { };
@@ -8672,6 +8842,8 @@ in
chicken
egg2nix;
+ cc65 = callPackage ../development/compilers/cc65 { };
+
ccl = callPackage ../development/compilers/ccl {
inherit (buildPackages.darwin) bootstrap_cmds;
};
@@ -8760,12 +8932,13 @@ in
copper = callPackage ../development/compilers/copper {};
inherit (callPackages ../development/compilers/crystal {
- inherit (llvmPackages_10) stdenv clang llvm;
+ llvmPackages = llvmPackages_10;
})
crystal_0_31
crystal_0_32
crystal_0_33
crystal_0_34
+ crystal_0_35
crystal
crystal2nix;
@@ -8801,6 +8974,8 @@ in
};
fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
+ fasmg = callPackage ../development/compilers/fasmg { };
+
flyctl = callPackage ../development/web/flyctl { };
flutterPackages =
@@ -8908,7 +9083,7 @@ in
inherit noSysDirs;
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
- isl = if !stdenv.isDarwin then isl_0_17 else null;
+ isl = if !stdenv.isDarwin then isl_0_20 else null;
# just for stage static
crossStageStatic = true;
@@ -9001,7 +9176,7 @@ in
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
- isl = if !stdenv.isDarwin then isl_0_17 else null;
+ isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 {
@@ -9015,7 +9190,7 @@ in
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
- isl = if !stdenv.isDarwin then isl_0_17 else null;
+ isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
gcc_latest = gcc10;
@@ -9187,7 +9362,7 @@ in
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
- haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc884;
+ haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102;
inherit (haskellPackages) ghc;
@@ -9439,18 +9614,7 @@ in
graalvm8-ee
graalvm11-ee;
- openshot-qt = let
- # Cannot use a newer Qt (5.15) version because it requires qtwebkit
- # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
- pkgs_ = pkgs.extend(_: prev: {
- pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
- pkgs = oldAttrs.pkgs.extend(_: _: {
- qt5 = pkgs.qt514;
- libsForQt5 = pkgs.libsForQt514;
- });
- });
- });
- in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { };
+ openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
openspin = callPackage ../development/compilers/openspin { };
@@ -9489,6 +9653,7 @@ in
julia_10 = callPackage ../development/compilers/julia/1.0.nix {
gmp = gmp6;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+ libgit2 = libgit2_0_27;
};
julia_13 = callPackage ../development/compilers/julia/1.3.nix {
@@ -9496,11 +9661,19 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
};
+ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
+ inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+ };
+
julia_1 = julia_10;
- julia = julia_1;
+ julia = julia_15;
jwasm = callPackage ../development/compilers/jwasm { };
+ knightos-genkfs = callPackage ../development/tools/knightos/genkfs {
+ asciidoc = asciidoc-full;
+ };
+
knightos-kcc = callPackage ../development/tools/knightos/kcc { };
knightos-kimg = callPackage ../development/tools/knightos/kimg {
@@ -9622,7 +9795,7 @@ in
stdenv = gcc7Stdenv;
});
- llvmPackages_latest = llvmPackages_10;
+ llvmPackages_latest = llvmPackages_11;
llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };
@@ -9696,14 +9869,17 @@ in
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
+ muon = callPackage ../development/compilers/muon { };
+
nim = callPackage ../development/compilers/nim { };
nim-unwrapped = nim.unwrapped;
+ nimble-unwrapped = nim.nimble-unwrapped;
nrpl = callPackage ../development/tools/nrpl { };
neko = callPackage ../development/compilers/neko { };
- nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr {
+ nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
@@ -9820,15 +9996,15 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
};
- rust_1_47 = callPackage ../development/compilers/rust/1_47.nix {
+ rust_1_48 = callPackage ../development/compilers/rust/1_48.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11;
};
- rust = rust_1_47;
+ rust = rust_1_48;
rustPackages_1_45 = rust_1_45.packages.stable;
- rustPackages_1_47 = rust_1_47.packages.stable;
- rustPackages = rustPackages_1_47;
+ rustPackages_1_48 = rust_1_48.packages.stable;
+ rustPackages = rustPackages_1_48;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -9926,6 +10102,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ crate2nix = callPackage ../development/tools/rust/crate2nix { };
+
maturin = callPackage ../development/tools/rust/maturin { };
inherit (rustPackages) rls;
rustfmt = rustPackages.rustfmt;
@@ -10146,6 +10324,8 @@ in
ceptre = callPackage ../development/interpreters/ceptre { };
+ cling = callPackage ../development/interpreters/cling { };
+
clips = callPackage ../development/interpreters/clips { };
clisp = callPackage ../development/interpreters/clisp { };
@@ -10159,14 +10339,16 @@ in
dhall = haskell.lib.justStaticExecutables haskellPackages.dhall;
- dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix;
-
dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash;
- dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json;
+ dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs;
dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server;
+ dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json;
+
+ dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix;
+
dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
dhallPackages = callPackages ./dhall-packages.nix { };
@@ -10341,6 +10523,12 @@ in
phpExtensions = php74Extensions;
phpPackages = php74Packages;
+ php80 = callPackage ../development/interpreters/php/8.0.nix {
+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+ };
+ php80Extensions = recurseIntoAttrs php80.extensions;
+ php80Packages = recurseIntoAttrs php80.packages;
+
# Import PHP74 interpreter, extensions and packages
php74 = callPackage ../development/interpreters/php/7.4.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
@@ -10424,20 +10612,15 @@ in
python2Packages = python2.pkgs;
python3Packages = python3.pkgs;
- pythonInterpreters = callPackage ./../development/interpreters/python {
- # Overrides that apply to all Python interpreters and their packages
- # Generally, this should be avoided.
- pkgs = pkgs.extend (final: _: {
- });
- };
+ pythonInterpreters = callPackage ./../development/interpreters/python { };
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36;
# Python package sets.
- python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
+ python27Packages = python27.pkgs;
python36Packages = python36.pkgs;
python37Packages = recurseIntoAttrs python37.pkgs;
python38Packages = recurseIntoAttrs python38.pkgs;
- python39Packages = python39.pkgs;
+ python39Packages = recurseIntoAttrs python39.pkgs;
python310Packages = python310.pkgs;
pypyPackages = pypy.pkgs;
pypy2Packages = pypy2.pkgs;
@@ -10531,6 +10714,8 @@ in
solargraph = callPackage ../development/ruby-modules/solargraph { };
+ rbenv = callPackage ../development/ruby-modules/rbenv { };
+
inherit (callPackage ../development/interpreters/ruby {
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
@@ -10540,19 +10725,6 @@ in
ruby_2_6
ruby_2_7;
- rubyMinimal = ruby.override {
- # gem support is minimal overhead
- rubygemsSupport = true;
- useRailsExpress = false;
- zlibSupport = false;
- opensslSupport = false;
- gdbmSupport = false;
- cursesSupport = false;
- docSupport = false;
- yamlSupport = false;
- fiddleSupport = false;
- };
-
ruby = ruby_2_6;
rubyPackages = rubyPackages_2_6;
@@ -10585,7 +10757,7 @@ in
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };
- supercollider = libsForQt514.callPackage ../development/interpreters/supercollider {
+ supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec;
};
@@ -10672,6 +10844,8 @@ in
vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {};
resim = callPackage ../misc/emulators/resim {};
+ or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {};
+
rappel = callPackage ../development/misc/rappel/default.nix { };
pharo-vms = callPackage ../development/pharo/vm { };
@@ -10767,7 +10941,7 @@ in
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
inherit (callPackages ../development/tools/electron { })
- electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10;
+ electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11;
autobuild = callPackage ../development/tools/misc/autobuild { };
@@ -10889,6 +11063,8 @@ in
};
});
+ bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };
+
black = with python3Packages; toPythonApplication black;
blackfire = callPackage ../development/tools/misc/blackfire { };
@@ -10933,7 +11109,9 @@ in
cc-tool = callPackage ../development/tools/misc/cc-tool { };
- ccache = callPackage ../development/tools/misc/ccache { };
+ ccache = callPackage ../development/tools/misc/ccache {
+ asciidoc = asciidoc-full;
+ };
# Wrapper that works as gcc or g++
# It can be used by setting in nixpkgs config like this, for example:
@@ -10955,12 +11133,25 @@ in
# };
# You can use a different directory, but whichever directory you choose
# should be owned by user root, group nixbld with permissions 0770.
- ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
- cc.override { cc = ccache.links {
+ ccacheWrapper = makeOverridable ({ extraConfig, cc }:
+ cc.override {
+ cc = ccache.links {
+ inherit extraConfig;
+ unwrappedCC = cc.cc;
+ };
+ }) {
+ extraConfig = "";
+ inherit (stdenv) cc;
+ };
+
+ ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }:
+ overrideCC stdenv (buildPackages.ccacheWrapper.override {
inherit extraConfig;
- unwrappedCC = cc.cc;
- }; }) {};
- ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
+ inherit (stdenv) cc;
+ })) {
+ extraConfig = "";
+ inherit stdenv;
+ });
cccc = callPackage ../development/tools/analysis/cccc { };
@@ -11173,11 +11364,11 @@ in
dot2tex = with python3.pkgs; toPythonApplication dot2tex;
doxygen = callPackage ../development/tools/documentation/doxygen {
- qt4 = null;
+ qt5 = null;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
+ doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
drake = callPackage ../development/tools/build-managers/drake { };
@@ -11507,7 +11698,7 @@ in
lttv = callPackage ../development/tools/misc/lttv { };
- massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { };
+ massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven {
@@ -11700,7 +11891,7 @@ in
lua = lua5;
} // (config.radare or {}))) radare2 r2-for-cutter;
- radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { };
+ radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { };
ragel = ragelStable;
@@ -11791,7 +11982,10 @@ in
shallot = callPackage ../tools/misc/shallot { };
- shards = callPackage ../development/tools/build-managers/shards { };
+ inherit (callPackage ../development/tools/build-managers/shards { })
+ shards_0_11
+ shards_0_12
+ shards;
shellcheck = callPackage ../development/tools/shellcheck {};
@@ -11935,7 +12129,9 @@ in
travis = callPackage ../development/tools/misc/travis { };
- tree-sitter = callPackage ../development/tools/parsing/tree-sitter { };
+ tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
trellis = callPackage ../development/tools/trellis { };
@@ -11961,6 +12157,8 @@ in
vagrant = callPackage ../development/tools/vagrant {};
+ vala-language-server = callPackage ../development/tools/vala-language-server {};
+
bashdb = callPackage ../development/tools/misc/bashdb { };
gdb = callPackage ../development/tools/misc/gdb {
@@ -12042,6 +12240,8 @@ in
yq-go = callPackage ../development/tools/yq-go { };
+ ytt = callPackage ../development/tools/ytt {};
+
winpdb = callPackage ../development/tools/winpdb { };
grabserial = callPackage ../development/tools/grabserial { };
@@ -12450,9 +12650,9 @@ in
dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
- makeDBusConf = { suidHelper, serviceDirectories }:
+ makeDBusConf = { suidHelper, serviceDirectories, apparmor }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
- inherit suidHelper serviceDirectories;
+ inherit suidHelper serviceDirectories apparmor;
};
dee = callPackage ../development/libraries/dee { };
@@ -12590,18 +12790,12 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# 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;
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
- openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
- rav1e = null;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
- x265 = if stdenv.isDarwin then null else x265;
- xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;
@@ -12640,7 +12834,9 @@ in
flyway = callPackage ../development/tools/flyway { };
- fmt = callPackage ../development/libraries/fmt/default.nix { };
+ inherit (callPackages ../development/libraries/fmt { }) fmt_7;
+
+ fmt = fmt_7;
fplll = callPackage ../development/libraries/fplll {};
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
@@ -12847,6 +13043,7 @@ in
else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross
else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib
+ else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib
else if name == "newlib" then targetPackages.newlibCross or newlibCross
else if name == "musl" then targetPackages.muslCross or muslCross
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
@@ -12973,7 +13170,7 @@ in
gnutls = callPackage ../development/libraries/gnutls/default.nix {
inherit (darwin.apple_sdk.frameworks) Security;
- utillinux = utillinuxMinimal; # break the cyclic dependency
+ util-linux = util-linuxMinimal; # break the cyclic dependency
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
@@ -12988,6 +13185,8 @@ in
pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {};
+ pgweb = callPackage ../development/tools/database/pgweb { };
+
gpgstats = callPackage ../tools/security/gpgstats { };
gpshell = callPackage ../development/tools/misc/gpshell { };
@@ -13175,7 +13374,10 @@ in
herqq = libsForQt514.callPackage ../development/libraries/herqq { };
- hidapi = callPackage ../development/libraries/hidapi { };
+ hidapi = callPackage ../development/libraries/hidapi {
+ # TODO: remove once `udev` is `systemdMinimal` everywhere.
+ udev = systemdMinimal;
+ };
highfive = callPackage ../development/libraries/highfive { };
@@ -13377,6 +13579,8 @@ in
jsonnet = callPackage ../development/compilers/jsonnet { };
+ jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
+
go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
@@ -13427,6 +13631,8 @@ in
lasso = callPackage ../development/libraries/lasso { };
+ LAStools = callPackage ../development/libraries/LAStools { };
+
LASzip = callPackage ../development/libraries/LASzip { };
LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
@@ -13649,6 +13855,8 @@ in
libdap = callPackage ../development/libraries/libdap { };
+ libdatrie = callPackage ../development/libraries/libdatrie { };
+
libdazzle = callPackage ../development/libraries/libdazzle { };
libdbi = callPackage ../development/libraries/libdbi { };
@@ -13750,7 +13958,9 @@ in
libfakekey = callPackage ../development/libraries/libfakekey { };
- libfido2 = callPackage ../development/libraries/libfido2 { };
+ libfido2 = callPackage ../development/libraries/libfido2 {
+ udev = systemdMinimal;
+ };
libfilezilla = callPackage ../development/libraries/libfilezilla {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@@ -13866,6 +14076,8 @@ in
libfixposix = callPackage ../development/libraries/libfixposix {};
+ libff = callPackage ../development/libraries/libff { };
+
libffcall = callPackage ../development/libraries/libffcall { };
libffi = callPackage ../development/libraries/libffi { };
@@ -14106,7 +14318,18 @@ in
libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg
- libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
+ libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin {
+ # cmake 3.19.1 has a bug. So far only noticed with this package.
+ # https://github.com/NixOS/nixpkgs/issues/105854
+ cmake = cmake.overrideAttrs(oldAttrs: {
+ patches = oldAttrs.patches ++ [
+ (fetchpatch {
+ url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch";
+ sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU=";
+ })
+ ];
+ });
+ });
libjpeg = libjpeg_turbo;
libjreen = callPackage ../development/libraries/libjreen { };
@@ -14147,7 +14370,9 @@ in
libmemcached = callPackage ../development/libraries/libmemcached { };
- libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
+ libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
+ libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
+ libmicrohttpd = libmicrohttpd_0_9_71;
libmikmod = callPackage ../development/libraries/libmikmod {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
@@ -14193,6 +14418,8 @@ in
libndctl = callPackage ../development/libraries/libndctl { };
+ libnest2d = callPackage ../development/libraries/libnest2d { };
+
libnet = callPackage ../development/libraries/libnet { };
libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { };
@@ -14365,6 +14592,8 @@ in
libtcod = callPackage ../development/libraries/libtcod { };
+ libthai = callPackage ../development/libraries/libthai { };
+
libtheora = callPackage ../development/libraries/libtheora { };
libthreadar = callPackage ../development/libraries/libthreadar { };
@@ -14439,6 +14668,8 @@ in
libusb1 = callPackage ../development/libraries/libusb1 {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
+ # TODO: remove once `udev` is `systemdMinimal` everywhere.
+ udev = systemdMinimal;
};
libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
@@ -14825,8 +15056,6 @@ in
non = callPackage ../applications/audio/non { };
- noise-suppression-for-voice = callPackage ../development/libraries/noise-suppression-for-voice { };
-
ntl = callPackage ../development/libraries/ntl { };
nspr = callPackage ../development/libraries/nspr {
@@ -14837,6 +15066,9 @@ in
nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
nssTools = nss.tools;
+ # required for stable thunderbird and firefox-esr-78
+ nss_3_53 = lowPrio (callPackage ../development/libraries/nss/3.53.nix { });
+
nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
nsss = skawarePackages.nsss;
@@ -15108,8 +15340,9 @@ in
python = python37;
};
- protobuf = protobuf3_13;
+ protobuf = protobuf3_14;
+ protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
@@ -15275,7 +15508,7 @@ in
kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit
kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration
kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
- plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+ plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
systemsettings user-manager xdg-desktop-portal-kde
;
@@ -15317,8 +15550,14 @@ in
grantlee = callPackage ../development/libraries/grantlee/5 { };
+ qtcurve = callPackage ../data/themes/qtcurve {};
+
+ herqq = callPackage ../development/libraries/herqq { };
+
kdb = callPackage ../development/libraries/kdb { };
+ kde2-decoration = callPackage ../data/themes/kde2 { };
+
kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
@@ -15347,7 +15586,9 @@ in
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
- libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
+ libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix {
+ inherit (darwin.apple_sdk.frameworks) AGL Cocoa Foundation;
+ };
libqglviewer = callPackage ../development/libraries/libqglviewer {
inherit (darwin.apple_sdk.frameworks) AGL;
@@ -15381,6 +15622,8 @@ in
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
+ qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
+
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp;
};
@@ -15435,6 +15678,8 @@ in
quicksynergy = callPackage ../applications/misc/quicksynergy { };
+ qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {};
+
qwt = callPackage ../development/libraries/qwt {};
qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix {
@@ -15509,7 +15754,13 @@ in
qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
- qradiolink = callPackage ../applications/radio/qradiolink { };
+ qradiolink = callPackage ../applications/radio/qradiolink {
+ # 3.8 support is not ready yet:
+ # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573
+ # The non minimal build is used because the 'qtgui' component is needed.
+ # gr-osmosdr is using the same gnuradio as of now.
+ gnuradio = gnuradio3_7-unwrapped;
+ };
qrupdate = callPackage ../development/libraries/qrupdate { };
@@ -15688,6 +15939,8 @@ in
snappy = callPackage ../development/libraries/snappy { };
+ snow = callPackage ../tools/security/snow { };
+
soapyairspy = callPackage ../applications/radio/soapyairspy { };
soapybladerf = callPackage ../applications/radio/soapybladerf { };
@@ -15733,6 +15986,7 @@ in
soundtouch = callPackage ../development/libraries/soundtouch {};
spandsp = callPackage ../development/libraries/spandsp {};
+ spandsp3 = callPackage ../development/libraries/spandsp/3.nix {};
spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {};
@@ -15764,6 +16018,8 @@ in
spice-up = callPackage ../applications/office/spice-up { };
+ spicetify-cli = callPackage ../applications/misc/spicetify-cli { };
+
spirv-cross = callPackage ../tools/graphics/spirv-cross { };
sratom = callPackage ../development/libraries/audio/sratom { };
@@ -15884,9 +16140,7 @@ in
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
- talloc = callPackage ../development/libraries/talloc {
- python = buildPackages.python3;
- };
+ talloc = callPackage ../development/libraries/talloc { };
tclap = callPackage ../development/libraries/tclap {};
@@ -16095,9 +16349,11 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
+ vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
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 { };
vtkWithQt5 = vtk.override { qtLib = qt514; };
@@ -16637,8 +16893,8 @@ in
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
- # clickhouse doesn't build on llvm8.
- inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm;
+ # upstream requires llvm10 as of v20.11.4.13
+ inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm;
};
couchdb = callPackage ../servers/http/couchdb {
@@ -16762,7 +17018,7 @@ in
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
- gerbera = callPackage ../servers/gerbera { };
+ gerbera = callPackage ../servers/gerbera {};
gobetween = callPackage ../servers/gobetween { };
@@ -16838,6 +17094,8 @@ in
labelImg = callPackage ../applications/science/machine-learning/labelimg { };
+ mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
+
mailman = callPackage ../servers/mail/mailman/wrapped.nix { };
mailman-rss = callPackage ../development/python-modules/mailman-rss { };
@@ -16958,8 +17216,10 @@ in
openbgpd = callPackage ../servers/openbgpd { };
- openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
+ openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; };
+ # Current stable release; don't backport release updates!
+ openafs = openafs_1_8;
openresty = callPackage ../servers/http/openresty {
withPerl = false;
@@ -17003,6 +17263,12 @@ in
# PulseAudio daemons
+ hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { };
+
+ pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix {
+ inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
+ };
+
pulseaudio = callPackage ../servers/pulseaudio {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
@@ -17043,6 +17309,8 @@ in
tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
+ pg_featureserv = callPackage ../servers/pg_featureserv { };
+
pg_tileserv = callPackage ../servers/pg_tileserv { };
pies = callPackage ../servers/pies { };
@@ -17109,6 +17377,7 @@ in
};
influxdb = callPackage ../servers/nosql/influxdb { };
+ influxdb2 = callPackage ../servers/nosql/influxdb2 { };
mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
inherit (darwin) cctools developer_cmds;
@@ -17147,7 +17416,7 @@ in
checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
- pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { };
+ check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
neo4j = callPackage ../servers/nosql/neo4j { };
@@ -17216,10 +17485,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = callPackage ../servers/monitoring/prometheus {
- buildGoPackage = buildGo114Package;
- go = go_1_14;
- };
+ prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
@@ -17454,8 +17720,6 @@ in
shaarli = callPackage ../servers/web-apps/shaarli { };
- shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
-
shiori = callPackage ../servers/web-apps/shiori { };
inherit (callPackages ../servers/web-apps/matomo {})
@@ -17492,6 +17756,8 @@ in
webmetro = callPackage ../servers/webmetro { };
+ wsdd = callPackage ../servers/wsdd { };
+
webhook = callPackage ../servers/http/webhook { };
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";
@@ -17741,7 +18007,7 @@ in
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
libuuid = if stdenv.isLinux
- then utillinuxMinimal
+ then util-linuxMinimal
else null;
light = callPackage ../os-specific/linux/light { };
@@ -17774,7 +18040,7 @@ in
};
fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
});
fuse = lowPrio fusePackages.fuse_2;
fuse3 = fusePackages.fuse_3;
@@ -17935,18 +18201,11 @@ in
linux_mptcp = linux_mptcp_95;
- linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
- kernelPatches =
- [ kernelPatches.bridge_stp_helper
- kernelPatches.request_key_helper
- kernelPatches.cpu-cgroup-v2."4.11"
- kernelPatches.modinst_arg_list_too_long
- ]
- ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
+ linux_mptcp_5_9 = linux_5_9.override {
+ structuredExtraConfig = with lib.kernel; {
+ MPTCP = yes;
+ MPTCP_IPV6 = yes;
+ };
};
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {
@@ -18115,6 +18374,10 @@ in
acpi_call = callPackage ../os-specific/linux/acpi-call {};
+ akvcam = callPackage ../os-specific/linux/akvcam {
+ inherit (qt5) qmake;
+ };
+
amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
anbox = callPackage ../os-specific/linux/anbox/kmod.nix { };
@@ -18152,6 +18415,8 @@ in
fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
+ gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
+
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null;
@@ -18213,8 +18478,10 @@ in
rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
- openafs = callPackage ../servers/openafs/1.6/module.nix { };
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
+ openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
+ # Current stable release; don't backport release updates!
+ openafs = openafs_1_8;
facetimehd = callPackage ../os-specific/linux/facetimehd { };
@@ -18361,7 +18628,7 @@ in
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
- linux_latest_for_hardened = pkgs.linux_5_8;
+ linux_latest_for_hardened = pkgs.linux_5_9;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
@@ -18435,9 +18702,7 @@ in
keyutils = callPackage ../os-specific/linux/keyutils { };
- libselinux = callPackage ../os-specific/linux/libselinux {
- python = python37;
- };
+ libselinux = callPackage ../os-specific/linux/libselinux { };
libsemanage = callPackage ../os-specific/linux/libsemanage {
python = python3;
@@ -18732,8 +18997,6 @@ in
# Building with `xen` instead of `xen-slim` is possible, but makes no sense.
qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; });
qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; });
- qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; });
- qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; });
qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; });
qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; });
@@ -18821,6 +19084,8 @@ in
sysprof = callPackage ../development/tools/profiling/sysprof { };
+ libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { };
+
sysklogd = callPackage ../os-specific/linux/sysklogd { };
syslinux = callPackage ../os-specific/linux/syslinux { };
@@ -18829,7 +19094,7 @@ in
systemd = callPackage ../os-specific/linux/systemd {
# break some cyclic dependencies
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
# provide a super minimal gnupg used for systemd-machined
gnupg = callPackage ../tools/security/gnupg/22.nix {
enableMinimal = true;
@@ -18848,17 +19113,34 @@ in
};
systemdMinimal = systemd.override {
pname = "systemd-minimal";
- withResolved = false;
- withLogind = false;
+ withAnalyze = false;
+ withApparmor = false;
+ withCompression = false;
+ withCoredump = false;
+ withCryptsetup = false;
+ withDocumentation = false;
+ withEfi = false;
withHostnamed = false;
- withLocaled = false;
- withTimedated = false;
withHwdb = false;
- withEfi = false;
withImportd = false;
- withCryptsetup = false;
- cryptsetup = null;
+ withLocaled = false;
+ withLogind = false;
+ withMachined = false;
+ withNetworkd = false;
+ withNss = false;
+ withPCRE2 = false;
+ withPolkit = false;
+ withRemote = false;
+ withResolved = false;
+ withShellCompletions = false;
+ withTimedated = false;
+ withTimesyncd = false;
+ withUserDb = false;
+ glib = null;
+ libgcrypt = null;
lvm2 = null;
+ libfido2 = null;
+ p11-kit = null;
};
@@ -18917,6 +19199,7 @@ in
ubootRaspberryPi3_64bit
ubootRaspberryPiZero
ubootRock64
+ ubootRockPi4
ubootRockPro64
ubootROCPCRK3399
ubootSheevaplug
@@ -18931,7 +19214,7 @@ in
stdenv = crossLibcStdenv;
};
- eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; };
+ eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; };
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
@@ -18941,6 +19224,8 @@ in
udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
+ ugtrain = callPackage ../tools/misc/ugtrain { };
+
untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower { };
@@ -18955,17 +19240,17 @@ in
usermount = callPackage ../os-specific/linux/usermount { };
- utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
- else unixtools.utillinux;
+ util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
+ else unixtools.util-linux;
- utillinuxCurses = utillinux;
+ util-linuxCurses = util-linux;
- utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override {
+ util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override {
minimal = true;
ncurses = null;
perl = null;
systemd = null;
- }) else utillinux;
+ }) else util-linux;
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
@@ -19344,8 +19629,6 @@ in
kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
- kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { };
-
kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
@@ -19493,6 +19776,8 @@ in
inherit (callPackages ../data/fonts/noto-fonts {})
noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra;
+ nuclear = callPackage ../applications/audio/nuclear { };
+
nullmailer = callPackage ../servers/mail/nullmailer {
stdenv = gccStdenv;
};
@@ -19598,8 +19883,6 @@ in
qogir-theme = callPackage ../data/themes/qogir { };
- qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {};
-
redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
route159 = callPackage ../data/fonts/route159 { };
@@ -19628,7 +19911,9 @@ in
shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
- scheherazade = callPackage ../data/fonts/scheherazade { };
+ scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; };
+
+ scheherazade-new = callPackage ../data/fonts/scheherazade { };
signwriting = callPackage ../data/fonts/signwriting { };
@@ -19927,7 +20212,7 @@ in
msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
- amarok = libsForQt514.callPackage ../applications/audio/amarok { };
+ amarok = libsForQt5.callPackage ../applications/audio/amarok { };
amarok-kf5 = amarok; # for compatibility
amfora = callPackage ../applications/networking/browsers/amfora { };
@@ -20025,17 +20310,7 @@ in
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
- cadence = let
- # Use Qt 5.14 consistently
- pkgs_ = pkgs.extend(_: prev: {
- pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
- pkgs = oldAttrs.pkgs.extend(_: _: {
- qt5 = pkgs.qt514;
- libsForQt5 = pkgs.libsForQt514;
- });
- });
- });
- in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { };
+ cadence = libsForQt5.callPackage ../applications/audio/cadence { };
cheesecutter = callPackage ../applications/audio/cheesecutter { };
@@ -20181,6 +20456,8 @@ in
blugon = callPackage ../applications/misc/blugon { };
+ bombadillo = callPackage ../applications/networking/browsers/bombadillo { };
+
bombono = callPackage ../applications/video/bombono {};
bomi = libsForQt5.callPackage ../applications/video/bomi {
@@ -20260,6 +20537,8 @@ in
castor = callPackage ../applications/networking/browsers/castor { };
+ catfs = callPackage ../os-specific/linux/catfs { };
+
catimg = callPackage ../tools/misc/catimg { };
catt = callPackage ../applications/video/catt { };
@@ -20330,7 +20609,7 @@ in
clightd = callPackage ../applications/misc/clight/clightd.nix { };
- clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { };
+ clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
clipcat = callPackage ../applications/misc/clipcat { };
@@ -20359,7 +20638,7 @@ in
cntr = callPackage ../applications/virtualization/cntr { };
- communi = libsForQt514.callPackage ../applications/networking/irc/communi { };
+ communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
confclerk = callPackage ../applications/misc/confclerk { };
@@ -20382,7 +20661,7 @@ in
pygments = python27Packages.pygments;
};
- csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt {
+ csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
python = python27;
};
@@ -20411,8 +20690,6 @@ in
python3Packages = python37Packages;
};
- cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
-
crun = callPackage ../applications/virtualization/crun {};
csdp = callPackage ../applications/science/math/csdp { };
@@ -20427,7 +20704,7 @@ in
curseradio = callPackage ../applications/audio/curseradio { };
- cutecom = libsForQt514.callPackage ../tools/misc/cutecom { };
+ cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
cvs = callPackage ../applications/version-management/cvs { };
@@ -20558,10 +20835,12 @@ in
buildServerGui = false;
};
- droopy = python37Packages.callPackage ../applications/networking/droopy { };
+ droopy = python3Packages.callPackage ../applications/networking/droopy { };
drumgizmo = callPackage ../applications/audio/drumgizmo { };
+ dsf2flac = callPackage ../applications/audio/dsf2flac { };
+
dunst = callPackage ../applications/misc/dunst { };
du-dust = callPackage ../tools/misc/dust { };
@@ -20763,6 +21042,10 @@ in
gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
+ greenfoot = callPackage ../applications/editors/greenfoot/default.nix {
+ jdk = jetbrains.jdk;
+ };
+
gspeech = callPackage ../applications/audio/gspeech { };
icesl = callPackage ../applications/misc/icesl { };
@@ -20865,7 +21148,7 @@ in
freewheeling = callPackage ../applications/audio/freewheeling { };
- fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { };
+ fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
fsv = callPackage ../applications/misc/fsv { };
@@ -20894,34 +21177,80 @@ in
gksu = callPackage ../applications/misc/gksu { };
- gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; };
+ gnss-sdr = callPackage ../applications/radio/gnss-sdr {
+ boost = boost166;
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gnuradio = callPackage ../applications/radio/gnuradio {
- inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
+ gnuradio-unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
- fftw = fftwFloat;
- qwt = qwt6_qt4;
+ python = python3;
};
-
- gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix {
- inherit (python2Packages) python;
- extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ]
- ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ];
+ # A build without gui components and other utilites not needed for end user
+ # libraries
+ gnuradioMinimal = gnuradio-unwrapped.override {
+ features = {
+ gnuradio-companion = false;
+ python-support = false;
+ gr-ctrlport = false;
+ examples = false;
+ gr-qtgui = false;
+ gr-utils = false;
+ gr-modtool = false;
+ sphinx = false;
+ doxygen = false;
+ };
+ };
+ gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
+ unwrapped = gnuradio-unwrapped;
+ };
+ gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix {
+ inherit (darwin.apple_sdk.frameworks) CoreAudio;
+ python = python2;
+ };
+ # A build without gui components and other utilites not needed if gnuradio is
+ # used as a c++ library.
+ gnuradio3_7Minimal = gnuradio3_7-unwrapped.override {
+ features = {
+ gnuradio-companion = false;
+ python-support = false;
+ gr-ctrlport = false;
+ gr-qtgui = false;
+ gr-utils = false;
+ sphinx = false;
+ doxygen = false;
+ gr-wxgui = false;
+ };
+ };
+ gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix {
+ unwrapped = gnuradio3_7-unwrapped;
};
grandorgue = callPackage ../applications/audio/grandorgue { };
- gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { };
+ gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { };
+ gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { };
+ gr-ais = callPackage ../applications/radio/gnuradio/ais.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { };
+ gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { };
+ gr-rds = callPackage ../applications/radio/gnuradio/rds.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { };
+ gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
goldendict = libsForQt514.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
@@ -20960,7 +21289,14 @@ in
gpx = callPackage ../applications/misc/gpx { };
- gqrx = libsForQt514.callPackage ../applications/radio/gqrx { };
+ gqrx = libsForQt514.callPackage ../applications/radio/gqrx {
+ gnuradio = gnuradio3_7Minimal;
+ # Use the same gnuradio for gr-osmosdr as well
+ gr-osmosdr = gr-osmosdr.override {
+ gnuradio = gnuradio3_7Minimal;
+ pythonSupport = false;
+ };
+ };
gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
@@ -21085,7 +21421,7 @@ in
redoflacs = callPackage ../applications/audio/redoflacs { };
- flameshot = libsForQt514.callPackage ../tools/misc/flameshot { };
+ flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {});
@@ -21132,7 +21468,6 @@ in
xrdp = callPackage ../applications/networking/remote/xrdp { };
freerdp = callPackage ../applications/networking/remote/freerdp {
- inherit libpulseaudio;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
};
@@ -21231,8 +21566,8 @@ in
m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
- manim = python37Packages.callPackage ../applications/video/manim {
- opencv = python37Packages.opencv3;
+ manim = python3Packages.callPackage ../applications/video/manim {
+ opencv = python3Packages.opencv3;
};
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
@@ -21444,6 +21779,8 @@ in
howl = callPackage ../applications/editors/howl { };
+ hdl-dump = callPackage ../tools/misc/hdl-dump { };
+
hpcg = callPackage ../tools/misc/hpcg/default.nix { };
hpl = callPackage ../tools/misc/hpl { mpi = openmpi; };
@@ -21528,6 +21865,8 @@ in
spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { };
+ spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { };
+
spotifyd = callPackage ../applications/audio/spotifyd {
withALSA = stdenv.isLinux;
withPulseAudio = config.pulseaudio or stdenv.isLinux;
@@ -21551,7 +21890,7 @@ in
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
- waybar = callPackage ../applications/misc/waybar { };
+ waybar = callPackage ../applications/misc/waybar {};
hikari = callPackage ../applications/window-managers/hikari { };
@@ -21561,6 +21900,8 @@ in
i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };
+ i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { };
+
i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };
@@ -21589,6 +21930,8 @@ in
inherit (xorg) xrdb;
};
+ multilockscreen = callPackage ../misc/screensavers/multilockscreen { };
+
i3minator = callPackage ../tools/misc/i3minator { };
i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { };
@@ -21611,6 +21954,8 @@ in
id3v2 = callPackage ../applications/audio/id3v2 { };
+ ideamaker = callPackage ../applications/misc/ideamaker { };
+
ifenslave = callPackage ../os-specific/linux/ifenslave { };
ii = callPackage ../applications/networking/irc/ii {
@@ -21620,6 +21965,7 @@ in
ike = callPackage ../applications/networking/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki {
+ python = python3;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
};
@@ -21695,6 +22041,10 @@ in
img2pdf = with python3Packages; toPythonApplication img2pdf;
+ imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix {
+ typescript = nodePackages.typescript;
+ };
+
imgcat = callPackage ../applications/graphics/imgcat { };
imgp = python3Packages.callPackage ../applications/graphics/imgp { };
@@ -21712,7 +22062,9 @@ in
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
- inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { };
+ inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum {
+ gnuradio = gnuradioMinimal;
+ };
ion3 = callPackage ../applications/window-managers/ion-3 {
lua = lua5_1;
@@ -21762,7 +22114,7 @@ in
jackmeter = callPackage ../applications/audio/jackmeter { };
- jackmix = callPackage ../applications/audio/jackmix { };
+ jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; };
jalv = callPackage ../applications/audio/jalv { };
@@ -21862,7 +22214,7 @@ in
keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };
- kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { };
+ kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
khal = callPackage ../applications/misc/khal { };
@@ -21885,7 +22237,8 @@ in
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
- kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
+ # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15
+ kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { };
kodestudio = callPackage ../applications/editors/kodestudio { };
@@ -21907,7 +22260,7 @@ in
ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
- ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { };
+ ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
@@ -21947,6 +22300,8 @@ in
kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { };
+ lambda-delta = callPackage ../misc/emulators/lambda-delta { };
+
lame = callPackage ../development/libraries/lame { };
larswm = callPackage ../applications/window-managers/larswm { };
@@ -22088,13 +22443,13 @@ in
loxodo = callPackage ../applications/misc/loxodo { };
- lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { };
+ lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { };
lrzsz = callPackage ../tools/misc/lrzsz { };
lsp-plugins = callPackage ../applications/audio/lsp-plugins { };
- luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { };
+ luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
@@ -22144,7 +22499,7 @@ in
mac = callPackage ../development/libraries/mac { };
- macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
+ macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
@@ -22195,6 +22550,8 @@ in
mblaze = callPackage ../applications/networking/mailreaders/mblaze { };
+ mcomix3 = callPackage ../applications/graphics/mcomix3 {};
+
mcpp = callPackage ../development/compilers/mcpp { };
mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
@@ -22215,6 +22572,7 @@ in
meme = callPackage ../applications/graphics/meme { };
+ # Needs qtwebkit which is broken on qt5.15
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
gconf = pkgs.gnome2.GConf;
};
@@ -22230,6 +22588,7 @@ in
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
+ # Needs qtwebkit which is broken on qt5.15
merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { };
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
@@ -22259,7 +22618,7 @@ in
minishift = callPackage ../applications/networking/cluster/minishift { };
- minitube = libsForQt514.callPackage ../applications/video/minitube { };
+ minitube = libsForQt5.callPackage ../applications/video/minitube { };
mimic = callPackage ../applications/audio/mimic { };
@@ -22388,6 +22747,9 @@ in
ympd = callPackage ../applications/audio/ympd { };
+ # a somewhat more maintained fork of ympd
+ mympd = callPackage ../applications/audio/mympd { };
+
nload = callPackage ../applications/networking/nload { };
normalize = callPackage ../applications/audio/normalize { };
@@ -22475,6 +22837,8 @@ in
pythonPackages = python3Packages;
};
+ n8n = callPackage ../applications/networking/n8n {};
+
neap = callPackage ../applications/misc/neap { };
neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
@@ -22516,11 +22880,10 @@ in
osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
- ostinato = callPackage ../applications/networking/ostinato {
- wireshark = wireshark.override { qt5 = qt514; };
- };
+ ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
p4 = callPackage ../applications/version-management/p4 { };
+ # Broken with Qt5.15 because qtwebkit is broken with it
p4v = libsForQt514.callPackage ../applications/version-management/p4v { };
partio = callPackage ../development/libraries/partio {};
@@ -22539,9 +22902,7 @@ in
pig = callPackage ../applications/networking/cluster/pig { };
- pijul = callPackage ../applications/version-management/pijul {
- inherit (llvmPackages) clang libclang;
- };
+ pijul = callPackage ../applications/version-management/pijul { };
ping = callPackage ../applications/networking/ping { };
@@ -22582,13 +22943,11 @@ in
qbec = callPackage ../applications/networking/cluster/qbec { };
- rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { };
+ rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
- shotcut = libsForQt514.callPackage ../applications/video/shotcut {
- libmlt = mlt;
- };
+ shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
shogun = callPackage ../applications/science/machine-learning/shogun {
stdenv = gcc8Stdenv;
@@ -22668,6 +23027,7 @@ in
pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
mupdf = callPackage ../applications/misc/mupdf { };
+ mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { };
mystem = callPackage ../applications/misc/mystem { };
@@ -22753,15 +23113,15 @@ in
inherit (gnome2) libglade;
};
- obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
-
- obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { };
+ obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
- obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
+ obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { };
+
+ obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
- obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
+ obs-ndi = libsForQt5.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
obsidian = callPackage ../applications/misc/obsidian { };
@@ -22885,6 +23245,8 @@ in
packet = callPackage ../development/tools/packet { };
+ packet-sd = callPackage ../development/tools/packet-sd { };
+
packet-cli = callPackage ../development/tools/packet-cli { };
pb_cli = callPackage ../tools/misc/pb_cli {};
@@ -22893,6 +23255,8 @@ in
pbrt = callPackage ../applications/graphics/pbrt { };
+ pcloud = callPackage ../applications/networking/pcloud { };
+
pcsxr = callPackage ../misc/emulators/pcsxr {
ffmpeg = ffmpeg_2;
};
@@ -22923,6 +23287,8 @@ in
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
+ peach = callPackage ../servers/peach { };
+
peaclock = callPackage ../applications/misc/peaclock {
stdenv = gccStdenv;
};
@@ -23075,7 +23441,7 @@ in
properties-cpp = callPackage ../development/libraries/properties-cpp { };
- protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { };
+ protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { };
protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
@@ -23083,9 +23449,9 @@ in
ps2client = callPackage ../applications/networking/ps2client { };
- psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { };
+ psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
- psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { };
+ psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
psol = callPackage ../development/libraries/psol { };
@@ -23132,19 +23498,8 @@ in
qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
- # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit
- # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
- qgis-unwrapped = let
- pkgs_ = pkgs.extend(_: prev: {
- pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
- pkgs = oldAttrs.pkgs.extend(_: _: {
- qt5 = pkgs.qt514;
- libsForQt5 = pkgs.libsForQt514;
- });
- });
- });
- in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix {
- withGrass = false;
+ qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
+ withGrass = false;
};
qgis = callPackage ../applications/gis/qgis { };
@@ -23159,12 +23514,14 @@ in
garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};
- qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { };
+ qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
boost = boost17x;
};
+ qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
+
qmetro = callPackage ../applications/misc/qmetro { };
qmidiarp = callPackage ../applications/audio/qmidiarp {};
@@ -23236,6 +23593,8 @@ in
quilter = callPackage ../applications/editors/quilter { };
+ quisk = python38Packages.callPackage ../applications/radio/quisk { };
+
quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {};
falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { };
@@ -23327,8 +23686,9 @@ in
remotebox = callPackage ../applications/virtualization/remotebox { };
- retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { };
- retroshare06 = retroshare;
+ # This package is currently broken with libupnp
+ # But when unbroken, it should work with the stable Qt5
+ retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
rgp = libsForQt5.callPackage ../development/tools/rgp { };
@@ -23584,7 +23944,7 @@ in
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
- skrooge = libsForQt514.callPackage ../applications/office/skrooge {};
+ skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
smartgithg = callPackage ../applications/version-management/smartgithg {
jre = openjdk11;
@@ -23600,11 +23960,11 @@ in
sipp = callPackage ../development/tools/misc/sipp { };
- skanlite = libsForQt514.callPackage ../applications/office/skanlite { };
+ skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
soci = callPackage ../development/libraries/soci { };
- sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { };
+ sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
@@ -23720,8 +24080,7 @@ in
symlinks = callPackage ../tools/system/symlinks { };
- # this can be changed to python3 once pyside2 is updated to support the latest python version
- syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { };
+ syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
inherit (callPackages ../applications/networking/syncthing { })
syncthing
@@ -23779,7 +24138,7 @@ in
teams = callPackage ../applications/networking/instant-messengers/teams { };
- teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+ teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
taskell = haskell.lib.justStaticExecutables haskellPackages.taskell;
@@ -23871,6 +24230,8 @@ in
ticpp = callPackage ../development/libraries/ticpp { };
+ tickrs = callPackage ../applications/misc/tickrs { };
+
tig = gitAndTools.tig;
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
@@ -24038,16 +24399,12 @@ in
vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
- vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable;
-
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
verbiste = callPackage ../applications/misc/verbiste {
inherit (gnome2) libgnomeui;
};
- vuescan = callPackage ../applications/graphics/vuescan { };
-
vim = callPackage ../applications/editors/vim {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
@@ -24120,7 +24477,7 @@ in
system-libvirt = libvirt;
};
- virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix {
+ virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
qtermwidget = lxqt.qtermwidget;
};
@@ -24201,7 +24558,7 @@ in
onlyLibVLC = true;
};
- vmpk = callPackage ../applications/audio/vmpk { };
+ vmpk = libsForQt5.callPackage ../applications/audio/vmpk { };
vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
@@ -24282,7 +24639,7 @@ in
wayvnc = callPackage ../applications/networking/remote/wayvnc { };
- webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { };
+ webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
@@ -24322,6 +24679,7 @@ in
windowlab = callPackage ../applications/window-managers/windowlab { };
windowmaker = callPackage ../applications/window-managers/windowmaker { };
+ dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { };
wily = callPackage ../applications/editors/wily { };
@@ -24331,16 +24689,8 @@ in
write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
- alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
-
wllvm = callPackage ../development/tools/wllvm { };
- wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { };
-
- wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { };
-
- wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { };
-
wmname = callPackage ../applications/misc/wmname { };
wmctrl = callPackage ../tools/X11/wmctrl { };
@@ -24611,9 +24961,6 @@ in
xen-slim = xenPackages.xen-slim;
xen-light = xenPackages.xen-light;
- xen_4_8 = xenPackages.xen_4_8-vanilla;
- xen_4_8-slim = xenPackages.xen_4_8-slim;
- xen_4_8-light = xenPackages.xen_4_8-light;
xen_4_10 = xenPackages.xen_4_10-vanilla;
xen_4_10-slim = xenPackages.xen_4_10-slim;
xen_4_10-light = xenPackages.xen_4_10-light;
@@ -24674,6 +25021,8 @@ in
xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
+ xlife = callPackage ../applications/graphics/xlife { };
+
xmobar = haskellPackages.xmobar;
xmonad-log = callPackage ../tools/misc/xmonad-log { };
@@ -24825,9 +25174,9 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { };
+ zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
- zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { };
+ zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { };
@@ -24891,7 +25240,6 @@ in
exodus = callPackage ../applications/blockchains/exodus { };
- freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
@@ -24937,6 +25285,8 @@ in
tessera = callPackage ../applications/blockchains/tessera.nix { };
+ turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { };
+
vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; };
vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; };
@@ -24962,6 +25312,8 @@ in
### GAMES
+ _1oom = callPackage ../games/1oom { };
+
_2048-in-terminal = callPackage ../games/2048-in-terminal { };
_20kly = callPackage ../games/20kly { };
@@ -25067,7 +25419,7 @@ in
chessx = libsForQt5.callPackage ../games/chessx { };
- chiaki = libsForQt514.callPackage ../games/chiaki { };
+ chiaki = libsForQt5.callPackage ../games/chiaki { };
chocolateDoom = callPackage ../games/chocolate-doom { };
@@ -25119,9 +25471,7 @@ in
dhewm3 = callPackage ../games/dhewm3 {};
- digikam = libsForQt514.callPackage ../applications/graphics/digikam {
- opencv3 = opencv3WithoutCuda;
- };
+ digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
displaycal = callPackage ../applications/graphics/displaycal {};
@@ -25511,7 +25861,7 @@ in
papermc = callPackage ../games/papermc { };
- pentobi = libsForQt514.callPackage ../games/pentobi { };
+ pentobi = libsForQt5.callPackage ../games/pentobi { };
performous = callPackage ../games/performous {
boost = boost166;
@@ -25596,11 +25946,11 @@ in
rrootage = callPackage ../games/rrootage { };
- saga = libsForQt514.callPackage ../applications/gis/saga {
+ saga = libsForQt5.callPackage ../applications/gis/saga {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; };
+ samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { };
sauerbraten = callPackage ../games/sauerbraten {};
@@ -25758,6 +26108,8 @@ in
tremulous = callPackage ../games/tremulous { };
+ tts = callPackage ../tools/audio/tts { };
+
tuxpaint = callPackage ../games/tuxpaint { };
tuxtype = callPackage ../games/tuxtype { };
@@ -25961,6 +26313,7 @@ in
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
+ easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { };
emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { };
freon = callPackage ../desktops/gnome-3/extensions/freon { };
gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
@@ -25987,6 +26340,8 @@ in
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
};
+ gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };
+
gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
hsetroot = callPackage ../tools/X11/hsetroot { };
@@ -26084,6 +26439,10 @@ in
### SCIENCE/GEOMETRY
+ antiprism = callPackage ../applications/science/geometry/antiprism { };
+
+ gama = callPackage ../applications/science/geometry/gama { };
+
drgeo = callPackage ../applications/science/geometry/drgeo {
inherit (gnome2) libglade;
guile = guile_1_8;
@@ -26100,7 +26459,9 @@ in
alliance = callPackage ../applications/science/electronics/alliance { };
- ants = callPackage ../applications/science/biology/ants { };
+ ants = callPackage ../applications/science/biology/ants {
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
aragorn = callPackage ../applications/science/biology/aragorn { };
@@ -26495,7 +26856,7 @@ in
xfitter = callPackage ../applications/science/physics/xfitter {};
- xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { };
+ xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
### SCIENCE/PROGRAMMING
@@ -26610,6 +26971,8 @@ in
else smlnj;
};
+ key = callPackage ../applications/science/logic/key { };
+
lean = callPackage ../applications/science/logic/lean {};
lean2 = callPackage ../applications/science/logic/lean2 {};
lean3 = lean;
@@ -26724,7 +27087,7 @@ in
adms = callPackage ../applications/science/electronics/adms { };
- appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { };
+ appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
# Since version 8 Eagle requires an Autodesk account and a subscription
# in contrast to single payment for the charged editions.
@@ -26733,7 +27096,7 @@ in
openssl = openssl_1_0_2;
};
- eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { };
+ eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
@@ -26776,8 +27139,6 @@ in
pcb = callPackage ../applications/science/electronics/pcb { };
- qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { };
-
qucs = callPackage ../applications/science/electronics/qucs { };
xcircuit = callPackage ../applications/science/electronics/xcircuit { };
@@ -26920,6 +27281,8 @@ in
netlogo = callPackage ../applications/science/misc/netlogo { };
+ nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
+
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
root = callPackage ../applications/science/misc/root {
@@ -27053,7 +27416,7 @@ in
cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {};
- calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {};
+ calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
ccemux = callPackage ../misc/emulators/ccemux { };
@@ -27509,6 +27872,8 @@ in
nixdoc = callPackage ../tools/nix/nixdoc {};
+ dnadd = callPackage ../tools/nix/dnadd { };
+
nix-doc = callPackage ../tools/package-management/nix-doc { };
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
@@ -27595,7 +27960,11 @@ in
disnix = callPackage ../tools/package-management/disnix { };
- dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {});
+ dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
+ inherit (pythonPackages) supervisor;
+ });
+
+ dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
disnixos = callPackage ../tools/package-management/disnix/disnixos { };
@@ -27852,7 +28221,9 @@ in
prow = callPackage ../applications/networking/cluster/prow { };
- tellico = libsForQt514.callPackage ../applications/misc/tellico { };
+ tagref = callPackage ../tools/misc/tagref { };
+
+ tellico = libsForQt5.callPackage ../applications/misc/tellico { };
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};
@@ -27861,6 +28232,7 @@ in
terraform_0_11-full
terraform_0_12
terraform_0_13
+ terraform_0_14
terraform_plugins_test
;
@@ -27903,7 +28275,7 @@ in
ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
- vnote = libsForQt514.callPackage ../applications/office/vnote { };
+ vnote = libsForQt5.callPackage ../applications/office/vnote { };
ssh-audit = callPackage ../tools/security/ssh-audit { };
@@ -27985,7 +28357,7 @@ in
vttest = callPackage ../tools/misc/vttest { };
- wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { };
+ wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
wasmer = callPackage ../development/interpreters/wasmer { };
@@ -28218,7 +28590,7 @@ in
inherit pkgs;
};
- golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {};
+ golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {};
linkchecker = callPackage ../tools/networking/linkchecker { };
@@ -28458,4 +28830,5 @@ in
psftools = callPackage ../os-specific/linux/psftools {};
+ lc3tools = callPackage ../development/tools/lc3tools {};
}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index fe6cd81f9ea1..605db554363b 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -119,7 +119,7 @@ in rec {
version = "8.11.2";
};
coq_8_12 = callPackage ../applications/science/logic/coq {
- version = "8.12.0";
+ version = "8.12.1";
};
coqPackages_8_5 = mkCoqPackages coq_8_5;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index affb4ae92c19..6fafe09438cd 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -14,7 +14,9 @@ in
extraBuildInputs = [];
};
- apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
+ apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
+ inherit (darwin) darwin-stubs print-reexports;
+ };
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools;
@@ -41,6 +43,10 @@ in
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
+ darwin-stubs = callPackage ../os-specific/darwin/darwin-stubs { };
+
+ print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { };
+
maloader = callPackage ../os-specific/darwin/maloader {
inherit (darwin) opencflite;
};
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
index 9d4801e9dc5c..c1c2c5f0e3bb 100644
--- a/pkgs/top-level/dhall-packages.nix
+++ b/pkgs/top-level/dhall-packages.nix
@@ -8,16 +8,6 @@ let
let
callPackage = newScope self;
- prefer = version: path:
- let
- packages = callPackage path { };
-
- in
- packages."${version}".overrideAttrs (_: {
- passthru = packages;
- }
- );
-
buildDhallPackage =
callPackage ../development/interpreters/dhall/build-dhall-package.nix { };
@@ -34,14 +24,16 @@ let
buildDhallDirectoryPackage
;
+ lib = import ../development/dhall-modules/lib.nix { inherit lib; };
+
dhall-kubernetes =
- prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix;
+ callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
dhall-packages =
- prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix;
+ callPackage ../development/dhall-modules/dhall-packages.nix { };
Prelude =
- prefer "13.0.0" ../development/dhall-modules/Prelude.nix;
+ callPackage ../development/dhall-modules/Prelude.nix { };
};
in
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e613b931d631..2d25ea149a92 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -96,7 +96,7 @@ in {
};
ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix {
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
- bootPkgs = if stdenv.isAarch64 then
+ bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
else
packages.ghc865Binary;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 757a77f0403a..6fe157d2ea2b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -70,6 +70,8 @@ let
bos = callPackage ../development/ocaml-modules/bos { };
+ ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
+
camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp4 =
@@ -491,7 +493,9 @@ let
lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
- lwt = callPackage ../development/ocaml-modules/lwt { };
+ lwt = callPackage ../development/ocaml-modules/lwt {
+ ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+ };
ocaml_lwt = lwt;
@@ -529,8 +533,12 @@ let
metrics = callPackage ../development/ocaml-modules/metrics { };
+ metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { };
+
metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
+ metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { };
+
metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
inherit (pkgs) gnuplot;
};
@@ -539,6 +547,8 @@ let
minisat = callPackage ../development/ocaml-modules/minisat { };
+ mirage = callPackage ../development/ocaml-modules/mirage { };
+
mirage-block = callPackage ../development/ocaml-modules/mirage-block { };
mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };
@@ -589,6 +599,10 @@ let
mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { };
+ mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { };
+
+ mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { };
+
mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { };
mlgmp = callPackage ../development/ocaml-modules/mlgmp { };
@@ -599,8 +613,6 @@ let
mparser = callPackage ../development/ocaml-modules/mparser { };
- mstruct = callPackage ../development/ocaml-modules/mstruct { };
-
mtime = callPackage ../development/ocaml-modules/mtime { };
mustache = callPackage ../development/ocaml-modules/mustache { };
@@ -656,11 +668,17 @@ let
ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { };
- ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { };
+ ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8;
+
+ ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { };
+
+ ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { };
ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
- ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };
+ ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic {
+ ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+ };
ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
@@ -722,6 +740,8 @@ let
octavius = callPackage ../development/ocaml-modules/octavius { };
+ odate = callPackage ../development/ocaml-modules/odate { };
+
odoc = callPackage ../development/ocaml-modules/odoc { };
omd = callPackage ../development/ocaml-modules/omd { };
@@ -806,7 +826,9 @@ let
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
- sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
+ sqlexpr = callPackage ../development/ocaml-modules/sqlexpr {
+ ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+ };
tsort = callPackage ../development/ocaml-modules/tsort { };
@@ -868,9 +890,7 @@ let
ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
- ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {
- ppxlib = ppxlib.override { legacy = true; };
- };
+ ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { };
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
@@ -928,6 +948,8 @@ let
rpclib = callPackage ../development/ocaml-modules/rpclib { };
+ rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { };
+
rresult = callPackage ../development/ocaml-modules/rresult { };
safepass = callPackage ../development/ocaml-modules/safepass { };
@@ -1251,6 +1273,8 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { });
+ ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { });
+
ocamlPackages_latest = ocamlPackages_4_11;
ocamlPackages = ocamlPackages_4_10;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 123f7484a79a..2c789d4f8bec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -332,6 +332,20 @@ let
};
};
+ AnyEventAIO = buildPerlPackage {
+ pname ="AnyEvent-AIO";
+ version = "1.1";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-1.1.tar.gz";
+ sha256 = "0svh0mlp17g0ypq8bgs3h3axg8v7h0z45hryacgn6q8mcj65n43b";
+ };
+ propagatedBuildInputs = [ AnyEvent IOAIO ];
+ meta = {
+ description = "Truly asynchronous file and directory I/O";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
AnyEventCacheDNS = buildPerlModule {
pname = "AnyEvent-CacheDNS";
version = "0.08";
@@ -511,10 +525,10 @@ let
buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ];
preCheck = "rm t/30cluster.t"; # do not run failing tests
postInstall = ''
- mkdir -p $out/etc/bash_completion.d
+ mkdir -p $out/share/bash-completion/completions
mv $out/bin/clusterssh_bash_completion.dist \
- $out/etc/bash_completion.d/clusterssh_bash_completion
- substituteInPlace $out/etc/bash_completion.d/clusterssh_bash_completion \
+ $out/share/bash-completion/completions/clusterssh_bash_completion
+ substituteInPlace $out/share/bash-completion/completions/clusterssh_bash_completion \
--replace '/bin/true' '${pkgs.coreutils}/bin/true' \
--replace 'grep' '${pkgs.gnugrep}/bin/grep' \
--replace 'sed' '${pkgs.gnused}/bin/sed'
@@ -582,6 +596,27 @@ let
};
};
+ Appcpm = buildPerlModule {
+ pname = "App-cpm";
+ version = "0.996";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz";
+ sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595";
+ };
+ buildInputs = [ ModuleBuildTiny ];
+ propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ];
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang $out/bin/cpm
+ '';
+ meta = {
+ homepage = "https://github.com/skaji/cpm";
+ description = "A fast CPAN module installer";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
Applify = buildPerlPackage {
pname = "Applify";
version = "0.21";
@@ -847,7 +882,7 @@ let
sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9";
};
meta = {
- homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master";
+ homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master";
description = "Object-oriented interface to FITS HDUs";
license = stdenv.lib.licenses.free;
};
@@ -1300,7 +1335,7 @@ let
buildInputs = [ FileSlurp ];
propagatedBuildInputs = [ ClassLoad DirSelf FileShareDir ModulePluggable MooseXGetopt namespaceclean ];
meta = {
- homepage = "http://metacpan.org/release/Bot-Training";
+ homepage = "https://metacpan.org/release/Bot-Training";
description = "Plain text training material for bots like Hailo and AI::MegaHAL";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -1316,7 +1351,7 @@ let
buildInputs = [ FileShareDirInstall ];
propagatedBuildInputs = [ BotTraining ];
meta = {
- homepage = "http://metacpan.org/release/Bot-Training-MegaHAL";
+ homepage = "https://metacpan.org/release/Bot-Training-MegaHAL";
description = "Provide megahal.trn via Bot::Training";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -1332,7 +1367,7 @@ let
buildInputs = [ FileShareDirInstall ];
propagatedBuildInputs = [ BotTraining ];
meta = {
- homepage = "http://metacpan.org/release/Bot-Training-StarCraft";
+ homepage = "https://metacpan.org/release/Bot-Training-StarCraft";
description = "Provide starcraft.trn via Bot::Training";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
@@ -1449,6 +1484,20 @@ let
};
};
+ BytesRandomSecureTiny = buildPerlPackage {
+ pname = "Bytes-Random-Secure-Tiny";
+ version = "1.011";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-Tiny-1.011.tar.gz";
+ sha256 = "03d967b5f82846909137d5ab9984ac570ac10a4401e0c602f3d2208c465ac982";
+ };
+ meta = {
+ description = "A tiny Perl extension to generate cryptographically-secure random bytes";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
CacheCache = buildPerlPackage {
pname = "Cache-Cache";
version = "1.08";
@@ -1563,6 +1612,20 @@ let
propagatedBuildInputs = [ Cairo Glib ];
};
+ CallContext = buildPerlPackage {
+ pname = "Call-Context";
+ version = "0.03";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FE/FELIPE/Call-Context-0.03.tar.gz";
+ sha256 = "0ee6bf46bc72755adb7a6b08e79d12e207de5f7809707b3c353b58cb2f0b5a26";
+ };
+ meta = {
+ description = "Sanity-check calling context";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
cam_pdf = buildPerlModule {
pname = "CAM-PDF";
version = "1.60";
@@ -1758,6 +1821,21 @@ let
buildInputs = [ TestWarn ];
};
+ CatalystAuthenticationStoreLDAP = buildPerlPackage {
+ pname = "Catalyst-Authentication-Store-LDAP";
+ version = "1.016";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
+ sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
+ };
+ propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ];
+ buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];
+ meta = {
+ description= "Authentication from an LDAP Directory";
+ license = with stdenv.lib.licenses; [ artistic1 ];
+ };
+ };
+
CatalystComponentInstancePerContext = buildPerlPackage {
pname = "Catalyst-Component-InstancePerContext";
version = "0.001001";
@@ -3105,6 +3183,23 @@ let
};
};
+ CommandRunner = buildPerlModule {
+ pname = "Command-Runner";
+ version = "0.103";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz";
+ sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a";
+ };
+ buildInputs = [ ModuleBuildTiny ];
+ propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ];
+ meta = {
+ homepage = "https://github.com/skaji/Command-Runner";
+ description = "Run external commands and Perl code refs";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
commonsense = buildPerlPackage {
pname = "common-sense";
version = "3.75";
@@ -3932,6 +4027,21 @@ let
perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC";
};
+ CryptFormat = buildPerlPackage {
+ pname = "Crypt-Format";
+ version = "0.10";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz";
+ sha256 = "89ddc010a6c91d5be7a1874a528eed6eda39f2c401c18e63d80ddfbf7127e2dd";
+ };
+ buildInputs = [ TestException TestFailWarnings ];
+ meta = {
+ description = "Conversion utilities for encryption applications";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
CryptIDEA = buildPerlPackage {
pname = "Crypt-IDEA";
version = "1.10";
@@ -4297,6 +4407,23 @@ let
};
};
+ CryptPerl = buildPerlPackage {
+ pname = "Crypt-Perl";
+ version = "0.34";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz";
+ sha256 = "0e1cb223df0041f6d9b010f11e6f97a97ab55a118a273938eb4fe85d403f1b11";
+ };
+ checkInputs = [ pkgs.openssl MathBigIntGMP ];
+ buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ];
+ propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ];
+ meta = {
+ description = "Cryptography in pure Perl";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
CryptEd25519 = buildPerlPackage {
pname = "Crypt-Ed25519";
version = "1.04";
@@ -8300,12 +8427,12 @@ let
};
};
- FutureAsyncAwait = buildPerlModule {
+ FutureAsyncAwait = buildPerlModule rec {
pname = "Future-AsyncAwait";
- version = "0.45";
+ version = "0.47";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.45.tar.gz";
- sha256 = "1aq19b21r9i4c1mxkrv0irnx16234cnzsx50178c7xif4gqkar9k";
+ url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz";
+ sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3";
};
buildInputs = [ TestRefcount ];
propagatedBuildInputs = [ Future XSParseSublike ];
@@ -9926,6 +10053,25 @@ let
};
};
+ IOAIO = buildPerlPackage {
+ pname = "IO-AIO";
+ version = "4.72";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.72.tar.gz";
+ sha256 = "17vfbqagpab8lsbf5nmp2frvxw7hvsyy2i87dpid8djzr615wnvf";
+ };
+ buildInputs = [ CanaryStability ];
+ propagatedBuildInputs = [ commonsense ];
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang $out/bin/treescan
+ '';
+ meta = {
+ description = "Asynchronous/Advanced Input/Output";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
IOAll = buildPerlPackage {
pname = "IO-All";
version = "0.87";
@@ -10617,21 +10763,25 @@ let
};
};
- LaTeXML = buildPerlPackage {
+ LaTeXML = buildPerlPackage rec {
pname = "LaTeXML";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz";
- sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc";
+ url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz";
+ sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x";
};
- propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ];
- doCheck = false; # epub test fails
- postInstall = ''
- shortenPerlShebang $out/bin/latexml
- shortenPerlShebang $out/bin/latexmlc
- shortenPerlShebang $out/bin/latexmlfind
- shortenPerlShebang $out/bin/latexmlmath
- shortenPerlShebang $out/bin/latexmlpost
+ propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ];
+ preCheck = ''
+ rm t/931_epub.t # epub test fails
+ '';
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ # shebangs need to be patched before executables are copied to $out
+ preBuild = ''
+ patchShebangs bin/
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ for file in bin/*; do
+ shortenPerlShebang "$file"
+ done
'';
meta = {
description = "Transforms TeX and LaTeX into XML/HTML/MathML";
@@ -12144,6 +12294,22 @@ let
};
};
+ MathProvablePrime = buildPerlPackage {
+ pname = "Math-ProvablePrime";
+ version = "0.045";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz";
+ sha256 = "32dce42861ce065a875a91ec14c6557e89af07df10cc450d1c4ded13dcbe3dd5";
+ };
+ buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ];
+ propagatedBuildInputs = [ BytesRandomSecureTiny ];
+ meta = {
+ description = "Generate a provable prime number, in pure Perl";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
MathRandom = buildPerlPackage {
pname = "Math-Random";
version = "0.72";
@@ -13146,10 +13312,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
- version = "8.63";
+ version = "8.67";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.63.tar.gz";
- sha256 = "1nw500wi6kdyawc2aq37lnx6zfkpby3sczflh5pjz623i8nw4b66";
+ url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz";
+ sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v";
};
meta = {
homepage = "https://mojolicious.org";
@@ -14910,6 +15076,47 @@ let
};
};
+ NetLDAPServer = buildPerlPackage {
+ pname = "Net-LDAP-Server";
+ version = "0.43";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
+ sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
+ };
+ propagatedBuildInputs = [ NetLDAP ConvertASN1 ];
+ meta = {
+ description = "LDAP server side protocol handling";
+ license = with stdenv.lib.licenses; [ artistic1 ];
+ };
+ };
+
+ NetLDAPSID = buildPerlPackage {
+ pname = "Net-LDAP-SID";
+ version = "0.0001";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz";
+ sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8";
+ };
+ meta = {
+ description= "Active Directory Security Identifier manipulation";
+ license = with stdenv.lib.licenses; [ artistic2 ];
+ };
+ };
+
+ NetLDAPServerTest = buildPerlPackage {
+ pname = "Net-LDAP-Server-Test";
+ version = "0.22";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
+ sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
+ };
+ propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ];
+ meta = {
+ description= "test Net::LDAP code";
+ license = with stdenv.lib.licenses; [ artistic1 ];
+ };
+ };
+
NetNetmask = buildPerlPackage {
pname = "Net-Netmask";
version = "1.9104";
@@ -15617,6 +15824,22 @@ let
propagatedBuildInputs = [ Moo ];
};
+ ParallelPipes = buildPerlModule {
+ pname = "Parallel-Pipes";
+ version = "0.005";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz";
+ sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5";
+ };
+ buildInputs = [ ModuleBuildTiny ];
+ meta = {
+ homepage = "https://github.com/skaji/Parallel-Pipes";
+ description = "Parallel processing using pipe(2) for communication and synchronization";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
ParallelPrefork = buildPerlPackage {
pname = "Parallel-Prefork";
version = "0.18";
@@ -18694,6 +18917,22 @@ let
doCheck = false; # FIXME: 2/293 test failures
};
+ SymbolGet = buildPerlPackage {
+ pname = "Symbol-Get";
+ version = "0.10";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FE/FELIPE/Symbol-Get-0.10.tar.gz";
+ sha256 = "0ee5568c5ae3573ca874e09e4d0524466cfc1ad9a2c24d0bc91d4c7b06f21d9c";
+ };
+ buildInputs = [ TestDeep TestException ];
+ propagatedBuildInputs = [ CallContext ];
+ meta = {
+ description = "Read Perl's symbol table programmatically";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
SymbolGlobalName = buildPerlPackage {
pname = "Symbol-Global-Name";
version = "0.05";
@@ -19189,6 +19428,22 @@ let
};
};
+ TermReadPassword = buildPerlPackage rec {
+ pname = "Term-ReadPassword";
+ version = "0.11";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PH/PHOENIX/${pname}-${version}.tar.gz";
+ sha256 = "08s3zdqbr01qf4h8ryc900qq1cjcdlyy2dq0gppzzy9mbcs6da71";
+ };
+
+ outputs = [ "out" ];
+
+ meta = {
+ description = "This module lets you ask the user for a password in the traditional way, from the keyboard, without echoing";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TermShell = buildPerlModule {
pname = "Term-Shell";
version = "0.11";
@@ -20975,10 +21230,10 @@ let
TextFormat = buildPerlModule {
pname = "Text-Format";
- version = "0.61";
+ version = "0.62";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz";
- sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b";
+ url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.62.tar.gz";
+ sha256 = "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx";
};
meta = {
homepage = "https://metacpan.org/release/Text-Format";
@@ -21155,6 +21410,21 @@ let
};
};
+ TextMultiMarkdown = buildPerlPackage {
+ pname = "Text-MultiMarkdown";
+ version = "1.000035";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-MultiMarkdown-1.000035.tar.gz";
+ sha256 = "2467dd13751dc2979d7c880b24e762952130fdf42a1ed3ee04fdf72d4b52646a";
+ };
+ buildInputs = [ ListMoreUtils TestException ];
+ propagatedBuildInputs = [ HTMLParser TextMarkdown ];
+ meta = {
+ description = "Convert MultiMarkdown syntax to (X)HTML";
+ license = stdenv.lib.licenses.bsd3;
+ };
+ };
+
TestNumberDelta = buildPerlPackage {
pname = "Test-Number-Delta";
version = "1.06";
@@ -22405,6 +22675,21 @@ let
};
};
+ WWWTwilioAPI = buildPerlPackage {
+ pname = "WWW-Twilio-API";
+ version = "0.21";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SC/SCOTTW/WWW-Twilio-API-0.21.tar.gz";
+ sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734";
+ };
+ prePatch = "rm examples.pl";
+ propagatedBuildInputs = [ LWPProtocolhttps ];
+ meta = {
+ description = "Accessing Twilio's REST API with Perl";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
WWWYoutubeViewer = callPackage ../development/perl-modules/WWW-YoutubeViewer { };
Want = buildPerlPackage {
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index d4518b60d24d..d5bebb9bd847 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -3,7 +3,7 @@
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
, freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit
-, readline, rsync, fetchpatch
+, readline, rsync, fetchpatch, valgrind
}:
let
@@ -331,7 +331,7 @@ in
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
});
}
- { name = "json"; }
+ { name = "json"; enable = lib.versionOlder php.version "8.0"; }
{ name = "ldap";
buildInputs = [ openldap cyrus_sasl ];
configureFlags = [
@@ -341,7 +341,9 @@ in
"LDAP_LIBDIR=${openldap.out}/lib"
] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}";
doCheck = false; }
- { name = "mbstring"; buildInputs = [ oniguruma ]; doCheck = false; }
+ { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
+ pcre'
+ ]; doCheck = false; }
{ name = "mysqli";
internalDeps = [ php.extensions.mysqlnd ];
configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ];
@@ -388,11 +390,13 @@ in
# oci8 (7.4, 7.3, 7.2)
# odbc (7.4, 7.3, 7.2)
{ name = "opcache";
- buildInputs = [ pcre' ];
+ buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
+ valgrind.dev
+ ];
# HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is
# included from ZendAccelerator.h, but ZendAccelerator.h is
# included after the ifdef...
- patches = lib.optional (lib.versionOlder php.version "7.4") [
+ patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [
(pkgs.writeText "zend_file_cache_config.patch" ''
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -456,7 +460,7 @@ in
doCheck = false;
}
# recode (7.3, 7.2)
- { name = "session"; }
+ { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); }
{ name = "shmop"; }
{ name = "simplexml";
buildInputs = [ libxml2 pcre' ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 947e631a1c82..c6770420c3ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,19 +9,16 @@
{ pkgs
, stdenv
, python
-, overrides ? (self: super: {})
}:
with pkgs.lib;
-let
- packages = ( self:
+self:
let
+ inherit (self) callPackage;
inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
- callPackage = pkgs.newScope self;
-
namePrefix = python.libPrefix + "-";
bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
@@ -102,7 +99,7 @@ in {
inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
- inherit fetchPypi callPackage;
+ inherit fetchPypi;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;
@@ -202,6 +199,8 @@ in {
aioeventlet = callPackage ../development/python-modules/aioeventlet { };
+ aioextensions = callPackage ../development/python-modules/aioextensions { };
+
aiofiles = callPackage ../development/python-modules/aiofiles { };
aioftp = callPackage ../development/python-modules/aioftp { };
@@ -356,6 +355,8 @@ in {
apsw = callPackage ../development/python-modules/apsw { };
+ arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
+
area = callPackage ../development/python-modules/area { };
arelle = callPackage ../development/python-modules/arelle { gui = true; };
@@ -831,6 +832,8 @@ in {
bespon = callPackage ../development/python-modules/bespon { };
+ betacode = callPackage ../development/python-modules/betacode { };
+
betamax = callPackage ../development/python-modules/betamax { };
betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };
@@ -907,7 +910,7 @@ in {
blockdiag = callPackage ../development/python-modules/blockdiag { };
- blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { };
+ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
block-io = callPackage ../development/python-modules/block-io { };
@@ -1212,6 +1215,10 @@ in {
click-threading = callPackage ../development/python-modules/click-threading { };
+ clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {};
+
+ clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {};
+
cliff = callPackage ../development/python-modules/cliff { };
clifford = callPackage ../development/python-modules/clifford { };
@@ -1224,6 +1231,8 @@ in {
clint = callPackage ../development/python-modules/clint { };
+ clintermission = callPackage ../development/python-modules/clintermission { };
+
clize = callPackage ../development/python-modules/clize { };
clldutils = callPackage ../development/python-modules/clldutils { };
@@ -1250,6 +1259,10 @@ in {
cnvkit = callPackage ../development/python-modules/cnvkit { };
+ coapthon3 = callPackage ../development/python-modules/coapthon3 { };
+
+ coconut = callPackage ../development/python-modules/coconut { };
+
cocotb = callPackage ../development/python-modules/cocotb { };
codecov = callPackage ../development/python-modules/codecov { };
@@ -1351,6 +1364,8 @@ in {
cppy = callPackage ../development/python-modules/cppy { };
+ cpyparsing = callPackage ../development/python-modules/cpyparsing { };
+
cram = callPackage ../development/python-modules/cram { };
crashtest = callPackage ../development/python-modules/crashtest { };
@@ -1441,6 +1456,8 @@ in {
daemonize = callPackage ../development/python-modules/daemonize { };
+ daemonocle = callPackage ../development/python-modules/daemonocle { };
+
daphne = callPackage ../development/python-modules/daphne { };
darcsver = callPackage ../development/python-modules/darcsver { };
@@ -1900,6 +1917,8 @@ in {
emcee = callPackage ../development/python-modules/emcee { };
+ emv = callPackage ../development/python-modules/emv { };
+
emoji = callPackage ../development/python-modules/emoji { };
enaml = callPackage ../development/python-modules/enaml { };
@@ -1982,6 +2001,8 @@ in {
Fabric = callPackage ../development/python-modules/Fabric { };
+ fabulous = callPackage ../development/python-modules/fabulous { };
+
facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
face = callPackage ../development/python-modules/face { };
@@ -2008,6 +2029,8 @@ in {
fastdtw = callPackage ../development/python-modules/fastdtw { };
+ fastecdsa = callPackage ../development/python-modules/fastecdsa { };
+
fasteners = callPackage ../development/python-modules/fasteners { };
fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };
@@ -2187,6 +2210,10 @@ in {
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
+ flatbuffers = callPackage ../development/python-modules/flatbuffers {
+ inherit (pkgs) flatbuffers;
+ };
+
flexmock = callPackage ../development/python-modules/flexmock { };
flickrapi = callPackage ../development/python-modules/flickrapi { };
@@ -2247,7 +2274,10 @@ in {
freetype-py = callPackage ../development/python-modules/freetype-py { };
- freezegun = callPackage ../development/python-modules/freezegun { };
+ freezegun = if isPy27 then
+ callPackage ../development/python-modules/freezegun/0.3.nix { }
+ else
+ callPackage ../development/python-modules/freezegun { };
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
@@ -2356,6 +2386,8 @@ in {
getmac = callPackage ../development/python-modules/getmac { };
+ getkey = callPackage ../development/python-modules/getkey { };
+
gevent = callPackage ../development/python-modules/gevent { };
geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
@@ -2530,6 +2562,8 @@ in {
google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };
+ googlemaps = callPackage ../development/python-modules/googlemaps { };
+
google-music = callPackage ../development/python-modules/google-music { };
google-music-proto = callPackage ../development/python-modules/google-music-proto { };
@@ -2732,6 +2766,8 @@ in {
hiyapyco = callPackage ../development/python-modules/hiyapyco { };
+ hjson = callPackage ../development/python-modules/hjson { };
+
hkdf = callPackage ../development/python-modules/hkdf { };
hmmlearn = callPackage ../development/python-modules/hmmlearn { };
@@ -2871,6 +2907,8 @@ in {
ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
+ ifcopenshell = callPackage ../development/python-modules/ifcopenshell { };
+
ignite = callPackage ../development/python-modules/ignite { };
ihatemoney = callPackage ../development/python-modules/ihatemoney { };
@@ -2889,6 +2927,8 @@ in {
imagesize = callPackage ../development/python-modules/imagesize { };
+ imantics = callPackage ../development/python-modules/imantics { };
+
IMAPClient = callPackage ../development/python-modules/imapclient { };
imaplib2 = callPackage ../development/python-modules/imaplib2 { };
@@ -3025,7 +3065,11 @@ in {
isodate = callPackage ../development/python-modules/isodate { };
- isort = callPackage ../development/python-modules/isort { };
+ isort = if isPy3k then
+ callPackage ../development/python-modules/isort { }
+ else
+ callPackage ../development/python-modules/isort/4.nix {
+ };
isoweek = callPackage ../development/python-modules/isoweek { };
@@ -3196,6 +3240,8 @@ in {
jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
+ jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { };
+
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; };
@@ -3340,6 +3386,8 @@ in {
leveldb = callPackage ../development/python-modules/leveldb { };
+ lexid = callPackage ../development/python-modules/lexid { };
+
libagent = callPackage ../development/python-modules/libagent { };
pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };
@@ -3424,6 +3472,8 @@ in {
librosa = callPackage ../development/python-modules/librosa { };
+ libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; });
+
libsavitar = callPackage ../development/python-modules/libsavitar { };
libselinux = pipe pkgs.libselinux [
@@ -3432,13 +3482,13 @@ in {
p.overrideAttrs (super: {
meta = super.meta // {
outputsToInstall = [ "py" ];
- broken = (super.meta.broken or false) || pythonAtLeast "3.8";
+ broken = super.meta.broken or isPy27;
};
}))
(p:
p.override {
enablePython = true;
- inherit python;
+ python3 = python;
})
(p: p.py)
];
@@ -3502,6 +3552,8 @@ in {
lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; }));
+ littleutils = callPackage ../development/python-modules/littleutils { };
+
livelossplot = callPackage ../development/python-modules/livelossplot { };
livereload = callPackage ../development/python-modules/livereload { };
@@ -3530,8 +3582,6 @@ in {
lockfile = callPackage ../development/python-modules/lockfile { };
- locustio = callPackage ../development/python-modules/locustio { };
-
Logbook = callPackage ../development/python-modules/Logbook { };
logfury = callPackage ../development/python-modules/logfury { };
@@ -3566,6 +3616,8 @@ in {
lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; };
+ lyricwikia = callPackage ../development/python-modules/lyricwikia { };
+
lz4 = self.python-lz4; # alias 2018-12-05
lzstring = callPackage ../development/python-modules/lzstring { };
@@ -3742,6 +3794,8 @@ in {
mido = callPackage ../development/python-modules/mido { };
+ milc = callPackage ../development/python-modules/milc { };
+
milksnake = callPackage ../development/python-modules/milksnake { };
minidb = callPackage ../development/python-modules/minidb { };
@@ -3770,6 +3824,8 @@ in {
mlrose = callPackage ../development/python-modules/mlrose { };
+ mlxtend = callPackage ../development/python-modules/mlxtend { };
+
mmh3 = callPackage ../development/python-modules/mmh3 { };
mmpython = callPackage ../development/python-modules/mmpython { };
@@ -4006,6 +4062,8 @@ in {
ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
+ ndjson = callPackage ../development/python-modules/ndjson { };
+
ndtypes = callPackage ../development/python-modules/ndtypes { };
neo = callPackage ../development/python-modules/neo { };
@@ -4082,6 +4140,10 @@ in {
nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
+ nocasedict = callPackage ../development/python-modules/nocasedict { };
+
+ nocaselist = callPackage ../development/python-modules/nocaselist { };
+
nodeenv = callPackage ../development/python-modules/nodeenv { };
node-semver = callPackage ../development/python-modules/node-semver { };
@@ -4132,6 +4194,7 @@ in {
notify-py = callPackage ../development/python-modules/notify-py { };
notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; };
+ notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; };
nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
@@ -4245,6 +4308,8 @@ in {
openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
+ openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { };
+
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
opentracing = callPackage ../development/python-modules/opentracing { };
@@ -4296,7 +4361,9 @@ in {
oyaml = callPackage ../development/python-modules/oyaml { };
- packaging = callPackage ../development/python-modules/packaging { };
+ packaging = if isPy3k
+ then callPackage ../development/python-modules/packaging { }
+ else callPackage ../development/python-modules/packaging/2.nix { };
packet-python = callPackage ../development/python-modules/packet-python { };
@@ -4334,7 +4401,10 @@ in {
paperspace = callPackage ../development/python-modules/paperspace { };
- paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
+ openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { };
+ openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { };
+ paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { };
+ paperwork-shell = callPackage ../applications/office/paperwork/paperwork-shell.nix { };
papis = callPackage ../development/python-modules/papis { };
@@ -4434,6 +4504,8 @@ in {
pdfx = callPackage ../development/python-modules/pdfx { };
+ pdoc3 = callPackage ../development/python-modules/pdoc3 { };
+
pecan = callPackage ../development/python-modules/pecan { };
peewee = callPackage ../development/python-modules/peewee { };
@@ -4497,6 +4569,8 @@ in {
phpserialize = callPackage ../development/python-modules/phpserialize { };
+ phx-class-registry = callPackage ../development/python-modules/phx-class-registry { };
+
piccata = callPackage ../development/python-modules/piccata { };
pickleshare = callPackage ../development/python-modules/pickleshare { };
@@ -4558,6 +4632,8 @@ in {
pkuseg = callPackage ../development/python-modules/pkuseg { };
+ pysbd = callPackage ../development/python-modules/pysbd { };
+
python-csxcad = callPackage ../development/python-modules/python-csxcad { };
python-openems = callPackage ../development/python-modules/python-openems { };
@@ -4660,6 +4736,8 @@ in {
pproxy = callPackage ../development/python-modules/pproxy { };
+ ppscore = callPackage ../development/python-modules/ppscore { };
+
pq = callPackage ../development/python-modules/pq { };
prance = callPackage ../development/python-modules/prance { };
@@ -4744,6 +4822,8 @@ in {
psycopg2 = callPackage ../development/python-modules/psycopg2 { };
+ psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { };
+
ptable = callPackage ../development/python-modules/ptable { };
ptest = callPackage ../development/python-modules/ptest { };
@@ -4786,6 +4866,10 @@ in {
pxml = callPackage ../development/python-modules/pxml { };
+ py-air-control = callPackage ../development/python-modules/py-air-control { };
+
+ py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
+
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
@@ -4896,6 +4980,8 @@ in {
pycm = callPackage ../development/python-modules/pycm { };
+ pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
+
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
pycognito = callPackage ../development/python-modules/pycognito { };
@@ -4937,6 +5023,8 @@ in {
pycurl = callPackage ../development/python-modules/pycurl { };
+ pycxx = callPackage ../development/python-modules/pycxx { };
+
pydantic = callPackage ../development/python-modules/pydantic { };
pydbus = callPackage ../development/python-modules/pydbus { };
@@ -4973,6 +5061,8 @@ in {
pyechonest = callPackage ../development/python-modules/pyechonest { };
+ pyee = callPackage ../development/python-modules/pyee { };
+
pyelftools = callPackage ../development/python-modules/pyelftools { };
pyemd = callPackage ../development/python-modules/pyemd { };
@@ -5064,7 +5154,10 @@ in {
pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; };
- pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; };
+ pygobject3 = if isPy3k then
+ callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }
+ else
+ callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; };
pygogo = callPackage ../development/python-modules/pygogo { };
@@ -5089,6 +5182,8 @@ in {
pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; };
+ pygtrie = callPackage ../development/python-modules/pygtrie { };
+
pyhamcrest = if isPy3k then
callPackage ../development/python-modules/pyhamcrest { }
else
@@ -5150,7 +5245,10 @@ in {
pylev = callPackage ../development/python-modules/pylev { };
- pylibacl = callPackage ../development/python-modules/pylibacl { };
+ pylibacl = if isPy3k then
+ callPackage ../development/python-modules/pylibacl { }
+ else
+ callPackage ../development/python-modules/pylibacl/0.5.nix { };
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
@@ -5251,6 +5349,8 @@ in {
pync = callPackage ../development/python-modules/pync { };
+ pynest2d = callPackage ../development/python-modules/pynest2d { };
+
pynisher = callPackage ../development/python-modules/pynisher { };
pynmea2 = callPackage ../development/python-modules/pynmea2 { };
@@ -5280,12 +5380,16 @@ in {
pyomo = callPackage ../development/python-modules/pyomo { };
+ phonemizer = callPackage ../development/python-modules/phonemizer { };
+
pyopencl = callPackage ../development/python-modules/pyopencl { };
pyopengl = callPackage ../development/python-modules/pyopengl { };
pyopenssl = callPackage ../development/python-modules/pyopenssl { };
+ pyosf = callPackage ../development/python-modules/pyosf { };
+
pyosmium = callPackage ../development/python-modules/pyosmium { };
pyotp = callPackage ../development/python-modules/pyotp { };
@@ -5331,6 +5435,8 @@ in {
pypoppler = callPackage ../development/python-modules/pypoppler { };
+ pyppeteer = callPackage ../development/python-modules/pyppeteer { };
+
pyprind = callPackage ../development/python-modules/pyprind { };
pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };
@@ -5417,6 +5523,8 @@ in {
pyroma = callPackage ../development/python-modules/pyroma { };
+ pyro-api = callPackage ../development/python-modules/pyro-api { };
+
pyro-ppl = callPackage ../development/python-modules/pyro-ppl { };
pyroute2 = callPackage ../development/python-modules/pyroute2 { };
@@ -5542,7 +5650,9 @@ in {
pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
- pysvn = callPackage ../development/python-modules/pysvn { };
+ pysvn = callPackage ../development/python-modules/pysvn {
+ inherit (pkgs) bash subversion apr aprutil expat neon openssl;
+ };
pytabix = callPackage ../development/python-modules/pytabix { };
@@ -5557,7 +5667,7 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
# pytest>=6 is too new for most packages
- pytest = if isPy3k then self.pytest_5 else self.pytest_4;
+ pytest = if isPy3k then self.pytest_6 else self.pytest_4;
pytest_4 = callPackage
../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle
@@ -5725,11 +5835,10 @@ in {
pytest-watch = callPackage ../development/python-modules/pytest-watch { };
- pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { };
-
- pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { };
-
- pytest_xdist = self.pytest_xdist_1;
+ pytest_xdist = if isPy27 then
+ callPackage ../development/python-modules/pytest-xdist/1.nix { }
+ else
+ callPackage ../development/python-modules/pytest-xdist { };
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
@@ -5745,10 +5854,14 @@ in {
python-baseconv = callPackage ../development/python-modules/python-baseconv { };
+ python-bidi = callPackage ../development/python-modules/python-bidi { };
+
python-binance = callPackage ../development/python-modules/python-binance { };
python-constraint = callPackage ../development/python-modules/python-constraint { };
+ python-crontab = callPackage ../development/python-modules/python-crontab { };
+
python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
python-daemon = callPackage ../development/python-modules/python-daemon { };
@@ -5783,6 +5896,8 @@ in {
python-forecastio = callPackage ../development/python-modules/python-forecastio { };
+ python-frontmatter = callPackage ../development/python-modules/python-frontmatter { };
+
python-gitlab = callPackage ../development/python-modules/python-gitlab { };
python-gnupg = callPackage ../development/python-modules/python-gnupg { };
@@ -6142,6 +6257,8 @@ in {
rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
+ re-assert = callPackage ../development/python-modules/re-assert { };
+
readchar = callPackage ../development/python-modules/readchar { };
readme = callPackage ../development/python-modules/readme { };
@@ -6162,6 +6279,8 @@ in {
rednose = callPackage ../development/python-modules/rednose { };
+ reedsolo = callPackage ../development/python-modules/reedsolo { };
+
regex = callPackage ../development/python-modules/regex { };
regional = callPackage ../development/python-modules/regional { };
@@ -6419,6 +6538,8 @@ in {
scikit-fmm = callPackage ../development/python-modules/scikit-fmm { };
+ scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { };
+
scikitimage = callPackage ../development/python-modules/scikit-image { };
scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; };
@@ -6468,6 +6589,8 @@ in {
scp = callPackage ../development/python-modules/scp { };
+ scramp = callPackage ../development/python-modules/scramp { };
+
scrapy = callPackage ../development/python-modules/scrapy { };
scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };
@@ -6491,6 +6614,8 @@ in {
seabreeze = callPackage ../development/python-modules/seabreeze { };
+ seccomp = callPackage ../development/python-modules/seccomp { };
+
secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; };
secretstorage = if isPy3k then
@@ -6565,6 +6690,8 @@ in {
shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { };
+ shap = callPackage ../development/python-modules/shap { };
+
shapely = callPackage ../development/python-modules/shapely { };
sharedmem = callPackage ../development/python-modules/sharedmem { };
@@ -6646,6 +6773,8 @@ in {
slicedimage = callPackage ../development/python-modules/slicedimage { };
+ slicer = callPackage ../development/python-modules/slicer { };
+
slicerator = callPackage ../development/python-modules/slicerator { };
slimit = callPackage ../development/python-modules/slimit { };
@@ -6710,6 +6839,8 @@ in {
usePython = true;
});
+ sockjs = callPackage ../development/python-modules/sockjs { };
+
sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };
socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };
@@ -6765,6 +6896,8 @@ in {
sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
+ sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
+
sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { };
sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
@@ -6886,6 +7019,8 @@ in {
sslyze = callPackage ../development/python-modules/sslyze { };
+ stack-data = callPackage ../development/python-modules/stack-data { };
+
starlette = callPackage ../development/python-modules/starlette { };
staticjinja = callPackage ../development/python-modules/staticjinja { };
@@ -6948,6 +7083,8 @@ in {
sumo = callPackage ../development/python-modules/sumo { };
+ sumtypes = callPackage ../development/python-modules/sumtypes { };
+
sunpy = callPackage ../development/python-modules/sunpy { };
supervise_api = callPackage ../development/python-modules/supervise_api { };
@@ -7050,6 +7187,7 @@ in {
nccl = pkgs.nccl_cudatoolkit_10;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+ inherit (pkgs) flatbuffers;
};
tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 {
@@ -7059,6 +7197,7 @@ in {
nccl = pkgs.nccl_cudatoolkit_11;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+ inherit (pkgs) flatbuffers;
};
tensorflow-build = self.tensorflow-build_1;
@@ -7179,6 +7318,8 @@ in {
tinydb = callPackage ../development/python-modules/tinydb { };
+ tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
+
tiros = callPackage ../development/python-modules/tiros { };
tissue = callPackage ../development/python-modules/tissue { };
@@ -7487,12 +7628,7 @@ in {
vdf = callPackage ../development/python-modules/vdf { };
- vdirsyncer = callPackage ../development/python-modules/vdirsyncer {
- inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
- inherit (pkgs) pkg-config openssl rustPlatform;
- };
-
- vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
+ vdirsyncer = callPackage ../development/python-modules/vdirsyncer { };
vega = callPackage ../development/python-modules/vega { };
@@ -7681,6 +7817,14 @@ in {
};
};
+ wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
+ inherit (pkgs) pkgconfig;
+ wxGTK = pkgs.wxGTK31.override {
+ withGtk2 = false;
+ withWebKit = true;
+ };
+ };
+
wxPython = self.wxPython30;
x11_hash = callPackage ../development/python-modules/x11_hash { };
@@ -7728,6 +7872,8 @@ in {
xml2rfc = callPackage ../development/python-modules/xml2rfc { };
+ xmljson = callPackage ../development/python-modules/xmljson { };
+
xmlschema = callPackage ../development/python-modules/xmlschema { };
xmltodict = callPackage ../development/python-modules/xmltodict { };
@@ -7764,6 +7910,8 @@ in {
yamllint = callPackage ../development/python-modules/yamllint { };
+ yamlloader = callPackage ../development/python-modules/yamlloader { };
+
yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { };
yanc = callPackage ../development/python-modules/yanc { };
@@ -7797,6 +7945,8 @@ in {
phantomjsSupport = false;
};
+ youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
+
yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { };
@@ -7829,7 +7979,7 @@ in {
zeep = callPackage ../development/python-modules/zeep { };
- zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py;
+ zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;
zerobin = callPackage ../development/python-modules/zerobin { };
@@ -7928,6 +8078,4 @@ in {
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
-});
-
-in fix' (extends overrides packages)
+}
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 1e33c7b0585b..411093186a6c 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -142,15 +142,13 @@ rec {
/* Recursively map a (nested) set of derivations to an isomorphic
set of meta.platforms values. */
packagePlatforms = mapAttrs (name: value:
- let res = builtins.tryEval (
if isDerivation value then
value.meta.hydraPlatforms
or (value.meta.platforms or [ "x86_64-linux" ])
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else
- []);
- in if res.success then res.value else []
+ []
);
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 41aa86a8c463..5e591ec7a857 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -160,8 +160,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
udev = linux;
unzip = all;
usbutils = linux;
- utillinux = linux;
- utillinuxMinimal = linux;
+ util-linux = linux;
+ util-linuxMinimal = linux;
w3m = all;
webkitgtk = linux;
wget = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5fc6e91b3118..cacc77fea30d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -173,8 +173,13 @@ let
in {
# Lightweight distribution and test
inherit (bootstrap) dist test;
+
# Test a full stdenv bootstrap from the bootstrap tools definition
- inherit (bootstrap.test-pkgs) stdenv;
+ # Temporarily disabled. The darwin bootstrap is transitioning the
+ # structure of bootstrap tools. The tools that are generated as
+ # part of the current package set cannot be unpacked in the same
+ # way as the tools used by the current package set.
+ # inherit (bootstrap.test-pkgs) stdenv;
};
};
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 58b0300cc79c..8fc460ca5227 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -200,6 +200,9 @@ let
then self
else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; });
+ # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB
+ # of allocations. DO NOT USE THIS IN NIXPKGS.
+ #
# Extend the package set with a single overlay. This preserves
# preexisting overlays. Prefer to initialize with the right overlays
# in one go when calling Nixpkgs, for performance and simplicity.
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 865e5cf2900e..b3851ba20f09 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -286,6 +286,11 @@ in {
libexecinfo = super.libexecinfo.override { enableShared = false; };
+ tree-sitter = super.tree-sitter.override {
+ enableShared = false;
+ enableStatic = true;
+ };
+
xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {
libX11 = xorgsuper.libX11.overrideAttrs (attrs: {
depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cdad9de61f41..b4f708ad5651 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -55,15 +55,15 @@ let
darwin = pkgs.darwin.network_cmds;
};
col = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.text_cmds;
};
column = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.netbsd.column;
};
eject = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
getconf = {
linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc
@@ -76,19 +76,19 @@ let
darwin = pkgs.netbsd.getent;
};
getopt = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.getopt;
};
fdisk = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
fsck = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
hexdump = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
hostname = {
@@ -108,14 +108,14 @@ let
darwin = pkgs.netbsd.locale;
};
logger = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
more = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = more_compat;
};
mount = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
netstat = {
@@ -139,7 +139,7 @@ let
darwin = pkgs.darwin.network_cmds;
};
script = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
sysctl = {
@@ -151,15 +151,15 @@ let
darwin = pkgs.darwin.top;
};
umount = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
whereis = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
wall = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
watch = {
linux = pkgs.procps;
@@ -169,7 +169,7 @@ let
darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
};
write = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.basic_cmds;
};
xxd = {
@@ -188,7 +188,7 @@ let
# Provided for old usage of these commands.
compat = with bins; lib.mapAttrs makeCompat {
procps = [ ps sysctl top watch ];
- utillinux = [ fsck fdisk getopt hexdump mount
+ util-linux = [ fsck fdisk getopt hexdump mount
script umount whereis write col column ];
nettools = [ arp hostname ifconfig netstat route ];
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 06:07:40 +0000