summaryrefslogtreecommitdiff
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix39
-rw-r--r--pkgs/top-level/all-packages.nix1350
-rw-r--r--pkgs/top-level/beam-packages.nix16
-rw-r--r--pkgs/top-level/coq-packages.nix18
-rw-r--r--pkgs/top-level/darwin-packages.nix67
-rw-r--r--pkgs/top-level/dotnet-packages.nix3
-rw-r--r--pkgs/top-level/emacs-packages.nix8
-rw-r--r--pkgs/top-level/haskell-packages.nix8
-rw-r--r--pkgs/top-level/ocaml-packages.nix15
-rw-r--r--pkgs/top-level/perl-packages.nix270
-rw-r--r--pkgs/top-level/php-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix261
-rw-r--r--pkgs/top-level/python2-packages.nix12
-rw-r--r--pkgs/top-level/qt5-packages.nix4
-rw-r--r--pkgs/top-level/release-haskell.nix279
-rw-r--r--pkgs/top-level/ruby-packages.nix187
-rw-r--r--pkgs/top-level/static.nix2
17 files changed, 1836 insertions, 705 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebd36b466490..720386653eba 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -63,6 +63,7 @@ mapAliases ({
at_spi2_core = at-spi2-core; # added 2018-02-25
aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26
avldrums-lv2 = x42-avldrums; # added 2020-03-29
+ avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
@@ -70,6 +71,7 @@ mapAliases ({
bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
beegfs = throw "beegfs has been removed."; # added 2019-11-24
bluezFull = bluez; # Added 2019-12-03
+ bpftool = bpftools; # Added 2021-05-03
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
bridge_utils = bridge-utils; # added 2015-02-20
bro = zeek; # added 2019-09-29
@@ -113,6 +115,7 @@ mapAliases ({
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
+ cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05
codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20
@@ -120,6 +123,8 @@ mapAliases ({
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
coprthr = throw "coprthr has been removed."; # added 2019-12-08
+ couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
+ couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
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
@@ -163,6 +168,7 @@ mapAliases ({
deadpixi-sam = deadpixi-sam-unstable;
debian_devscripts = debian-devscripts; # added 2016-03-23
deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
+ deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
desktop_file_utils = desktop-file-utils; # added 2018-02-25
devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18
@@ -194,6 +200,7 @@ mapAliases ({
exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
+ fastnlo = fastnlo_toolkit; # added 2021-04-24
fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13
fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
ffadoFull = ffado; # added 2018-05-01
@@ -240,6 +247,7 @@ mapAliases ({
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
gettextWithExpat = gettext; # 2016-02-19
+ giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12
gitAndTools = self // { # added 2021-01-14
darcsToGit = darcs-to-git;
gitAnnex = git-annex;
@@ -296,6 +304,7 @@ mapAliases ({
gtk_doc = gtk-doc; # added 2018-02-25
guileCairo = guile-cairo; # added 2017-09-24
guileGnome = guile-gnome; # added 2017-09-24
+ gnome3 = gnome; # added 2021-05-07
guileLint = guile-lint; # added 2017-09-27
guile_lib = guile-lib; # added 2017-09-24
guile_ncurses = guile-ncurses; # added 2017-09-24
@@ -337,8 +346,11 @@ mapAliases ({
kodiPlain = kodi;
kodiPlainWayland = kodi-wayland;
jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26
- julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
- julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
+ julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15
+ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13
+ julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15
+ julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13
+ kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
@@ -349,6 +361,7 @@ mapAliases ({
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25
kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
+ kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25
krename-qt5 = krename; # added 2017-02-18
kerberos = libkrb5; # moved from top-level 2021-03-14
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
@@ -390,6 +403,7 @@ mapAliases ({
libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa";
libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa";
libudev = udev; # added 2018-04-25
+ libungif = giflib; # added 2020-02-12
libusb = libusb1; # added 2020-04-28
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
@@ -429,6 +443,7 @@ mapAliases ({
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
matrique = spectral; # added 2020-01-27
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
+ meme = meme-image-generator; # added 2021-04-21
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; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
@@ -479,6 +494,7 @@ mapAliases ({
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
nix-review = nixpkgs-review; # added 2019-12-22
+ nixFlakes = nixUnstable; # added 2021-05-21
nmap_graphical = nmap-graphical; # added 2017-01-19
nologin = shadow; # added 2018-04-25
nxproxy = nx-libs; # added 2019-02-15
@@ -595,6 +611,7 @@ mapAliases ({
postgis = postgresqlPackages.postgis;
# end
ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream.";
+ privateer = throw "privateer was removed because it was broken"; # added 2021-05-18
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12
@@ -608,6 +625,7 @@ 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
+ pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14
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
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
@@ -626,6 +644,8 @@ mapAliases ({
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
+ readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22
+ retroshare = throw "retroshare was removed because it was broken"; # added 2021-05-17
rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream.";
rng_tools = rng-tools; # added 2018-10-24
robomongo = robo3t; #added 2017-09-28
@@ -662,6 +682,9 @@ mapAliases ({
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
+ thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
+ thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
+ togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";
urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02
urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02
@@ -740,6 +763,7 @@ mapAliases ({
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
+ spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03
spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
@@ -749,6 +773,7 @@ mapAliases ({
squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
+ stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09
surf-webkit2 = surf; # added 2017-04-02
sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
@@ -792,7 +817,6 @@ mapAliases ({
torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28
torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28
trang = jing-trang; # added 2018-04-25
- transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14
@@ -846,6 +870,8 @@ mapAliases ({
xbmcPlain = kodiPlain; # added 2018-04-25
xbmcPlugins = kodiPackages; # added 2018-04-25
kodiPlugins = kodiPackages; # added 2021-03-09;
+ xineLib = xine-lib; # added 2021-04-27
+ xineUI = xine-ui; # added 2021-04-27
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
@@ -857,6 +883,7 @@ mapAliases ({
xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13
xv = xxv; # added 2020-02-22
+ xvfb_run = xvfb-run; # added 2021-05-07
yacc = bison; # moved from top-level 2021-03-14
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
@@ -958,6 +985,12 @@ mapAliases ({
posix_man_pages = man-pages-posix; # Added 2021-04-15
+ /* Cleanup before 21.11, Added 2021-05-07 */
+ avian = throw ''
+ The package doesn't compile anymore on NixOS and both development
+ & maintenance is abandoned by upstream.
+ '';
+
/* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See:
https://github.com/NixOS/nixpkgs/pull/101369 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75c1a9d04d0b..382ae1fb5eed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30,7 +30,7 @@ in
# just the plain stdenv.
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
- stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; };
+ stdenvNoCC = stdenv.override { cc = null; hasCC = false; };
mkStdenvNoLibs = stdenv: let
bintools = stdenv.cc.bintools.override {
@@ -156,6 +156,10 @@ in
antsimulator = callPackage ../games/antsimulator { };
+ atuin = callPackage ../tools/misc/atuin {
+ inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+ };
+
fiche = callPackage ../servers/fiche { };
fishnet = callPackage ../servers/fishnet { };
@@ -197,7 +201,7 @@ in
castget = callPackage ../applications/networking/feedreaders/castget { };
castxml = callPackage ../development/tools/castxml {
- inherit (llvmPackages) clang-unwrapped libclang llvm;
+ inherit (llvmPackages) libclang llvm;
inherit (python3Packages) sphinx;
};
@@ -251,13 +255,21 @@ in
eclipse-mat = callPackage ../development/tools/eclipse-mat { };
+ evans = callPackage ../development/tools/evans { };
+
+ frugal = callPackage ../development/tools/frugal { };
+
glade = callPackage ../development/tools/glade { };
hobbes = callPackage ../development/tools/hobbes { };
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
- probe-run = callPackage ../development/tools/rust/probe-run {};
+ probe-run = callPackage ../development/tools/rust/probe-run {
+ inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
+ };
+
+ mix2nix = callPackage ../development/tools/mix2nix/default.nix { };
proto-contrib = callPackage ../development/tools/proto-contrib {};
@@ -369,6 +381,8 @@ in
etBook = callPackage ../data/fonts/et-book { };
+ fetchutils = callPackage ../tools/misc/fetchutils { };
+
fet-sh = callPackage ../tools/misc/fet-sh { };
fetchbower = callPackage ../build-support/fetchbower {
@@ -449,60 +463,60 @@ in
# `fetchurl' downloads a file from the network.
fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform
- then buildPackages.fetchurl # No need to do special overrides twice,
- else makeOverridable (import ../build-support/fetchurl) {
- inherit lib stdenvNoCC buildPackages;
- inherit cacert;
- curl = buildPackages.curlMinimal.override (old: rec {
- # break dependency cycles
- fetchurl = stdenv.fetchurlBoot;
- zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
- pkg-config = buildPackages.pkg-config.override (old: {
- pkg-config = old.pkg-config.override {
- fetchurl = stdenv.fetchurlBoot;
- };
- });
- perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
- openssl = buildPackages.openssl.override {
+ then buildPackages.fetchurl # No need to do special overrides twice,
+ else makeOverridable (import ../build-support/fetchurl) {
+ inherit lib stdenvNoCC buildPackages;
+ inherit cacert;
+ curl = buildPackages.curlMinimal.override (old: rec {
+ # break dependency cycles
fetchurl = stdenv.fetchurlBoot;
- buildPackages = {
- coreutils = buildPackages.coreutils.override {
+ zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
+ pkg-config = buildPackages.pkg-config.override (old: {
+ pkg-config = old.pkg-config.override {
fetchurl = stdenv.fetchurlBoot;
+ };
+ });
+ perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
+ openssl = buildPackages.openssl.override {
+ fetchurl = stdenv.fetchurlBoot;
+ buildPackages = {
+ coreutils = buildPackages.coreutils.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit perl;
+ xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
+ gmp = null;
+ aclSupport = false;
+ attrSupport = false;
+ };
inherit perl;
- xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
- gmp = null;
- aclSupport = false;
- attrSupport = false;
};
inherit perl;
};
- inherit perl;
- };
- libssh2 = buildPackages.libssh2.override {
- fetchurl = stdenv.fetchurlBoot;
- inherit zlib openssl;
- };
- # On darwin, libkrb5 needs bootstrap_cmds which would require
- # converting many packages to fetchurl_boot to avoid evaluation cycles.
- # So turn gssSupport off there, and on Windows.
- # On other platforms, keep the previous value.
- gssSupport =
- if stdenv.isDarwin || stdenv.hostPlatform.isWindows
- then false
- else old.gssSupport or true; # `? true` is the default
- libkrb5 = buildPackages.libkrb5.override {
- fetchurl = stdenv.fetchurlBoot;
- inherit pkg-config perl openssl;
- keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
- };
- nghttp2 = buildPackages.nghttp2.override {
- fetchurl = stdenv.fetchurlBoot;
- inherit zlib pkg-config openssl;
- c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
- libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
- };
- });
- };
+ libssh2 = buildPackages.libssh2.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit zlib openssl;
+ };
+ # On darwin, libkrb5 needs bootstrap_cmds which would require
+ # converting many packages to fetchurl_boot to avoid evaluation cycles.
+ # So turn gssSupport off there, and on Windows.
+ # On other platforms, keep the previous value.
+ gssSupport =
+ if stdenv.isDarwin || stdenv.hostPlatform.isWindows
+ then false
+ else old.gssSupport or true; # `? true` is the default
+ libkrb5 = buildPackages.libkrb5.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit pkg-config perl openssl;
+ keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
+ };
+ nghttp2 = buildPackages.nghttp2.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit zlib pkg-config openssl;
+ c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
+ libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
+ };
+ });
+ };
fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
@@ -573,6 +587,8 @@ in
nix-gitignore = callPackage ../build-support/nix-gitignore { };
+ numworks-epsilon = callPackage ../applications/science/math/numworks-epsilon { };
+
ociTools = callPackage ../build-support/oci-tools { };
octant = callPackage ../applications/networking/cluster/octant { };
@@ -633,6 +649,8 @@ in
wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { };
+ wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; };
+
wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; };
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -689,9 +707,7 @@ in
acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
- acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
- ffmpeg = ffmpeg_2;
- };
+ acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { };
alsaequal = callPackage ../tools/audio/alsaequal { };
@@ -790,12 +806,14 @@ in
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
ajour = callPackage ../tools/games/ajour {
- inherit (gnome3) zenity;
+ inherit (gnome) zenity;
inherit (plasma5Packages) kdialog;
};
albert = libsForQt5.callPackage ../applications/misc/albert {};
+ auditwheel = callPackage ../tools/package-management/auditwheel { };
+
gobgp = callPackage ../tools/networking/gobgp { };
metapixel = callPackage ../tools/graphics/metapixel { };
@@ -804,13 +822,23 @@ in
tfk8s = callPackage ../tools/misc/tfk8s { };
+ tnat64 = callPackage ../tools/networking/tnat64 { };
+
+ xcd = callPackage ../tools/misc/xcd { };
+
xtrt = callPackage ../tools/archivers/xtrt { };
yabridge = callPackage ../tools/audio/yabridge {
- wine = wineWowPackages.minimal;
+ wine = wineWowPackages.staging;
};
- yabridgectl = callPackage ../tools/audio/yabridgectl { };
+ yabridgectl = callPackage ../tools/audio/yabridgectl {
+ wine = wineWowPackages.staging;
+ };
+
+ yafetch = callPackage ../tools/misc/yafetch {
+ stdenv = clangStdenv;
+ };
### APPLICATIONS/TERMINAL-EMULATORS
@@ -1079,6 +1107,8 @@ in
audiowaveform = callPackage ../tools/audio/audiowaveform { };
+ authenticator = callPackage ../applications/misc/authenticator { };
+
autoflake = callPackage ../development/tools/analysis/autoflake { };
autospotting = callPackage ../applications/misc/autospotting { };
@@ -1224,6 +1254,10 @@ in
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
+ bucklespring = bucklespring-x11;
+ bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
+ bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
+
buildbot = with python3Packages; toPythonApplication buildbot;
buildbot-ui = with python3Packages; toPythonApplication buildbot-ui;
buildbot-full = with python3Packages; toPythonApplication buildbot-full;
@@ -1256,6 +1290,8 @@ in
cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
+ cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { };
+
codeql = callPackage ../development/tools/analysis/codeql { };
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
@@ -1444,10 +1480,12 @@ in
grc = python3Packages.callPackage ../tools/misc/grc { };
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
- SDL = SDL_sixel;
+ SDL = SDL_sixel;
};
- gremlin-console = callPackage ../applications/misc/gremlin-console { };
+ gremlin-console = callPackage ../applications/misc/gremlin-console {
+ openjdk = openjdk11;
+ };
grex = callPackage ../tools/misc/grex {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -1465,6 +1503,8 @@ in
harvid = callPackage ../tools/video/harvid { };
+ hilbish = callPackage ../shells/hilbish { };
+
hime = callPackage ../tools/inputmethods/hime {};
hinit = haskell.lib.justStaticExecutables haskellPackages.hinit;
@@ -1914,6 +1954,8 @@ in
buildpack = callPackage ../development/tools/buildpack { };
+ bottom-rs = callPackage ../tools/misc/bottom-rs { };
+
buildtorrent = callPackage ../tools/misc/buildtorrent { };
bustle = haskellPackages.bustle;
@@ -1982,6 +2024,8 @@ in
boost = pkgs.boost.override { python = python3; };
};
+ calendar-cli = callPackage ../tools/networking/calendar-cli { };
+
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
@@ -2196,9 +2240,7 @@ in
cppclean = callPackage ../development/tools/cppclean {};
- credhub-cli = callPackage ../tools/admin/credhub-cli {
- buildGoModule = buildGo114Module;
- };
+ credhub-cli = callPackage ../tools/admin/credhub-cli {};
crex = callPackage ../tools/misc/crex { };
@@ -2256,6 +2298,8 @@ in
ddate = callPackage ../tools/misc/ddate { };
+ dduper = callPackage ../tools/filesystems/dduper { };
+
dedup = callPackage ../tools/backup/dedup { };
dehydrated = callPackage ../tools/admin/dehydrated { };
@@ -2309,13 +2353,9 @@ in
discount = callPackage ../tools/text/discount { };
- discourse = callPackage ../servers/web-apps/discourse {
- ruby = ruby_2_7;
- };
+ discourse = callPackage ../servers/web-apps/discourse { };
- discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver {
- ruby = ruby_2_7;
- };
+ discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { };
discocss = callPackage ../tools/misc/discocss { };
@@ -2393,6 +2433,8 @@ in
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
+ earthly = callPackage ../development/tools/earthly { };
+
earlybird = callPackage ../tools/security/earlybird { };
earlyoom = callPackage ../os-specific/linux/earlyoom { };
@@ -2630,6 +2672,8 @@ in
godu = callPackage ../tools/misc/godu { };
+ goss = callPackage ../tools/misc/goss { };
+
gosu = callPackage ../tools/misc/gosu { };
gotify-cli = callPackage ../tools/misc/gotify-cli { };
@@ -2708,6 +2752,8 @@ in
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
+ jellyfin-web = callPackage ../servers/jellyfin/web.nix { };
+
jiten = callPackage ../applications/misc/jiten { };
jotta-cli = callPackage ../applications/misc/jotta-cli { };
@@ -2822,6 +2868,8 @@ in
mididings = callPackage ../tools/audio/mididings { };
+ miniscript = callPackage ../applications/blockchains/miniscript { };
+
miniserve = callPackage ../tools/misc/miniserve {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -2989,6 +3037,8 @@ in
remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
+ restream = callPackage ../applications/misc/remarkable/restream { };
+
ryujinx = callPackage ../misc/emulators/ryujinx { };
scour = with python3Packages; toPythonApplication scour;
@@ -3001,6 +3051,10 @@ in
shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
+ sheesy-cli = callPackage ../tools/security/sheesy-cli {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
simdjson = callPackage ../development/libraries/simdjson { };
shipyard = callPackage ../tools/virtualization/shipyard { };
@@ -3015,6 +3069,8 @@ in
socklog = callPackage ../tools/system/socklog { };
+ soju = callPackage ../applications/networking/soju { };
+
spacevim = callPackage ../applications/editors/spacevim { };
ssmsh = callPackage ../tools/admin/ssmsh { };
@@ -3190,6 +3246,10 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
};
+ bacon = callPackage ../development/tools/bacon {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
+
bareos = callPackage ../tools/backup/bareos { };
bats = callPackage ../development/interpreters/bats { };
@@ -3198,7 +3258,14 @@ in
bdsync = callPackage ../tools/backup/bdsync { };
- beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { };
+ beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter {
+ # developed for a compiler with C++20 support
+ stdenv =
+ if stdenv.isDarwin then
+ overrideCC stdenv clang_10
+ else
+ stdenv;
+ };
beanstalkd = callPackage ../servers/beanstalkd { };
@@ -3362,7 +3429,8 @@ in
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
- boost = boost172.override { enablePython = true; python = python38; };
+ boost = boost17x.override { enablePython = true; python = python3; };
+ lua = lua5_4;
})
ceph
ceph-client;
@@ -3521,7 +3589,7 @@ in
libpinyin = callPackage ../development/libraries/libpinyin { };
libskk = callPackage ../development/libraries/libskk {
- inherit (gnome3) gnome-common;
+ inherit (gnome) gnome-common;
};
m17n_db = callPackage ../tools/inputmethods/m17n-db { };
@@ -3618,7 +3686,9 @@ in
cfssl = callPackage ../tools/security/cfssl { };
- chafa = callPackage ../tools/misc/chafa { };
+ chafa = callPackage ../tools/misc/chafa {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
@@ -3817,7 +3887,8 @@ in
deno = callPackage ../development/web/deno {
inherit (darwin) libobjc;
- inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation;
+ inherit (darwin.apple_sdk.frameworks)
+ Security CoreServices Metal Foundation QuartzCore;
};
detox = callPackage ../tools/misc/detox { };
@@ -3902,11 +3973,15 @@ in
diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };
- diffoscope = callPackage ../tools/misc/diffoscope {
+ diffoscopeMinimal = callPackage ../tools/misc/diffoscope {
inherit (androidenv.androidPkgs_9_0) build-tools;
jdk = jdk8;
};
+ diffoscope = diffoscopeMinimal.override {
+ enableBloat = true;
+ };
+
diffr = callPackage ../tools/text/diffr {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -4142,6 +4217,8 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
+ timeline = callPackage ../applications/office/timeline/default.nix { };
+
tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };
tsm-client-withGui = callPackage ../tools/backup/tsm-client { };
@@ -4183,7 +4260,7 @@ in
wallutils = callPackage ../tools/graphics/wallutils { };
wrangler = callPackage ../development/tools/wrangler {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
};
wsl-open = callPackage ../tools/misc/wsl-open { };
@@ -4371,6 +4448,8 @@ in
fakechroot = callPackage ../tools/system/fakechroot { };
+ fancy-motd = callPackage ../tools/system/fancy-motd { };
+
fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { };
fanficfare = callPackage ../tools/text/fanficfare { };
@@ -4458,7 +4537,9 @@ in
ferm = callPackage ../tools/networking/ferm { };
- ffsend = callPackage ../tools/misc/ffsend { };
+ ffsend = callPackage ../tools/misc/ffsend {
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit;
+ };
fgallery = callPackage ../tools/graphics/fgallery { };
@@ -4568,6 +4649,8 @@ in
flawfinder = callPackage ../development/tools/flawfinder { };
+ flip-link = callPackage ../development/tools/flip-link { };
+
flips = callPackage ../tools/compression/flips { };
fmbt = callPackage ../development/tools/fmbt {
@@ -4782,6 +4865,8 @@ in
ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { };
+ ghostunnel = callPackage ../tools/networking/ghostunnel { };
+
ghq = callPackage ../applications/version-management/git-and-tools/ghq { };
ghr = callPackage ../applications/version-management/git-and-tools/ghr { };
@@ -4977,19 +5062,14 @@ in
gitkraken = callPackage ../applications/version-management/gitkraken { };
- gitlab = callPackage ../applications/version-management/gitlab {
- ruby = ruby_2_7;
- };
+ gitlab = callPackage ../applications/version-management/gitlab { };
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 {
- ruby = ruby_2_7;
- };
+ gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
@@ -4997,9 +5077,7 @@ in
gitleaks = callPackage ../tools/security/gitleaks { };
- gitaly = callPackage ../applications/version-management/gitlab/gitaly {
- ruby = ruby_2_7;
- };
+ gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
gitstats = callPackage ../applications/version-management/gitstats { };
@@ -5091,10 +5169,9 @@ in
gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
- gnused = if !stdenv.hostPlatform.isWindows then
- callPackage ../tools/text/gnused { } # broken on Windows
- else
- gnused_422;
+ gnused = if !stdenv.hostPlatform.isWindows
+ then callPackage ../tools/text/gnused { } # broken on Windows
+ else gnused_422;
# This is an easy work-around for [:space:] problems.
gnused_422 = callPackage ../tools/text/gnused/422.nix { };
@@ -5309,6 +5386,8 @@ in
gtkperf = callPackage ../development/tools/misc/gtkperf { };
+ gtk-frdp = callPackage ../development/libraries/gtk-frdp {};
+
gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
@@ -5453,7 +5532,9 @@ in
hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };
- hdfview = callPackage ../tools/misc/hdfview { };
+ hdfview = callPackage ../tools/misc/hdfview {
+ hdf5 = hdf5_1_10;
+ };
hecate = callPackage ../applications/editors/hecate { };
@@ -5702,6 +5783,8 @@ in
netifd = callPackage ../tools/networking/netifd {};
+ ipinfo = callPackage ../tools/networking/ipinfo {};
+
ipscan = callPackage ../tools/security/ipscan { };
ipv6calc = callPackage ../tools/networking/ipv6calc {};
@@ -5809,6 +5892,8 @@ in
jq = callPackage ../development/tools/jq { };
+ jiq = callPackage ../development/tools/misc/jiq { };
+
jql = callPackage ../development/tools/jql { };
jo = callPackage ../development/tools/jo { };
@@ -5934,6 +6019,8 @@ in
kpcli = callPackage ../tools/security/kpcli { };
+ kratos = callPackage ../applications/misc/kratos { };
+
krename = libsForQt5.callPackage ../applications/misc/krename { };
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
@@ -5970,7 +6057,9 @@ in
ldc = callPackage ../development/compilers/ldc { };
- ldgallery = callPackage ../tools/graphics/ldgallery { };
+ ldgallery = callPackage ../tools/graphics/ldgallery {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
lbreakout2 = callPackage ../games/lbreakout2 { };
@@ -6157,6 +6246,8 @@ in
minidlna = callPackage ../tools/networking/minidlna { };
+ minipro = callPackage ../tools/misc/minipro { };
+
minisign = callPackage ../tools/security/minisign { };
ministat = callPackage ../tools/misc/ministat { };
@@ -6175,6 +6266,8 @@ in
multitail = callPackage ../tools/misc/multitail { };
+ mx-puppet-discord = callPackage ../servers/mx-puppet-discord { };
+
mxt-app = callPackage ../misc/mxt-app { };
naabu = callPackage ../tools/security/naabu { };
@@ -6240,10 +6333,6 @@ in
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {
enableNpm = false;
};
- nodejs-15_x = callPackage ../development/web/nodejs/v15.nix { };
- nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix {
- enableNpm = false;
- };
nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { };
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
@@ -6351,7 +6440,7 @@ in
libite = callPackage ../development/libraries/libite { };
liblangtag = callPackage ../development/libraries/liblangtag {
- inherit (gnome3) gnome-common;
+ inherit (gnome) gnome-common;
};
liblouis = callPackage ../development/libraries/liblouis { };
@@ -6408,6 +6497,8 @@ in
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
+ libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
+
libmpack = callPackage ../development/libraries/libmpack { };
libiberty = callPackage ../development/libraries/libiberty { };
@@ -6511,7 +6602,9 @@ in
macchanger = callPackage ../os-specific/linux/macchanger { };
- macchina = callPackage ../tools/misc/macchina { };
+ macchina = callPackage ../tools/misc/macchina {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
madlang = haskell.lib.justStaticExecutables haskellPackages.madlang;
@@ -6561,6 +6654,11 @@ in
mandoc = callPackage ../tools/misc/mandoc { };
+ mangohud = callPackage ../tools/graphics/mangohud {
+ libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+ mangohud32 = pkgsi686Linux.mangohud;
+ };
+
manix = callPackage ../tools/nix/manix {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -6968,6 +7066,11 @@ in
inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or false;
};
+ nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix {
+ buildGoPackage = buildGo116Package;
+ inherit (linuxPackages) nvidia_x11;
+ nvidiaGpuSupport = config.cudaSupport or false;
+ };
nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
@@ -6975,6 +7078,8 @@ in
ntlmrecon = callPackage ../tools/security/ntlmrecon { };
+ numberstation = callPackage ../applications/misc/numberstation { };
+
nvchecker = with python3Packages; toPythonApplication nvchecker;
miller = callPackage ../tools/text/miller { };
@@ -7100,11 +7205,18 @@ in
nylon = callPackage ../tools/networking/nylon { };
- nym = callPackage ../applications/networking/nym { };
+ nym = callPackage ../applications/networking/nym {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
nzbget = callPackage ../tools/networking/nzbget { };
- nzbhydra2 = callPackage ../servers/nzbhydra2 { };
+ nzbhydra2 = callPackage ../servers/nzbhydra2 {
+ # You need Java (at least 8, at most 15)
+ # https://github.com/theotherp/nzbhydra2/issues/697
+ # https://github.com/theotherp/nzbhydra2/#how-to-run
+ jre = openjdk11;
+ };
oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
@@ -7175,8 +7287,8 @@ in
onlykey-cli = callPackage ../tools/security/onlykey-cli { };
- openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
- openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { };
+ openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
+ openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
openbazaar = callPackage ../applications/networking/openbazaar { };
openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };
@@ -7256,6 +7368,8 @@ in
opensp = callPackage ../tools/text/sgml/opensp { };
+ opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };
+
opentracker = callPackage ../applications/networking/p2p/opentracker { };
opentsdb = callPackage ../tools/misc/opentsdb {};
@@ -7422,6 +7536,8 @@ in
pitivi = callPackage ../applications/video/pitivi { };
+ prism = callPackage ../applications/video/prism { };
+
pulumi-bin = callPackage ../tools/admin/pulumi { };
p0f = callPackage ../tools/security/p0f { };
@@ -7527,10 +7643,16 @@ in
philter = callPackage ../tools/networking/philter { };
+ phoc = callPackage ../applications/misc/phoc {
+ wlroots = wlroots_0_12;
+ };
+
phodav = callPackage ../tools/networking/phodav { };
pim6sd = callPackage ../servers/pim6sd { };
+ phosh = callPackage ../applications/window-managers/phosh { };
+
pinentry = libsForQt5.callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
};
@@ -7725,6 +7847,8 @@ in
polygraph = callPackage ../tools/networking/polygraph { };
+ pr-tracker = callPackage ../servers/pr-tracker { };
+
progress = callPackage ../tools/misc/progress { };
ps3netsrv = callPackage ../servers/ps3netsrv { };
@@ -7761,6 +7885,8 @@ in
pycangjie = pythonPackages.pycangjie;
+ pycflow2dot = with python.pkgs; toPythonApplication pycflow2dot;
+
pydb = callPackage ../development/tools/pydb { };
pydf = callPackage ../applications/misc/pydf { };
@@ -7821,6 +7947,8 @@ in
qnial = callPackage ../development/interpreters/qnial { };
+ quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
+
ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
@@ -8086,6 +8214,8 @@ in
rrdtool = callPackage ../tools/misc/rrdtool { };
+ rset = callPackage ../tools/admin/rset { };
+
rshijack = callPackage ../tools/networking/rshijack { };
rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };
@@ -8100,9 +8230,11 @@ in
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
+ rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
+
rubber = callPackage ../tools/typesetting/rubber { };
- rubocop = callPackage ../development/tools/rubocop { };
+ rubocop = rubyPackages.rubocop;
ruffle = callPackage ../misc/emulators/ruffle { };
@@ -8196,9 +8328,7 @@ in
scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { };
- scream-receivers = callPackage ../misc/scream-receivers {
- pulseSupport = config.pulseaudio or false;
- };
+ scream = callPackage ../applications/audio/scream { };
scimark = callPackage ../misc/scimark { };
@@ -8212,16 +8342,10 @@ in
screen-message = callPackage ../tools/X11/screen-message { };
- screencloud = callPackage ../applications/graphics/screencloud {
- quazip = quazip_qt4;
- };
+ screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
screenkey = callPackage ../applications/video/screenkey { };
- quazip_qt4 = libsForQt5.quazip.override {
- qtbase = qt4;
- };
-
scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
scriptaculous = callPackage ../development/libraries/scriptaculous { };
@@ -8429,6 +8553,8 @@ in
snapcast = callPackage ../applications/audio/snapcast { };
+ snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { };
+
sng = callPackage ../tools/graphics/sng {
libpng = libpng12;
};
@@ -8524,7 +8650,7 @@ in
spacebar = callPackage ../os-specific/darwin/spacebar {
inherit (darwin.apple_sdk.frameworks)
- Carbon Cocoa ScriptingBridge;
+ Carbon Cocoa ScriptingBridge SkyLight;
};
spaceFM = callPackage ../applications/misc/spacefm { };
@@ -8638,9 +8764,7 @@ in
stunnel = callPackage ../tools/networking/stunnel { };
- stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: {
- preCheck = "export PATH=dist/build/stutter:$PATH";
- });
+ stutter = haskell.lib.justStaticExecutables haskellPackages.stutter;
strongswan = callPackage ../tools/networking/strongswan { };
strongswanTNC = strongswan.override { enableTNC = true; };
@@ -8777,6 +8901,8 @@ in
pythonPackages = python3Packages;
};
+ telepresence2 = callPackage ../tools/networking/telepresence2 { };
+
teler = callPackage ../tools/security/teler { };
termius = callPackage ../applications/networking/termius { };
@@ -8961,10 +9087,14 @@ in
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
- trunk = callPackage ../development/tools/trunk { };
+ trunk = callPackage ../development/tools/trunk {
+ inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+ };
tthsum = callPackage ../applications/misc/tthsum { };
+ ttp = with python3.pkgs; toPythonApplication ttp;
+
chaps = callPackage ../tools/security/chaps { };
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
@@ -9412,7 +9542,9 @@ in
tre = callPackage ../development/libraries/tre { };
- tremor-rs = callPackage ../tools/misc/tremor-rs { };
+ tremor-rs = callPackage ../tools/misc/tremor-rs {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
ts = callPackage ../tools/system/ts { };
@@ -9562,7 +9694,9 @@ in
waf = callPackage ../development/tools/build-managers/waf { python = python3; };
wafHook = callPackage ../development/tools/build-managers/wafHook { };
- wagyu = callPackage ../tools/misc/wagyu { };
+ wagyu = callPackage ../tools/misc/wagyu {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
wakelan = callPackage ../tools/networking/wakelan { };
@@ -9600,7 +9734,10 @@ in
whsniff = callPackage ../applications/networking/sniffers/whsniff { };
- wiiuse = callPackage ../development/libraries/wiiuse { };
+ wiiuse = callPackage ../development/libraries/wiiuse {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
+ };
woeusb = callPackage ../tools/misc/woeusb { };
@@ -9626,6 +9763,8 @@ in
wpgtk = callPackage ../tools/X11/wpgtk { };
+ wrap = callPackage ../tools/text/wrap { };
+
wring = nodePackages.wring;
wrk = callPackage ../tools/networking/wrk { };
@@ -9731,7 +9870,7 @@ in
xxv = callPackage ../tools/misc/xxv {};
- xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
+ xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
xvkbd = callPackage ../tools/X11/xvkbd {};
@@ -9866,6 +10005,8 @@ in
zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { };
+ zsh-z = callPackage ../shells/zsh/zsh-z { };
+
zssh = callPackage ../tools/networking/zssh { };
zstd = callPackage ../tools/compression/zstd {
@@ -9905,6 +10046,8 @@ in
nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
+ undistract-me = callPackage ../shells/bash/undistract-me { };
+
dash = callPackage ../shells/dash { };
dasht = callPackage ../tools/misc/dasht { };
@@ -10098,12 +10241,9 @@ in
ats = callPackage ../development/compilers/ats { };
ats2 = callPackage ../development/compilers/ats2 { };
- avra = callPackage ../development/compilers/avra { };
+ ats-acc = callPackage ../development/tools/ats-acc { };
- avian = callPackage ../development/compilers/avian {
- inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ avra = callPackage ../development/compilers/avra { };
bigloo = callPackage ../development/compilers/bigloo { };
@@ -10155,6 +10295,7 @@ in
chez-matchable = callPackage ../development/chez-modules/chez-matchable { };
clang = llvmPackages.clang;
+ libclang = llvmPackages.libclang;
clang-manpages = llvmPackages.clang-manpages;
clang-sierraHack = clang.override {
@@ -10297,13 +10438,24 @@ in
if stdenv.targetPlatform.isAarch64 then gcc9 else gcc10;
gcc-unwrapped = gcc.cc;
- gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
- allowedRequisites = null;
- cc = gcc;
- # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses
- # clang's internal assembler).
- extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
- };
+ wrapNonDeterministicGcc = stdenv: ccWrapper:
+ if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
+ cc = old.cc.override {
+ reproducibleBuild = false;
+ profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ };
+ }) else ccWrapper;
+
+ gccStdenv =
+ if stdenv.cc.isGNU
+ then stdenv
+ else stdenv.override {
+ cc = buildPackages.gcc;
+ allowedRequisites = null;
+ # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses
+ # clang's internal assembler).
+ extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
+ };
gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49;
gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;
@@ -10311,6 +10463,12 @@ in
gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
+ gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
+
+ # This is not intended for use in nixpkgs but for providing a faster-running
+ # compiler to nixpkgs users by building gcc with reproducibility-breaking
+ # profile-guided optimizations
+ fastStdenv = overrideCC gccStdenv (wrapNonDeterministicGcc gccStdenv buildPackages.gcc10);
wrapCCMulti = cc:
if stdenv.targetPlatform.system == "x86_64-linux" then let
@@ -10355,39 +10513,35 @@ in
stripped = false;
}));
- crossLibcStdenv = overrideCC stdenv
- (if stdenv.hostPlatform.useLLVM or false
- then buildPackages.llvmPackages_8.lldClangNoLibc
- else buildPackages.gccCrossStageStatic);
+ gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
+
+ crossLibcStdenv =
+ if stdenv.hostPlatform.useLLVM or false
+ then overrideCC stdenv buildPackages.llvmPackages_8.lldClangNoLibc
+ else gccCrossLibcStdenv;
# The GCC used to build libc for the target platform. Normal gccs will be
# built with, and use, that cross-compiled libc.
gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let
- libcCross1 =
- if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers
- else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode
- else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers
- else null;
- binutils1 = wrapBintoolsWith {
- bintools = binutils-unwrapped;
- libc = libcCross1;
- };
+ libcCross1 = binutilsNoLibc.libc;
in wrapCCWith {
cc = gccFun {
# copy-pasted
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+ reproducibleBuild = true;
+ profiledCompiler = false;
+
isl = if !stdenv.isDarwin then isl_0_20 else null;
# just for stage static
crossStageStatic = true;
langCC = false;
libcCross = libcCross1;
- targetPackages.stdenv.cc.bintools = binutils1;
+ targetPackages.stdenv.cc.bintools = binutilsNoLibc;
enableShared = false;
};
- bintools = binutils1;
+ bintools = binutilsNoLibc;
libc = libcCross1;
extraPackages = [];
};
@@ -10395,8 +10549,8 @@ in
gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
@@ -10409,8 +10563,8 @@ in
gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
@@ -10423,8 +10577,8 @@ in
gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
@@ -10442,8 +10596,8 @@ in
gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
@@ -10457,8 +10611,8 @@ in
gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
@@ -10472,8 +10626,8 @@ in
gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
enableLTO = !stdenv.isi686;
@@ -10486,8 +10640,22 @@ in
gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 {
inherit noSysDirs;
- # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
- profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+ reproducibleBuild = true;
+ profiledCompiler = false;
+
+ enableLTO = !stdenv.isi686;
+
+ 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_20 else null;
+ }));
+
+ gcc11 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/11 {
+ inherit noSysDirs;
+
+ reproducibleBuild = true;
+ profiledCompiler = false;
enableLTO = !stdenv.isi686;
@@ -10497,7 +10665,7 @@ in
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
- gcc_latest = gcc10;
+ gcc_latest = gcc11;
gfortran = gfortran9;
@@ -10557,6 +10725,14 @@ in
profiledCompiler = false;
});
+ gfortran11 = wrapCC (gcc11.cc.override {
+ name = "gfortran";
+ langFortran = true;
+ langCC = false;
+ langC = false;
+ profiledCompiler = false;
+ });
+
libgccjit = gcc.cc.override {
name = "libgccjit";
langFortran = false;
@@ -10608,6 +10784,15 @@ in
gnatboot = gnat6;
});
+ gnat11 = wrapCC (gcc11.cc.override {
+ name = "gnat";
+ langC = true;
+ langCC = false;
+ langAda = true;
+ profiledCompiler = false;
+ gnatboot = gnat6;
+ });
+
gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { });
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
@@ -10729,7 +10914,7 @@ in
fsharp = callPackage ../development/compilers/fsharp { };
- fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
+ fsharp41 = callPackage ../development/compilers/fsharp41 { };
fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
@@ -10985,21 +11170,24 @@ in
julia_10 = callPackage ../development/compilers/julia/1.0.nix {
gmp = gmp6;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
libgit2 = libgit2_0_27;
};
- julia_13 = callPackage ../development/compilers/julia/1.3.nix {
- gmp = gmp6;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
- };
-
julia_15 = callPackage ../development/compilers/julia/1.5.nix {
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};
- julia_1 = julia_10;
- julia = julia_15;
+ julia-lts = julia_10;
+ julia-stable = julia_15;
+ julia = julia-lts;
+
+ julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { };
+ julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
+
+ julia-lts-bin = julia_10-bin;
+ julia-stable-bin = julia_16-bin;
+ julia-bin = julia-lts-bin;
jwasm = callPackage ../development/compilers/jwasm { };
@@ -11067,6 +11255,7 @@ in
lldb_12 = llvmPackages_12.lldb;
llvm = llvmPackages.llvm;
+ libllvm = llvmPackages.libllvm;
llvm-manpages = llvmPackages.llvm-manpages;
llvm_12 = llvmPackages_12.llvm;
@@ -11123,7 +11312,7 @@ in
llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_10.tools;
- targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
+ targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries;
});
llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
@@ -11161,15 +11350,15 @@ in
mint = callPackage ../development/compilers/mint { };
mitscheme = callPackage ../development/compilers/mit-scheme {
- texLive = texlive.combine { inherit (texlive) scheme-small; };
- texinfo = texinfo5;
- xlibsWrapper = null;
+ texLive = texlive.combine { inherit (texlive) scheme-small; };
+ texinfo = texinfo5;
+ xlibsWrapper = null;
};
mitschemeX11 = mitscheme.override {
- texLive = texlive.combine { inherit (texlive) scheme-small; };
- texinfo = texinfo5;
- enableX11 = true;
+ texLive = texlive.combine { inherit (texlive) scheme-small; };
+ texinfo = texinfo5;
+ enableX11 = true;
};
miranda = callPackage ../development/compilers/miranda {};
@@ -11186,7 +11375,7 @@ in
mlton = mlton20180207;
- mono = mono5;
+ mono = mono6;
mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix {
inherit (darwin) libobjc;
@@ -11205,9 +11394,9 @@ in
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
- roslyn = callPackage ../development/compilers/roslyn { mono = mono6; };
+ roslyn = callPackage ../development/compilers/roslyn { };
- msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; };
+ msbuild = callPackage ../development/tools/build-managers/msbuild { };
mosml = callPackage ../development/compilers/mosml { };
@@ -11348,9 +11537,11 @@ in
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ llvm_10 = llvmPackages_10.libllvm;
};
rust_1_51 = callPackage ../development/compilers/rust/1_51.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ llvm_11 = llvmPackages_11.libllvm;
};
rust = rust_1_51;
@@ -11406,6 +11597,7 @@ in
cargo-release = callPackage ../tools/package-management/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
};
+ cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
cargo-update = callPackage ../tools/package-management/cargo-update {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -11429,7 +11621,9 @@ in
cargo-embed = callPackage ../development/tools/rust/cargo-embed { };
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
- cargo-flash = callPackage ../development/tools/rust/cargo-flash { };
+ cargo-flash = callPackage ../development/tools/rust/cargo-flash {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -11446,6 +11640,9 @@ in
cargo-make = callPackage ../development/tools/rust/cargo-make {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
+ cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
cargo-play = callPackage ../development/tools/rust/cargo-play { };
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -11499,6 +11696,9 @@ in
rustup = callPackage ../development/tools/rust/rustup {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
+ rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {};
@@ -11509,6 +11709,8 @@ in
sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {};
sbcl = sbcl_2_1_2;
+ roswell = callPackage ../development/tools/roswell/default.nix { };
+
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; };
@@ -11528,6 +11730,8 @@ in
gputils = null;
};
+ seren = callPackage ../applications/networking/instant-messengers/seren { };
+
serialdv = callPackage ../development/libraries/serialdv { };
serpent = callPackage ../development/compilers/serpent { };
@@ -11539,9 +11743,7 @@ in
smlpkg = callPackage ../tools/package-management/smlpkg { };
- solc = solc_0_8;
- solc_0_8 = callPackage ../development/compilers/solc { };
- solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { };
+ solc = callPackage ../development/compilers/solc { };
souffle = callPackage ../development/compilers/souffle {
autoreconfHook = buildPackages.autoreconfHook269;
@@ -11611,7 +11813,9 @@ in
urn = callPackage ../development/compilers/urn { };
- urweb = callPackage ../development/compilers/urweb { };
+ urweb = callPackage ../development/compilers/urweb {
+ icu = icu67;
+ };
vlang = callPackage ../development/compilers/vlang { };
@@ -11624,6 +11828,7 @@ in
vala_0_46
vala_0_48
vala_0_50
+ vala_0_52
vala;
vyper = with python3Packages; toPythonApplication vyper;
@@ -11753,14 +11958,14 @@ in
duktape = callPackage ../development/interpreters/duktape { };
evcxr = callPackage ../development/interpreters/evcxr {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
beam = callPackage ./beam-packages.nix { };
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
inherit (beam.interpreters)
- erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
+ erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
elixir_ls;
@@ -11768,7 +11973,8 @@ in
erlang_nox = beam_nox.interpreters.erlang;
inherit (beam.packages.erlang)
- rebar rebar3
+ erlang-ls
+ rebar rebar3 rebar3WithPlugins
fetchHex beamPackages
relxExe;
@@ -11790,7 +11996,9 @@ in
io = callPackage ../development/interpreters/io { };
- j = callPackage ../development/interpreters/j {};
+ j = callPackage ../development/interpreters/j {
+ stdenv = clangStdenv;
+ };
janet = callPackage ../development/interpreters/janet {};
@@ -12029,6 +12237,8 @@ in
pypy27Packages = pypy27.pkgs;
pypy3Packages = pypy3.pkgs;
+ py3c = callPackage ../development/libraries/py3c { };
+
pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };
@@ -12129,8 +12339,8 @@ in
ruby_2_7
ruby_3_0;
- ruby = ruby_2_6;
- rubyPackages = rubyPackages_2_6;
+ ruby = ruby_2_7;
+ rubyPackages = rubyPackages_2_7;
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
@@ -12148,7 +12358,6 @@ in
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
- spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
@@ -12254,6 +12463,9 @@ in
newlib = newlibCross;
};
+ mspds = callPackage ../development/misc/msp430/mspds { };
+ mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { };
+
mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {};
@@ -12298,6 +12510,8 @@ in
alloy5
alloy;
+ altair = callPackage ../development/tools/altair-graphql-client { };
+
ameba = callPackage ../development/tools/ameba { };
augeas = callPackage ../tools/system/augeas { };
@@ -12478,6 +12692,14 @@ in
gold = false;
};
});
+ binutilsNoLibc = wrapBintoolsWith {
+ bintools = binutils-unwrapped;
+ libc =
+ /**/ if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers
+ else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode
+ else if stdenv.targetPlatform.libc == "nblibc" then targetPackages.netbsdCross.headers
+ else null;
+ };
bison = callPackage ../development/tools/parsing/bison { };
@@ -12520,7 +12742,7 @@ in
libbpf = callPackage ../os-specific/linux/libbpf { };
- bpftool = callPackage ../os-specific/linux/bpftool { };
+ bpftools = callPackage ../os-specific/linux/bpftools { };
bpm-tools = callPackage ../tools/audio/bpm-tools { };
@@ -12569,12 +12791,12 @@ in
inherit (stdenv) cc;
};
- ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }:
- overrideCC stdenv (buildPackages.ccacheWrapper.override {
- inherit extraConfig;
+ ccacheStdenv = lowPrio (makeOverridable ({ stdenv, ... } @ extraArgs:
+ overrideCC stdenv (buildPackages.ccacheWrapper.override ({
inherit (stdenv) cc;
- })) {
- extraConfig = "";
+ } // lib.optionalAttrs (builtins.hasAttr "extraConfig" extraArgs) {
+ extraConfig = extraArgs.extraConfig;
+ }))) {
inherit stdenv;
});
@@ -12647,7 +12869,6 @@ in
cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { withQt5 = true; };
- cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; };
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
@@ -12683,7 +12904,7 @@ in
credstash = with python3Packages; toPythonApplication credstash;
creduce = callPackage ../development/tools/misc/creduce {
- inherit (llvmPackages_7) llvm clang-unwrapped;
+ inherit (llvmPackages_7) llvm libclang;
};
cscope = callPackage ../development/tools/misc/cscope { };
@@ -12695,7 +12916,7 @@ in
css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
- inherit (llvmPackages_11) llvm clang-unwrapped;
+ inherit (llvmPackages_11) llvm libclang;
};
libcxx = llvmPackages.libcxx;
@@ -12773,7 +12994,7 @@ in
# };
#
distccWrapper = makeOverridable ({ extraConfig ? "" }:
- wrapCC (distcc.links extraConfig)) {};
+ wrapCC (distcc.links extraConfig)) {};
distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper);
distccMasquerade = if stdenv.isDarwin
@@ -12930,6 +13151,8 @@ in
gnome-usage = callPackage ../applications/misc/gnome-usage {};
+ gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { };
+
gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };
@@ -13158,7 +13381,10 @@ in
lttv = callPackage ../development/tools/misc/lttv { };
- luaformatter = callPackage ../development/tools/luaformatter { };
+ luaformatter = callPackage ../development/tools/luaformatter
+ (lib.optionalAttrs stdenv.isDarwin {
+ stdenv = overrideCC stdenv llvmPackages_latest.clang;
+ });
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
@@ -13215,6 +13441,8 @@ in
ninja = callPackage ../development/tools/build-managers/ninja { };
+ nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
+
gn = callPackage ../development/tools/build-managers/gn { };
nixbang = callPackage ../development/tools/misc/nixbang {
@@ -13262,7 +13490,9 @@ in
libiberty_static = libiberty.override { staticBuild = true; };
};
- pactorio = callPackage ../development/tools/pactorio { };
+ pactorio = callPackage ../development/tools/pactorio {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
pahole = callPackage ../development/tools/misc/pahole {};
@@ -13391,6 +13621,8 @@ in
remake = callPackage ../development/tools/build-managers/remake { };
+ replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { };
+
replacement = callPackage ../development/tools/misc/replacement { };
retdec = callPackage ../development/tools/analysis/retdec {
@@ -13432,7 +13664,9 @@ in
sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
scons = sconsPackages.scons_latest;
- mill = callPackage ../development/tools/build-managers/mill { };
+ mill = callPackage ../development/tools/build-managers/mill {
+ jre = jre8;
+ };
sbt = callPackage ../development/tools/build-managers/sbt { };
sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
@@ -13594,7 +13828,7 @@ in
texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
texlab = callPackage ../development/tools/misc/texlab {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
tflint = callPackage ../development/tools/analysis/tflint { };
@@ -13650,7 +13884,7 @@ in
gdb = callPackage ../development/tools/misc/gdb {
guile = null;
- readline = readline80;
+ readline = readline81;
};
jhiccup = callPackage ../development/tools/java/jhiccup { };
@@ -13900,7 +14134,7 @@ in
belr = callPackage ../development/libraries/belr { };
beignet = callPackage ../development/libraries/beignet {
- inherit (llvmPackages_6) llvm clang-unwrapped;
+ inherit (llvmPackages_6) libllvm libclang;
};
belle-sip = callPackage ../development/libraries/belle-sip { };
@@ -14001,6 +14235,8 @@ in
cimg = callPackage ../development/libraries/cimg { };
+ cjose = callPackage ../development/libraries/cjose { };
+
scmccid = callPackage ../development/libraries/scmccid { };
ccrtp = callPackage ../development/libraries/ccrtp { };
@@ -14044,6 +14280,8 @@ in
cl = callPackage ../development/libraries/cl { };
+ clanlib = callPackage ../development/libraries/clanlib { };
+
classads = callPackage ../development/libraries/classads { };
clearsilver = callPackage ../development/libraries/clearsilver { };
@@ -14305,6 +14543,8 @@ in
fcgi = callPackage ../development/libraries/fcgi { };
+ fcl = callPackage ../development/libraries/fcl { };
+
ffcast = callPackage ../tools/X11/ffcast { };
fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { };
@@ -14527,6 +14767,8 @@ in
givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
+ ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {};
+
ghp-import = with python3Packages; toPythonApplication ghp-import;
ghcid = haskellPackages.ghcid.bin;
@@ -14576,7 +14818,9 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
};
- glibc = callPackage ../development/libraries/glibc { };
+ glibc = callPackage ../development/libraries/glibc {
+ stdenv = gccStdenv; # doesn't compile without gcc
+ };
# Provided by libc on Operating Systems that use the Extensible Linker Format.
elf-header =
@@ -14592,7 +14836,7 @@ in
# Being redundant to avoid cycles on boot. TODO: find a better way
glibcCross = callPackage ../development/libraries/glibc {
- stdenv = crossLibcStdenv;
+ stdenv = gccCrossLibcStdenv; # doesn't compile without gcc
};
muslCross = musl.override {
@@ -14615,7 +14859,7 @@ in
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
else if name == "libSystem" then targetPackages.darwin.xcode
- else if name == "nblibc" then targetPackages.netbsdCross.libc
+ else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc
else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
else if name == "relibc" then targetPackages.relibc or relibc
else if stdenv.targetPlatform.isGhcjs then null
@@ -14657,7 +14901,6 @@ in
glsurf = callPackage ../applications/science/math/glsurf {
libpng = libpng12;
- giflib = giflib_4_1;
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
};
@@ -14792,6 +15035,10 @@ in
glibmm = callPackage ../development/libraries/glibmm { };
+ glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix {
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
+
glib-networking = callPackage ../development/libraries/glib-networking {};
glib-testing = callPackage ../development/libraries/glib-testing { };
@@ -14812,6 +15059,10 @@ in
cairomm = callPackage ../development/libraries/cairomm { };
+ cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+ };
+
pango = callPackage ../development/libraries/pango {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
};
@@ -14824,6 +15075,10 @@ in
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
+ pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix {
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+ };
+
gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
@@ -14864,6 +15119,7 @@ in
gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
+ gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { };
gtk_engines = callPackage ../development/libraries/gtk-engines { };
@@ -14903,6 +15159,8 @@ in
gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
+ gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { };
+
gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { };
gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { };
@@ -14993,6 +15251,10 @@ in
hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
+ hunter = callPackage ../applications/misc/hunter {
+ inherit (darwin.apple_sdk.frameworks) CoreServices IOKit Security;
+ };
+
hwloc = callPackage ../development/libraries/hwloc {};
inherit (callPackage ../development/tools/misc/hydra { })
@@ -15059,8 +15321,13 @@ in
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}));
+ icu69 = callPackage ../development/libraries/icu/69.nix ({
+ nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
+ } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+ }));
- icu = icu68;
+ icu = icu69;
id3lib = callPackage ../development/libraries/id3lib { };
@@ -15098,7 +15365,6 @@ in
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
indilib = callPackage ../development/libraries/science/astronomy/indilib { };
- indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { };
indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { };
inih = callPackage ../development/libraries/inih { };
@@ -15256,7 +15522,11 @@ in
libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
- libacr38u = callPackage ../tools/security/libacr38u { };
+ libacr38u = callPackage ../tools/security/libacr38u {
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
+
+ libadwaita = callPackage ../development/libraries/libadwaita { };
libaec = callPackage ../development/libraries/libaec { };
@@ -15367,6 +15637,8 @@ in
libcbor = callPackage ../development/libraries/libcbor { };
+ libccd = callPackage ../development/libraries/libccd { };
+
libcec = callPackage ../development/libraries/libcec {
libraspberrypi = null;
};
@@ -15472,6 +15744,8 @@ in
libdeflate = callPackage ../development/libraries/libdeflate { };
+ libdeltachat = callPackage ../development/libraries/libdeltachat { };
+
libdevil = callPackage ../development/libraries/libdevil {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
@@ -15592,7 +15866,7 @@ in
libgig = callPackage ../development/libraries/libgig { };
libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { };
- libgnome-keyring3 = gnome3.libgnome-keyring;
+ libgnome-keyring3 = gnome.libgnome-keyring;
libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
@@ -15889,8 +16163,8 @@ in
libiconv =
if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]
then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
- then libcCross
- else stdenv.cc.libc)
+ then libcCross
+ else stdenv.cc.libc)
else if stdenv.hostPlatform.isDarwin
then darwin.libiconv
else libiconvReal;
@@ -16094,7 +16368,7 @@ in
libopusenc = callPackage ../development/libraries/libopusenc { };
libosinfo = callPackage ../development/libraries/libosinfo {
- inherit (gnome3) libsoup;
+ inherit (gnome) libsoup;
};
libosip = callPackage ../development/libraries/osip {};
@@ -16158,14 +16432,17 @@ in
libpwquality = callPackage ../development/libraries/libpwquality { };
libqalculate = callPackage ../development/libraries/libqalculate {
- readline = readline80;
+ readline = readline81;
};
libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
libroxml = callPackage ../development/libraries/libroxml { };
- librsvg = callPackage ../development/libraries/librsvg { };
+ librsvg = callPackage ../development/libraries/librsvg {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
+ };
librsync = callPackage ../development/libraries/librsync { };
@@ -16183,6 +16460,8 @@ in
libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
+ libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };
+
libsigsegv = callPackage ../development/libraries/libsigsegv { };
libslirp = callPackage ../development/libraries/libslirp { };
@@ -16303,13 +16582,10 @@ in
libwhereami = callPackage ../development/libraries/libwhereami { };
- giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
giflib = callPackage ../development/libraries/giflib { };
libunarr = callPackage ../development/libraries/libunarr { };
- libungif = callPackage ../development/libraries/giflib/libungif.nix { };
-
libunibreak = callPackage ../development/libraries/libunibreak { };
libuninameslist = callPackage ../development/libraries/libuninameslist { };
@@ -16372,7 +16648,9 @@ in
libvmaf = callPackage ../development/libraries/libvmaf { };
- libvncserver = callPackage ../development/libraries/libvncserver {};
+ libvncserver = callPackage ../development/libraries/libvncserver {
+ inherit (darwin.apple_sdk.frameworks) Carbon;
+ };
libviper = callPackage ../development/libraries/libviper { };
@@ -16619,6 +16897,10 @@ in
mono-addins = callPackage ../development/libraries/mono-addins { };
+ movine = callPackage ../development/tools/database/movine {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
movit = callPackage ../development/libraries/movit { };
mosquitto = callPackage ../servers/mqtt/mosquitto { };
@@ -16639,7 +16921,9 @@ in
libmpc = callPackage ../development/libraries/libmpc { };
- mpich = callPackage ../development/libraries/mpich { };
+ mpich = callPackage ../development/libraries/mpich {
+ ch4backend = libfabric;
+ };
mstpd = callPackage ../os-specific/linux/mstpd { };
@@ -16692,7 +16976,7 @@ in
notify-sharp = callPackage ../development/libraries/notify-sharp { };
notcurses = callPackage ../development/libraries/notcurses {
- readline = readline80;
+ readline = readline81;
};
ncurses5 = ncurses.override {
@@ -16746,7 +17030,6 @@ in
};
nss = lowPrio (callPackage ../development/libraries/nss { });
- nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
nssTools = nss.tools;
# required for stable thunderbird and firefox-esr-78
@@ -16905,6 +17188,8 @@ in
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation;
};
+ openslide = callPackage ../development/libraries/openslide { };
+
openslp = callPackage ../development/libraries/openslp {};
openvdb = callPackage ../development/libraries/openvdb {};
@@ -16977,7 +17262,9 @@ in
pe-parse = callPackage ../development/libraries/pe-parse { };
- inherit (callPackage ../development/libraries/physfs { })
+ inherit (callPackage ../development/libraries/physfs {
+ inherit (darwin.apple_sdk.frameworks) Foundation Carbon;
+ })
physfs_2
physfs;
@@ -17032,6 +17319,8 @@ in
portmidi = callPackage ../development/libraries/portmidi {};
+ presage = callPackage ../development/libraries/presage { };
+
prime-server = callPackage ../development/libraries/prime-server { };
primesieve = callPackage ../development/libraries/science/math/primesieve { };
@@ -17051,8 +17340,9 @@ in
python = python37;
};
- protobuf = protobuf3_15;
+ protobuf = protobuf3_16;
+ protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { };
protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { };
protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
@@ -17085,8 +17375,6 @@ in
pugixml = callPackage ../development/libraries/pugixml { };
- pybind11 = pythonPackages.pybind11;
-
pylode = callPackage ../misc/pylode {};
python-qt = callPackage ../development/libraries/python-qt {
@@ -17259,7 +17547,7 @@ in
readline70 = callPackage ../development/libraries/readline/7.0.nix { };
- readline80 = callPackage ../development/libraries/readline/8.0.nix { };
+ readline81 = callPackage ../development/libraries/readline/8.1.nix { };
readosm = callPackage ../development/libraries/readosm { };
@@ -17336,13 +17624,13 @@ in
s2geometry = callPackage ../development/libraries/s2geometry { };
- /* This package references ghc844, which we no longer have. Unfortunately, I
- have been unable to mark it as "broken" in a way that the ofBorg bot
- recognizes. Since I don't want to merge code into master that generates
- evaluation errors, I have no other idea but to comment it out entirely.
+ /* This package references ghc844, which we no longer have. Unfortunately, I
+ have been unable to mark it as "broken" in a way that the ofBorg bot
+ recognizes. Since I don't want to merge code into master that generates
+ evaluation errors, I have no other idea but to comment it out entirely.
sad = callPackage ../applications/science/logic/sad { };
- */
+ */
safefile = callPackage ../development/libraries/safefile {};
@@ -17521,7 +17809,9 @@ in
socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
- sofia_sip = callPackage ../development/libraries/sofia-sip { };
+ sofia_sip = callPackage ../development/libraries/sofia-sip {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ };
soil = callPackage ../development/libraries/soil {
inherit (darwin.apple_sdk.frameworks) Carbon;
@@ -17560,6 +17850,8 @@ in
sphinx = with python3Packages; toPythonApplication sphinx;
+ sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild;
+
sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
sphinxbase = callPackage ../development/libraries/sphinxbase { };
@@ -17819,6 +18111,8 @@ in
ustr = callPackage ../development/libraries/ustr { };
+ usrsctp = callPackage ../development/libraries/usrsctp { };
+
usbredir = callPackage ../development/libraries/usbredir { };
uthash = callPackage ../development/libraries/uthash { };
@@ -18048,7 +18342,7 @@ in
xed = callPackage ../development/libraries/xed { };
- xineLib = callPackage ../development/libraries/xine-lib { };
+ xine-lib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { };
@@ -18078,6 +18372,8 @@ in
xlslib = callPackage ../development/libraries/xlslib { };
+ xsimd = callPackage ../development/libraries/xsimd { };
+
xvidcore = callPackage ../development/libraries/xvidcore { };
xxHash = callPackage ../development/libraries/xxHash {};
@@ -18100,9 +18396,7 @@ in
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
- yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt {
- pythonPackages = python3Packages;
- };
+ yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
@@ -18495,21 +18789,14 @@ in
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
- couchdb = callPackage ../servers/http/couchdb {
- sphinx = python27Packages.sphinx;
- erlang = erlangR19;
- };
-
- couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
- erlang = erlangR21;
- };
-
couchdb3 = callPackage ../servers/http/couchdb/3.nix {
erlang = erlangR22;
};
couchpotato = callPackage ../servers/couchpotato {};
+ dendrite = callPackage ../servers/dendrite { };
+
dex-oidc = callPackage ../servers/dex { };
dex2jar = callPackage ../development/tools/java/dex2jar { };
@@ -18593,8 +18880,8 @@ in
fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
- firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ };
- firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ };
+ inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5;
+ firebird = firebird_3;
freeradius = callPackage ../servers/freeradius { };
@@ -18721,11 +19008,7 @@ in
mailman-web = with python3.pkgs; toPythonApplication mailman-web;
- mastodon = callPackage ../servers/mastodon {
- # With nodejs v14 the streaming endpoint breaks. Need migrate to uWebSockets.js or similar.
- # https://github.com/tootsuite/mastodon/issues/15184
- nodejs-slim = nodejs-slim-12_x;
- };
+ mastodon = callPackage ../servers/mastodon { };
materialize = callPackage ../servers/sql/materialize {
inherit (buildPackages.darwin) bootstrap_cmds;
@@ -18871,6 +19154,7 @@ in
opensmtpd = callPackage ../servers/mail/opensmtpd { };
opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
+ opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
openxpki = callPackage ../servers/openxpki { };
@@ -19052,10 +19336,19 @@ in
miniflux = callPackage ../servers/miniflux { };
- nagios = callPackage ../servers/monitoring/nagios { };
+ icinga2 = callPackage ../servers/monitoring/icinga2 { };
+
+ icinga2-agent = callPackage ../servers/monitoring/icinga2 {
+ nameSuffix = "-agent";
+ withMysql = false;
+ withNotification = false;
+ withIcingadb = false;
+ };
munin = callPackage ../servers/monitoring/munin { };
+ nagios = callPackage ../servers/monitoring/nagios { };
+
monitoring-plugins = callPackage ../servers/monitoring/plugins { };
inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { })
@@ -19135,9 +19428,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = callPackage ../servers/monitoring/prometheus {
- buildGoPackage = buildGo115Package;
- };
+ prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { };
@@ -19157,6 +19448,7 @@ in
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
+ prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { };
prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };
prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };
prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { };
@@ -19186,15 +19478,16 @@ in
prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
+ prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { };
prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
- prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix {
- pythonPackages = python3Packages;
- };
+ prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };
@@ -19233,6 +19526,8 @@ in
redstore = callPackage ../servers/http/redstore { };
+ reproxy = callPackage ../servers/reproxy { };
+
restic = callPackage ../tools/backup/restic { };
restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { };
@@ -19359,6 +19654,8 @@ in
thanos = callPackage ../servers/monitoring/thanos { };
+ trafficserver = callPackage ../servers/http/trafficserver { };
+
inherit (callPackages ../servers/http/tomcat { })
tomcat7
tomcat8
@@ -19398,6 +19695,10 @@ in
unifi6;
unifi = unifi6;
+ unpackerr = callPackage ../servers/unpackerr {
+ inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
+ };
+
urserver = callPackage ../servers/urserver { };
victoriametrics = callPackage ../servers/nosql/victoriametrics { };
@@ -19545,7 +19846,7 @@ in
inherit (callPackages ../os-specific/linux/apparmor { python = python3; })
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
- apparmor-profiles apparmor-kernel-patches;
+ apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;
aseq2json = callPackage ../os-specific/linux/aseq2json {};
@@ -19821,8 +20122,6 @@ in
kbd = callPackage ../os-specific/linux/kbd { };
- kbdKeymaps = callPackage ../os-specific/linux/kbd/keymaps.nix { };
-
kbdlight = callPackage ../os-specific/linux/kbdlight { };
kmscon = callPackage ../os-specific/linux/kmscon { };
@@ -19993,6 +20292,13 @@ in
];
};
+ linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ ];
+ };
+
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -20052,11 +20358,11 @@ in
];
};
- /* Linux kernel modules are inherently tied to a specific kernel. So
- rather than provide specific instances of those packages for a
- specific kernel, we have a function that builds those packages
- for a specific kernel. This function can then be called for
- whatever kernel you're using. */
+ /* Linux kernel modules are inherently tied to a specific kernel. So
+ rather than provide specific instances of those packages for a
+ specific kernel, we have a function that builds those packages
+ for a specific kernel. This function can then be called for
+ whatever kernel you're using. */
linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; {
callPackage = newScope self;
@@ -20091,7 +20397,7 @@ in
bbswitch = callPackage ../os-specific/linux/bbswitch {};
- ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
+ ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18
chipsec = callPackage ../tools/security/chipsec {
inherit kernel;
@@ -20116,6 +20422,8 @@ in
gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
+ hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { };
+
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null;
@@ -20144,7 +20452,6 @@ in
nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
- nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
nvidia_x11_beta = nvidiaPackages.beta;
@@ -20187,7 +20494,7 @@ in
facetimehd = callPackage ../os-specific/linux/facetimehd { };
- tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { };
+ tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null;
jool = callPackage ../os-specific/linux/jool { };
@@ -20197,9 +20504,8 @@ in
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
- /* compiles but has to be integrated into the kernel somehow
- Let's have it uncommented and finish it..
- */
+ # compiles but has to be integrated into the kernel somehow
+ # Let's have it uncommented and finish it..
ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
netatop = callPackage ../os-specific/linux/netatop { };
@@ -20258,13 +20564,12 @@ in
zenpower = callPackage ../os-specific/linux/zenpower { };
inherit (callPackages ../os-specific/linux/zfs {
- configFile = "kernel";
- inherit kernel;
- }) zfsStable zfsUnstable;
-
- zfs = zfsStable;
+ configFile = "kernel";
+ inherit kernel;
+ }) zfsStable zfsUnstable;
+ zfs = zfsStable;
- can-isotp = callPackage ../os-specific/linux/can-isotp { };
+ can-isotp = callPackage ../os-specific/linux/can-isotp { };
});
# The current default kernel / kernel modules.
@@ -20298,6 +20603,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11);
+ linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version
@@ -20508,8 +20814,9 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
- nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
- else unixtools.nettools;
+ nettools = if stdenv.isLinux
+ then callPackage ../os-specific/linux/net-tools { }
+ else unixtools.nettools;
nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };
@@ -20628,6 +20935,8 @@ in
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
+ octomap = callPackage ../development/libraries/octomap { };
+
odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
@@ -20708,15 +21017,16 @@ in
prayer = callPackage ../servers/prayer { };
- procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
- else unixtools.procps;
+ procps = if stdenv.isLinux
+ then callPackage ../os-specific/linux/procps-ng { }
+ else unixtools.procps;
procdump = callPackage ../os-specific/linux/procdump { };
prototool = callPackage ../development/tools/prototool { };
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
- qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; });
+ qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; });
# See `xenPackages` source for explanations.
# Building with `xen` instead of `xen-slim` is possible, but makes no sense.
@@ -21005,6 +21315,10 @@ in
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
+ wpa_supplicant_ro_ssids = wpa_supplicant.override {
+ readOnlyModeSSIDs = true;
+ };
+
wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
@@ -21388,7 +21702,7 @@ in
kopia = callPackage ../tools/backup/kopia { };
kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
- inherit (gnome3) adwaita-icon-theme;
+ inherit (gnome) adwaita-icon-theme;
inherit (libsForQt5.kdeFrameworks) breeze-icons;
};
@@ -21855,7 +22169,6 @@ in
ucs-fonts = callPackage ../data/fonts/ucs-fonts
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
-
ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
ultralist = callPackage ../applications/misc/ultralist { };
@@ -21863,7 +22176,7 @@ in
undefined-medium = callPackage ../data/fonts/undefined-medium { };
uni-vga = callPackage ../data/fonts/uni-vga
- { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+ { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
unicode-character-database = callPackage ../data/misc/unicode-character-database { };
@@ -21872,7 +22185,7 @@ in
unihan-database = callPackage ../data/misc/unihan-database { };
unifont = callPackage ../data/fonts/unifont
- { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+ { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
unifont_upper = callPackage ../data/fonts/unifont_upper { };
@@ -22141,10 +22454,6 @@ in
avrdudess = callPackage ../applications/misc/avrdudess { };
- avxsynth = callPackage ../applications/video/avxsynth {
- libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope
- };
-
awesome-4-0 = callPackage ../applications/window-managers/awesome {
cairo = cairo.override { xcbSupport = true; };
inherit (texFunctions) fontsConf;
@@ -22153,7 +22462,7 @@ in
awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
- inherit (gnome3) baobab;
+ inherit (gnome) baobab;
backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
@@ -22214,7 +22523,7 @@ in
(callPackage ../applications/science/electronics/bitscope/packages.nix { });
bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix {
- inherit (gnome3) zenity;
+ inherit (gnome) zenity;
libxkbcommon = libxkbcommon_7;
};
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
@@ -22298,9 +22607,9 @@ in
caerbannog = callPackage ../applications/misc/caerbannog { };
- cage = callPackage ../applications/window-managers/cage {
- wlroots = wlroots_0_12;
- };
+ cardboard = callPackage ../applications/window-managers/cardboard { };
+
+ cage = callPackage ../applications/window-managers/cage { };
calf = callPackage ../applications/audio/calf {
inherit (gnome2) libglade;
@@ -22427,7 +22736,6 @@ in
cmus = callPackage ../applications/audio/cmus {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
libjack = libjack2;
- ffmpeg = ffmpeg_2;
};
cmusfm = callPackage ../applications/audio/cmusfm { };
@@ -22595,7 +22903,8 @@ in
dmrconfig = callPackage ../applications/radio/dmrconfig { };
- dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
+ dmtx-utils = callPackage ../tools/graphics/dmtx-utils {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
};
inherit (callPackage ../applications/virtualization/docker {})
@@ -22697,6 +23006,10 @@ in
jdk = jdk11;
});
+ ecpdap = callPackage ../development/tools/ecpdap {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ };
+
ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
ed = callPackage ../applications/editors/ed { };
@@ -22759,7 +23072,7 @@ in
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
};
- inherit (gnome3) empathy;
+ inherit (gnome) empathy;
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
@@ -22773,7 +23086,7 @@ in
epgstation = callPackage ../applications/video/epgstation { };
- inherit (gnome3) epiphany;
+ inherit (gnome) epiphany;
ephemeral = callPackage ../applications/networking/browsers/ephemeral { };
@@ -22828,8 +23141,8 @@ in
keeweb = callPackage ../applications/misc/keeweb { };
- inherit (gnome3) evince;
- evolution-data-server = gnome3.evolution-data-server;
+ inherit (gnome) evince;
+ evolution-data-server = gnome.evolution-data-server;
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
@@ -22899,7 +23212,7 @@ in
flwrap = callPackage ../applications/radio/flwrap { };
fluidsynth = callPackage ../applications/audio/fluidsynth {
- inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
+ inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
};
fluidsynth_1 = fluidsynth.override { version = "1"; };
@@ -22973,7 +23286,7 @@ in
# A build without gui components and other utilites not needed for end user
# libraries
gnuradioMinimal = gnuradio.override {
- wrap = false;
+ doWrap = false;
unwrapped = gnuradio.unwrapped.override {
volk = volk.override {
# So it will not reference python
@@ -23003,7 +23316,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_8Minimal = gnuradio3_8.override {
- wrap = false;
+ doWrap = false;
unwrapped = gnuradio3_8.unwrapped.override {
volk = volk.override {
enableModTool = false;
@@ -23032,7 +23345,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_7Minimal = gnuradio3_7.override {
- wrap = false;
+ doWrap = false;
unwrapped = gnuradio3_7.unwrapped.override {
volk = volk.override {
enableModTool = false;
@@ -23107,7 +23420,7 @@ in
gtimelog = with python3Packages; toPythonApplication gtimelog;
- inherit (gnome3) gucharmap;
+ inherit (gnome) gucharmap;
guitarix = callPackage ../applications/audio/guitarix {
fftw = fftwSinglePrec;
@@ -23243,6 +23556,7 @@ in
boost
matplotlib
pivy
+ ply
pycollada
pyside2
pyside2-tools
@@ -23383,7 +23697,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
- inherit (gnome3) gitg;
+ inherit (gnome) gitg;
gmrun = callPackage ../applications/misc/gmrun {};
@@ -23516,7 +23830,7 @@ in
celluloid = callPackage ../applications/video/celluloid { };
gnome-recipes = callPackage ../applications/misc/gnome-recipes {
- inherit (gnome3) gnome-autoar;
+ inherit (gnome) gnome-autoar;
};
gollum = callPackage ../applications/misc/gollum { };
@@ -23525,7 +23839,7 @@ in
googleearth = callPackage ../applications/misc/googleearth { };
- googleearth-pro = callPackage ../applications/misc/googleearth-pro { };
+ googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
@@ -23724,14 +24038,7 @@ in
pinboard = with python3Packages; toPythonApplication pinboard;
- pinboard-notes-backup = haskell.lib.overrideCabal
- (haskell.lib.generateOptparseApplicativeCompletion "pnbackup"
- haskellPackages.pinboard-notes-backup)
- (drv: {
- postInstall = ''
- install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
- '' + (drv.postInstall or "");
- });
+ pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup;
pixelnuke = callPackage ../applications/graphics/pixelnuke { };
@@ -23789,9 +24096,7 @@ in
wbg = callPackage ../applications/misc/wbg { };
- hikari = callPackage ../applications/window-managers/hikari {
- wlroots = wlroots_0_12;
- };
+ hikari = callPackage ../applications/window-managers/hikari { };
i3 = callPackage ../applications/window-managers/i3 {
xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
@@ -23853,9 +24158,7 @@ in
i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
- waybox = callPackage ../applications/window-managers/waybox {
- wlroots = wlroots_0_12;
- };
+ waybox = callPackage ../applications/window-managers/waybox { };
workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
@@ -23871,7 +24174,7 @@ in
id3v2 = callPackage ../applications/audio/id3v2 { };
- ideamaker = callPackage ../applications/misc/ideamaker { };
+ ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { };
ifenslave = callPackage ../os-specific/linux/ifenslave { };
@@ -23918,7 +24221,7 @@ in
};
imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix {
- inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
ghostscript = null;
};
@@ -23951,7 +24254,7 @@ in
});
imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
- inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
});
inherit (nodePackages) imapnotify;
@@ -24098,6 +24401,8 @@ in
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
+ kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
+
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
@@ -24141,11 +24446,6 @@ in
kile = libsForQt5.callPackage ../applications/editors/kile { };
- kino = callPackage ../applications/video/kino {
- inherit (gnome2) libglade;
- ffmpeg = ffmpeg_2;
- };
-
kitsas = libsForQt5.callPackage ../applications/office/kitsas { };
kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
@@ -24433,7 +24733,7 @@ in
luppp = callPackage ../applications/audio/luppp { };
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
- inherit (gnome3) gnome-desktop;
+ inherit (gnome) gnome-desktop;
wine = wineWowPackages.staging;
};
lutris = callPackage ../applications/misc/lutris/fhsenv.nix {
@@ -24506,6 +24806,8 @@ in
canonicaljson;
};
+ matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { };
+
matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {};
@@ -24540,7 +24842,7 @@ in
melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { };
- meme = callPackage ../applications/graphics/meme { };
+ meme-image-generator = callPackage ../applications/graphics/meme-image-generator { };
meme-suite = callPackage ../applications/science/biology/meme-suite { };
@@ -24581,6 +24883,8 @@ in
mikmod = callPackage ../applications/audio/mikmod { };
+ miniaudicle = callPackage ../applications/audio/miniaudicle { };
+
minicom = callPackage ../tools/misc/minicom { };
minimodem = callPackage ../applications/radio/minimodem { };
@@ -24644,7 +24948,6 @@ in
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
- botan = botan.override (x: { openssl = null; });
};
monotoneViz = callPackage ../applications/version-management/monotone-viz {
@@ -24676,6 +24979,7 @@ in
mopidy-mpd
mopidy-mpris
mopidy-musicbox-webclient
+ mopidy-podcast
mopidy-scrobbler
mopidy-somafm
mopidy-soundcloud
@@ -24729,6 +25033,8 @@ in
rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
+ rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { };
+
ympd = callPackage ../applications/audio/ympd { };
# a somewhat more maintained fork of ympd
@@ -24837,9 +25143,7 @@ in
newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
- nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus {
- geoip = geoipWithDatabase;
- };
+ nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };
nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };
@@ -24904,9 +25208,8 @@ in
plank = callPackage ../applications/misc/plank { };
- playonlinux = callPackage ../applications/misc/playonlinux {
- stdenv = stdenv_32bit;
- };
+ playonlinux = callPackage ../applications/misc/playonlinux
+ { stdenv = stdenv_32bit; };
pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
@@ -24937,6 +25240,8 @@ in
ptex = callPackage ../development/libraries/ptex {};
+ pyright = nodePackages.pyright;
+
qbec = callPackage ../applications/networking/cluster/qbec { };
qemacs = callPackage ../applications/editors/qemacs { };
@@ -25034,7 +25339,9 @@ in
mupdf = callPackage ../applications/misc/mupdf { };
mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { };
- muso = callPackage ../applications/audio/muso { };
+ muso = callPackage ../applications/audio/muso {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
mystem = callPackage ../applications/misc/mystem { };
@@ -25218,7 +25525,7 @@ in
owamp = callPackage ../applications/networking/owamp { };
vieb = callPackage ../applications/networking/browsers/vieb {
- electron = electron_11;
+ electron = electron_12;
};
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
@@ -25243,10 +25550,7 @@ in
osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { };
- palemoon = callPackage ../applications/networking/browsers/palemoon {
- # https://developer.palemoon.org/build/linux/
- stdenv = gcc8Stdenv;
- };
+ palemoon = callPackage ../applications/networking/browsers/palemoon { };
webbrowser = callPackage ../applications/networking/browsers/webbrowser {};
@@ -25315,6 +25619,8 @@ in
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
pdfpc = callPackage ../applications/misc/pdfpc {
+ # https://github.com/pdfpc/pdfpc/issues/594
+ vala = vala_0_50;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
@@ -25729,6 +26035,8 @@ in
reaper = callPackage ../applications/audio/reaper { };
+ recapp = callPackage ../applications/video/recapp { };
+
recode = callPackage ../tools/text/recode { };
reddsaver = callPackage ../applications/misc/reddsaver {
@@ -25739,10 +26047,6 @@ in
remotebox = callPackage ../applications/virtualization/remotebox { };
- # 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 { };
ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { };
@@ -25767,12 +26071,12 @@ in
rofi-systemd = callPackage ../tools/system/rofi-systemd { };
rofimoji = callPackage ../applications/misc/rofimoji {
- inherit (python3Packages) buildPythonApplication ConfigArgParse pyxdg;
+ inherit (python3Packages) buildPythonApplication ConfigArgParse;
};
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
- rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { };
+ rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
rsclock = callPackage ../applications/misc/rsclock { };
@@ -25857,7 +26161,7 @@ in
shutter = callPackage ../applications/graphics/shutter { };
- simple-scan = gnome3.simple-scan;
+ simple-scan = gnome.simple-scan;
siproxd = callPackage ../applications/networking/siproxd { };
@@ -26091,14 +26395,7 @@ in
stumpish = callPackage ../applications/window-managers/stumpish {};
- stumpwm = callPackage ../applications/window-managers/stumpwm {
- version = "latest";
- };
-
- stumpwm-git = stumpwm.override {
- version = "git";
- inherit sbcl lispPackages;
- };
+ stumpwm = lispPackages.stumpwm;
sublime = callPackage ../applications/editors/sublime/2 { };
@@ -26130,7 +26427,7 @@ in
surf-display = callPackage ../desktops/surf-display { };
surge = callPackage ../applications/audio/surge {
- inherit (gnome3) zenity;
+ inherit (gnome) zenity;
git = gitMinimal;
};
@@ -26185,7 +26482,7 @@ in
};
taffybar = callPackage ../applications/window-managers/taffybar {
- inherit (haskellPackages) ghcWithPackages;
+ inherit (haskellPackages) ghcWithPackages taffybar;
};
tagainijisho = callPackage ../applications/office/tagainijisho {};
@@ -26290,20 +26587,11 @@ in
gtk3Support = true;
};
- thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
- inherit (rustPackages) cargo rustc;
- libpng = libpng_apng;
- nss = nss_3_44;
- gtk3Support = true;
- };
-
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
thunderbird-bin = thunderbird-bin-78;
thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { };
- thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { };
-
ticpp = callPackage ../development/libraries/ticpp { };
ticker = callPackage ../applications/misc/ticker { };
@@ -26320,6 +26608,8 @@ in
timewarrior = callPackage ../applications/misc/timewarrior { };
+ timew-sync-server = callPackage ../applications/misc/timew-sync-server { };
+
timg = callPackage ../tools/graphics/timg { };
timidity = callPackage ../tools/misc/timidity { };
@@ -26385,6 +26675,8 @@ in
transcode = callPackage ../applications/audio/transcode { };
+ transcribe = callPackage ../applications/audio/transcribe { };
+
transmission = callPackage ../applications/networking/p2p/transmission { };
libtransmission = transmission.override {
installLib = true;
@@ -26438,6 +26730,10 @@ in
lavalauncher = callPackage ../applications/misc/lavalauncher { };
+ t-rec = callPackage ../misc/t-rec {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
+
ulauncher = callPackage ../applications/misc/ulauncher { };
twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
@@ -26489,7 +26785,7 @@ in
utox = callPackage ../applications/networking/instant-messengers/utox { };
- valentina = libsForQt514.callPackage ../applications/misc/valentina { };
+ valentina = libsForQt512.callPackage ../applications/misc/valentina { };
vbindiff = callPackage ../applications/editors/vbindiff { };
@@ -26580,7 +26876,9 @@ in
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
- neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; };
+ neovide = callPackage ../applications/editors/neovim/neovide { };
+
+ neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
vis = callPackage ../applications/editors/vis {
inherit (lua52Packages) lpeg;
@@ -26698,6 +26996,8 @@ in
};
vscode = callPackage ../applications/editors/vscode/vscode.nix { };
+ vscode-fhs = vscode.fhs;
+ vscode-fhsWithPackages = vscode.fhsWithPackages;
vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {};
@@ -26706,6 +27006,8 @@ in
vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {});
vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };
+ vscodium-fhs = vscodium.fhs;
+ vscodium-fhsWithPackages = vscodium.fhsWithPackages;
code-server = callPackage ../servers/code-server {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
@@ -26768,8 +27070,7 @@ in
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = recurseIntoAttrs (
- (callPackage ../applications/window-managers/wayfire/applications.nix { }).
- extend (_: _: { wlroots = wlroots_0_12; })
+ callPackage ../applications/window-managers/wayfire/applications.nix { }
);
wayfirePlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/plugins.nix {
@@ -26788,6 +27089,8 @@ in
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
+ webssh = with python3Packages; toPythonApplication webssh;
+
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
@@ -26817,9 +27120,7 @@ in
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
- wio = callPackage ../applications/window-managers/wio {
- wlroots = wlroots_0_12;
- };
+ wio = callPackage ../applications/window-managers/wio { };
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -26838,6 +27139,8 @@ in
write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
+ wlc = callPackage ../tools/misc/wlc { };
+
wllvm = callPackage ../development/tools/wllvm { };
wmname = callPackage ../applications/misc/wmname { };
@@ -27061,6 +27364,8 @@ in
picom = callPackage ../applications/window-managers/picom {};
+ xd = callPackage ../applications/networking/p2p/xd {};
+
xdaliclock = callPackage ../tools/misc/xdaliclock {};
xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { };
@@ -27113,7 +27418,7 @@ in
xfractint = callPackage ../applications/graphics/xfractint {};
- xineUI = callPackage ../applications/video/xine-ui { };
+ xine-ui = callPackage ../applications/video/xine-ui { };
xlsxgrep = callPackage ../applications/search/xlsxgrep { };
@@ -27258,7 +27563,7 @@ in
yeetgif = callPackage ../applications/graphics/yeetgif { };
- inherit (gnome3) yelp;
+ inherit (gnome) yelp;
yelp-tools = callPackage ../development/misc/yelp-tools { };
@@ -27276,6 +27581,8 @@ in
ytcc = callPackage ../tools/networking/ytcc { };
+ ytmdesktop = callPackage ../applications/audio/ytmdesktop { };
+
zam-plugins = callPackage ../applications/audio/zam-plugins { };
zanshin = libsForQt5.callPackage ../applications/office/zanshin {
@@ -27309,10 +27616,10 @@ in
zgrviewer = callPackage ../applications/graphics/zgrviewer { };
zgv = callPackage ../applications/graphics/zgv {
- # Enable the below line for terminal display. Note
- # that it requires sixel graphics compatible terminals like mlterm
- # or xterm -ti 340
- SDL = SDL_sixel;
+ # Enable the below line for terminal display. Note
+ # that it requires sixel graphics compatible terminals like mlterm
+ # or xterm -ti 340
+ SDL = SDL_sixel;
};
zim = callPackage ../applications/office/zim { };
@@ -27364,6 +27671,8 @@ in
cgminer = callPackage ../applications/blockchains/cgminer { };
+ chia = callPackage ../applications/blockchains/chia { };
+
clightning = callPackage ../applications/blockchains/clightning.nix { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
@@ -27455,7 +27764,7 @@ in
autoreconfHook = buildPackages.autoreconfHook269;
};
- ethabi = callPackage ../applications/blockchains/ethabi.nix { };
+ ethabi = callPackage ../applications/blockchains/ethabi { };
pycoin = with python3Packages; toPythonApplication pycoin;
@@ -27478,7 +27787,7 @@ in
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
- openethereum = callPackage ../applications/blockchains/openethereum { };
+ openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; };
parity-ui = callPackage ../applications/blockchains/parity-ui { };
@@ -27508,7 +27817,7 @@ in
airstrike = callPackage ../games/airstrike { };
- alephone = callPackage ../games/alephone { ffmpeg = ffmpeg_2; };
+ alephone = callPackage ../games/alephone { };
alephone-durandal = callPackage ../games/alephone/durandal { };
alephone-eternal = callPackage ../games/alephone/eternal { };
alephone-evil = callPackage ../games/alephone/evil { };
@@ -27944,6 +28253,8 @@ in
megaglest = callPackage ../games/megaglest {};
+ methane = callPackage ../games/methane { };
+
mindustry = callPackage ../games/mindustry { };
mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; };
@@ -28100,8 +28411,6 @@ in
prboom = callPackage ../games/prboom { };
- privateer = callPackage ../games/privateer { };
-
pysolfc = python3Packages.callPackage ../games/pysolfc { };
qqwing = callPackage ../games/qqwing { };
@@ -28265,12 +28574,14 @@ in
nativeOnly = true;
}).run;
+ steam-tui = callPackage ../games/steam-tui { };
+
steamcmd = steamPackages.steamcmd;
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
inherit steam-run;
inherit winetricks;
- inherit (gnome3) zenity;
+ inherit (gnome) zenity;
};
sdlpop = callPackage ../games/sdlpop { };
@@ -28281,6 +28592,8 @@ in
streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { };
+ stt = callPackage ../tools/audio/stt { };
+
stuntrally = callPackage ../games/stuntrally {
ogre = ogre1_9;
mygui = mygui.override {
@@ -28290,7 +28603,9 @@ in
superTux = callPackage ../games/supertux { };
- superTuxKart = callPackage ../games/super-tux-kart { };
+ superTuxKart = callPackage ../games/super-tux-kart {
+ inherit (darwin.apple_sdk.frameworks) Cocoa IOKit OpenAL;
+ };
synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
@@ -28372,9 +28687,7 @@ in
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
- ultrastardx = callPackage ../games/ultrastardx {
- ffmpeg = ffmpeg_2;
- };
+ ultrastardx = callPackage ../games/ultrastardx { };
unciv = callPackage ../games/unciv { };
@@ -28544,56 +28857,16 @@ in
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
- gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
-
- gnomeExtensions = recurseIntoAttrs {
- appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
- arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { };
- caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
- clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
- clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { };
- dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
- dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
- disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { };
- draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
- drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
- dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { };
- easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { };
- emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { };
- freon = callPackage ../desktops/gnome-3/extensions/freon { };
- fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { };
- gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
- icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
- impatience = callPackage ../desktops/gnome-3/extensions/impatience { };
- material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { };
- mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { };
- night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { };
- no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
- noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { };
- paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { };
- pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
- remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
- sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { };
- system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { };
- taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { };
- tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { };
- timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
- topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
- unite = callPackage ../desktops/gnome-3/extensions/unite { };
- window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
- window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { };
- workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { };
+ gnome = recurseIntoAttrs (callPackage ../desktops/gnome { });
- nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks.";
- mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
- } // lib.optionalAttrs (config.allowAliases or false) {
- unite-shell = gnomeExtensions.unite; # added 2021-01-19
- arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
- };
+ inherit (callPackage ../desktops/gnome/extensions { })
+ gnomeExtensions
+ gnome38Extensions
+ gnome40Extensions;
- gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };
+ gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };
- gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
+ gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
hhexen = callPackage ../games/hhexen { };
@@ -28617,6 +28890,8 @@ in
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
+ plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };
+
inherit (callPackages ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg wrapPython;
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
@@ -28627,7 +28902,7 @@ in
latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
- gnome-themes-extra = gnome3.gnome-themes-extra;
+ gnome-themes-extra = gnome.gnome-themes-extra;
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
@@ -28736,7 +29011,9 @@ in
bppsuite = callPackage ../applications/science/biology/bppsuite { };
- cd-hit = callPackage ../applications/science/biology/cd-hit { };
+ cd-hit = callPackage ../applications/science/biology/cd-hit {
+ inherit (llvmPackages) openmp;
+ };
cmtk = callPackage ../applications/science/biology/cmtk { };
@@ -29236,8 +29513,8 @@ in
elan = callPackage ../applications/science/logic/elan {};
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
- leo2 = callPackage ../applications/science/logic/leo2 {
- ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};
+ leo2 = callPackage ../applications/science/logic/leo2
+ { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};
@@ -29561,7 +29838,9 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv;
});
- rink = callPackage ../applications/science/misc/rink { };
+ rink = callPackage ../applications/science/misc/rink {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
simgrid = callPackage ../applications/science/misc/simgrid { };
@@ -29600,7 +29879,7 @@ in
fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
- fastnlo = callPackage ../development/libraries/physics/fastnlo { };
+ fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { };
geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
@@ -29772,8 +30051,6 @@ in
dbus-map = callPackage ../tools/misc/dbus-map { };
- deepspeech = callPackage ../misc/deepspeech { };
-
dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
demjson = with python3Packages; toPythonApplication demjson;
@@ -29963,8 +30240,9 @@ in
kops_1_16
kops_1_17
kops_1_18
+ kops_1_19
;
- kops = kops_1_18;
+ kops = kops_1_19;
lguf-brightness = callPackage ../misc/lguf-brightness { };
@@ -30020,8 +30298,7 @@ in
})
nix
nixStable
- nixUnstable
- nixFlakes;
+ nixUnstable;
nixStatic = pkgsStatic.nix;
@@ -30031,57 +30308,58 @@ in
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
- /* Evaluate a NixOS configuration using this evaluation of Nixpkgs.
+ /*
+ Evaluate a NixOS configuration using this evaluation of Nixpkgs.
- With this function you can write, for example, a package that
- depends on a custom virtual machine image.
+ With this function you can write, for example, a package that
+ depends on a custom virtual machine image.
- Parameter: A module, path or list of those that represent the
+ Parameter: A module, path or list of those that represent the
configuration of the NixOS system to be constructed.
- Result: An attribute set containing packages produced by this
- evaluation of NixOS, such as toplevel, kernel and
- initialRamdisk.
- The result can be extended in the modules by defining
- extra attributes in system.build.
- Alternatively, you may use the result's config and
- options attributes to query any option.
+ Result: An attribute set containing packages produced by this
+ evaluation of NixOS, such as toplevel, kernel and
+ initialRamdisk.
+ The result can be extended in the modules by defining
+ extra attributes in system.build.
+ Alternatively, you may use the result's config and
+ options attributes to query any option.
- Example:
+ Example:
- let
- myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {
+ let
+ myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {
- config.services.nginx = {
- enable = true;
- # ...
- };
+ config.services.nginx = {
+ enable = true;
+ # ...
+ };
- # Use config.system.build to exports relevant parts of a
- # configuration. The runner attribute should not be
- # considered a fully general replacement for systemd
- # functionality.
- config.system.build.run-nginx = config.systemd.services.nginx.runner;
- });
- in
- myOS.run-nginx
+ # Use config.system.build to exports relevant parts of a
+ # configuration. The runner attribute should not be
+ # considered a fully general replacement for systemd
+ # functionality.
+ config.system.build.run-nginx = config.systemd.services.nginx.runner;
+ });
+ in
+ myOS.run-nginx
- Unlike in plain NixOS, the nixpkgs.config and
- nixpkgs.system options will be ignored by default. Instead,
- nixpkgs.pkgs will have the default value of pkgs as it was
- constructed right after invoking the nixpkgs function (e.g. the
- value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
- but not the value of (import <nixpkgs> {} // { extra = ...; }).
+ Unlike in plain NixOS, the nixpkgs.config and
+ nixpkgs.system options will be ignored by default. Instead,
+ nixpkgs.pkgs will have the default value of pkgs as it was
+ constructed right after invoking the nixpkgs function (e.g. the
+ value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
+ but not the value of (import <nixpkgs> {} // { extra = ...; }).
- If you do want to use the config.nixpkgs options, you are
- probably better off by calling nixos/lib/eval-config.nix
- directly, even though it is possible to set config.nixpkgs.pkgs.
+ If you do want to use the config.nixpkgs options, you are
+ probably better off by calling nixos/lib/eval-config.nix
+ directly, even though it is possible to set config.nixpkgs.pkgs.
- For more information about writing NixOS modules, see
- https://nixos.org/nixos/manual/index.html#sec-writing-modules
+ For more information about writing NixOS modules, see
+ https://nixos.org/nixos/manual/index.html#sec-writing-modules
- Note that you will need to have called Nixpkgs with the system
- parameter set to the right value for your deployment target.
+ Note that you will need to have called Nixpkgs with the system
+ parameter set to the right value for your deployment target.
*/
nixos =
configuration:
@@ -30149,11 +30427,11 @@ in
test:
let
loadedTest = if builtins.typeOf test == "path"
- then import test
- else test;
+ then import test
+ else test;
calledTest = if pkgs.lib.isFunction loadedTest
- then callPackage loadedTest {}
- else loadedTest;
+ then callPackage loadedTest {}
+ else loadedTest;
in
nixosTesting.makeTest calledTest;
@@ -30161,6 +30439,8 @@ in
(import ../../nixos/lib/make-options-doc/default.nix)
({ inherit pkgs lib; } // attrs);
+ nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
+
nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
nixdoc = callPackage ../tools/nix/nixdoc {};
@@ -30253,6 +30533,8 @@ in
nut = callPackage ../applications/misc/nut { };
+ nvd = callPackage ../tools/package-management/nvd { };
+
solfege = python3Packages.callPackage ../misc/solfege { };
disnix = callPackage ../tools/package-management/disnix { };
@@ -30520,7 +30802,9 @@ in
hasktags = haskellPackages.hasktags;
};
- spacenavd = callPackage ../misc/drivers/spacenavd { };
+ spacenavd = callPackage ../misc/drivers/spacenavd {
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { };
@@ -30655,9 +30939,7 @@ in
vbam = callPackage ../misc/emulators/vbam { };
- vice = callPackage ../misc/emulators/vice {
- giflib = giflib_4_1;
- };
+ vice = callPackage ../misc/emulators/vice { };
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };
@@ -30673,7 +30955,7 @@ in
vimb = wrapFirefox vimb-unwrapped { };
vips = callPackage ../tools/graphics/vips {
- inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
nip2 = callPackage ../tools/graphics/nip2 { };
@@ -30736,7 +31018,7 @@ in
});
winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
- inherit (gnome3) zenity;
+ inherit (gnome) zenity;
};
wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { };
@@ -30813,10 +31095,10 @@ in
};
xsw = callPackage ../applications/misc/xsw {
- # Enable the next line to use this in terminal.
- # Note that it requires sixel capable terminals such as mlterm
- # or xterm -ti 340
- SDL = SDL_sixel;
+ # Enable the next line to use this in terminal.
+ # Note that it requires sixel capable terminals such as mlterm
+ # or xterm -ti 340
+ SDL = SDL_sixel;
};
xteddy = callPackage ../applications/misc/xteddy { };
@@ -30927,8 +31209,6 @@ in
mpvc = callPackage ../applications/misc/mpvc { };
- togglesg-download = callPackage ../tools/misc/togglesg-download { };
-
discord = import ../applications/networking/instant-messengers/discord {
branch = "stable";
inherit pkgs;
@@ -31003,7 +31283,7 @@ in
chrome-export = callPackage ../tools/misc/chrome-export {};
- chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {};
+ chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {};
chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {};
@@ -31053,7 +31333,9 @@ in
simplehttp2server = callPackage ../servers/simplehttp2server { };
- simple-http-server = callPackage ../servers/simple-http-server { };
+ simple-http-server = callPackage ../servers/simple-http-server {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
diceware = with python3Packages; toPythonApplication diceware;
@@ -31077,8 +31359,12 @@ in
fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null;
- netbsd = callPackages ../os-specific/bsd/netbsd {};
- netbsdCross = callPackages ../os-specific/bsd/netbsd {
+ bsdSetupHook = makeSetupHook {
+ name = "bsd-setup-hook";
+ } ../os-specific/bsd/setup-hook.sh;
+
+ netbsd = callPackage ../os-specific/bsd/netbsd {};
+ netbsdCross = callPackage ../os-specific/bsd/netbsd {
stdenv = crossLibcStdenv;
};
@@ -31197,15 +31483,17 @@ in
treefmt = callPackage ../development/tools/treefmt { };
- bottom = callPackage ../tools/system/bottom {};
-
- cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {
- wlroots = wlroots_0_12;
+ bottom = callPackage ../tools/system/bottom {
+ inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
};
+ cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };
+
psftools = callPackage ../os-specific/linux/psftools {};
lc3tools = callPackage ../development/tools/lc3tools {};
+ xcolor = callPackage ../tools/graphics/xcolor { };
+
zktree = callPackage ../applications/misc/zktree {};
}
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index ac9d4ab524e3..688d16072405 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -14,6 +14,21 @@ rec {
# Standard Erlang versions, using the generic builder.
+ # R24
+ erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
+ wxGTK = wxGTK30;
+ # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
+ parallelBuild = true;
+ autoconf = buildPackages.autoconf269;
+ inherit wxSupport;
+ };
+ erlangR24_odbc = erlangR24.override { odbcSupport = true; };
+ erlangR24_javac = erlangR24.override { javacSupport = true; };
+ erlangR24_odbc_javac = erlangR24.override {
+ javacSupport = true;
+ odbcSupport = true;
+ };
+
# R23
erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
wxGTK = wxGTK30;
@@ -126,6 +141,7 @@ rec {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
+ erlangR24 = packagesWith interpreters.erlangR24;
erlangR23 = packagesWith interpreters.erlangR23;
erlangR22 = packagesWith interpreters.erlangR22;
erlangR21 = packagesWith interpreters.erlangR21;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index e533d5aace15..e89f1a57c90e 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -13,6 +13,7 @@ let
contribs = recurseIntoAttrs
(callPackage ../development/coq-modules/contribs {});
+ aac-tactics = callPackage ../development/coq-modules/aac-tactics {};
autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {}
@@ -36,9 +37,11 @@ let
flocq = callPackage ../development/coq-modules/flocq {};
fourcolor = callPackage ../development/coq-modules/fourcolor {};
gappalib = callPackage ../development/coq-modules/gappalib {};
+ goedel = callPackage ../development/coq-modules/goedel {};
heq = callPackage ../development/coq-modules/heq {};
hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
HoTT = callPackage ../development/coq-modules/HoTT {};
+ hydra-battles = callPackage ../development/coq-modules/hydra-battles {};
interval = callPackage ../development/coq-modules/interval {};
InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {};
iris = callPackage ../development/coq-modules/iris {};
@@ -58,21 +61,26 @@ let
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
+ mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
metalib = callPackage ../development/coq-modules/metalib { };
multinomials = callPackage ../development/coq-modules/multinomials {};
odd-order = callPackage ../development/coq-modules/odd-order { };
paco = callPackage ../development/coq-modules/paco {};
paramcoq = callPackage ../development/coq-modules/paramcoq {};
+ pocklington = callPackage ../development/coq-modules/pocklington {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
+ relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};
tlc = callPackage ../development/coq-modules/tlc {};
Velisarios = callPackage ../development/coq-modules/Velisarios {};
Verdi = callPackage ../development/coq-modules/Verdi {};
- VST = callPackage ../development/coq-modules/VST {
- compcert = compcert.override { version = "3.7"; };
- };
+ VST = callPackage ../development/coq-modules/VST (with lib.versions;
+ lib.switch coq.coq-version [
+ { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; }
+ { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; }
+ ] {});
filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
};
@@ -122,9 +130,7 @@ in rec {
coqPackages_8_11 = mkCoqPackages coq_8_11;
coqPackages_8_12 = mkCoqPackages coq_8_12;
coqPackages_8_13 = mkCoqPackages coq_8_13;
- coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
- coqPackages_8_11
- );
+ coqPackages = recurseIntoAttrs coqPackages_8_13;
coq = coqPackages.coq;
}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 3ece95c58451..5275a6f31232 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -1,27 +1,44 @@
-{ buildPackages, pkgs, targetPackages
-, darwin, stdenv, callPackage, callPackages, newScope
+{ lib
+, buildPackages, pkgs, targetPackages
+, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget
+, stdenv, splicePackages, newScope
}:
let
- apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
+ otherSplices = {
+ selfBuildBuild = pkgsBuildBuild.darwin;
+ selfBuildHost = pkgsBuildHost.darwin;
+ selfBuildTarget = pkgsBuildTarget.darwin;
+ selfHostHost = pkgsHostHost.darwin;
+ selfTargetTarget = pkgsTargetTarget.darwin or {}; # might be missing
+ };
- impure-cmds = callPackage ../os-specific/darwin/impure-cmds { };
in
-(impure-cmds // apple-source-releases // {
+lib.makeScopeWithSplicing splicePackages newScope otherSplices (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let
+ inherit (self) mkDerivation callPackage;
- callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
+ # Must use pkgs.callPackage to avoid infinite recursion.
- stdenvNoCF = stdenv.override {
- extraBuildInputs = [];
+ apple-source-releases = pkgs.callPackage ../os-specific/darwin/apple-source-releases { } self;
+
+ impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
+
+ apple_sdk = pkgs.callPackage ../os-specific/darwin/apple-sdk {
+ inherit (buildPackages.darwin) print-reexports;
+ inherit (self) darwin-stubs;
};
+in
+
+impure-cmds // apple-source-releases // {
- apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
- inherit (darwin) darwin-stubs print-reexports;
+ inherit apple_sdk;
+
+ stdenvNoCF = stdenv.override {
+ extraBuildInputs = [];
};
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
- inherit (darwin) cctools;
inherit (pkgs) binutils-unwrapped;
inherit (pkgs.llvmPackages_7) llvm clang-unwrapped;
};
@@ -31,17 +48,21 @@ in
if stdenv.targetPlatform != stdenv.hostPlatform
then pkgs.libcCross
else pkgs.stdenv.cc.libc;
- bintools = darwin.binutils-unwrapped;
+ bintools = self.binutils-unwrapped;
+ };
+
+ binutilsNoLibc = pkgs.wrapBintoolsWith {
+ libc = null;
+ bintools = self.binutils-unwrapped;
};
cctools = callPackage ../os-specific/darwin/cctools/port.nix {
- inherit (darwin) libobjc maloader libtapi;
stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
libcxxabi = pkgs.libcxxabi;
};
# TODO: remove alias.
- cf-private = darwin.apple_sdk.frameworks.CoreFoundation;
+ cf-private = self.apple_sdk.frameworks.CoreFoundation;
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
@@ -50,15 +71,13 @@ in
print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { };
maloader = callPackage ../os-specific/darwin/maloader {
- inherit (darwin) opencflite;
};
insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
- iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
+ iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
- xcode = darwin.xcode;
inherit (pkgs.llvmPackages) clang-unwrapped;
};
@@ -70,13 +89,13 @@ in
opencflite = callPackage ../os-specific/darwin/opencflite { };
- stubs = callPackages ../os-specific/darwin/stubs { };
+ stubs = pkgs.callPackages ../os-specific/darwin/stubs { };
- trash = darwin.callPackage ../os-specific/darwin/trash { };
+ trash = callPackage ../os-specific/darwin/trash { };
usr-include = callPackage ../os-specific/darwin/usr-include { };
- inherit (callPackages ../os-specific/darwin/xcode { })
+ inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
xcode_8_1 xcode_8_2
xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1
xcode_10_2 xcode_10_2_1 xcode_10_3
@@ -85,10 +104,10 @@ in
CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
- CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
+ CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { };
# As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
- # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };
+ # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { };
darling = callPackage ../os-specific/darwin/darling/default.nix { };
@@ -96,8 +115,6 @@ in
ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};
- discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll {
- inherit (darwin.apple_sdk.frameworks) Cocoa;
- };
+ discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { };
})
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 660ba01bcd44..f1eaff5ec872 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -9,7 +9,6 @@
, pkg-config
, mono
, fsharp
-, unzip
, overrides ? {}
}:
@@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
};
- nativeBuildInputs = [ unzip ];
-
phases = [ "unpackPhase" "installPhase" ];
outputFiles = [ "*" ];
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 67f4d116dfde..d168d34e3738 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -25,21 +25,21 @@
let
- mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/elpa-packages.nix {
+ mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {
inherit (pkgs) stdenv texinfo writeText;
inherit lib;
};
# Contains both melpa stable & unstable
- melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs-modes/melpa-packages.nix {
+ melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix {
inherit lib pkgs;
};
- mkOrgPackages = { lib }: import ../applications/editors/emacs-modes/org-packages.nix {
+ mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix {
inherit lib;
};
- mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/manual-packages.nix {
+ mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix {
inherit lib pkgs;
};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index da70103ad6bd..8bea40efe64d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -76,13 +76,17 @@ in {
llvmPackages = pkgs.llvmPackages_9;
};
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
- bootPkgs = packages.ghc8102Binary;
+ # aarch64 ghc8102Binary exceeds max output size on hydra
+ bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
+ packages.ghc8102BinaryMinimal
+ else
+ packages.ghc8102Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
- bootPkgs = packages.ghc884; # no binary yet
+ bootPkgs = packages.ghc901; # no binary yet
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2713a287ce8b..aa7639b322f8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -53,7 +53,7 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { };
bap = callPackage ../development/ocaml-modules/bap {
- llvm = pkgs.llvm_8;
+ inherit (pkgs.llvmPackages_8) llvm;
};
batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -82,6 +82,8 @@ let
ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
+ ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { };
+
carton = callPackage ../development/ocaml-modules/carton { };
carton-git = callPackage ../development/ocaml-modules/carton/git.nix { };
@@ -114,12 +116,11 @@ let
then callPackage ../development/ocaml-modules/camomile { }
else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { };
- camlimages_4_0 =
+ camlimages_4_1_2 =
if lib.versionOlder "4.02" ocaml.version
then null
- else callPackage ../development/ocaml-modules/camlimages/4.0.nix {
+ else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix {
libpng = pkgs.libpng12;
- giflib = pkgs.giflib_4_1;
};
camlimages = callPackage ../development/ocaml-modules/camlimages { };
@@ -457,7 +458,7 @@ let
git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { };
- git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { };
+ git-paf = callPackage ../development/ocaml-modules/git/paf.nix { };
git-unix = callPackage ../development/ocaml-modules/git/unix.nix {
git-binary = pkgs.git;
@@ -585,7 +586,7 @@ let
linenoise = callPackage ../development/ocaml-modules/linenoise { };
llvm = callPackage ../development/ocaml-modules/llvm {
- llvm = pkgs.llvm_8;
+ libllvm = pkgs.llvmPackages_8.libllvm;
};
logs = callPackage ../development/ocaml-modules/logs { };
@@ -1076,6 +1077,8 @@ let
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
+ ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner {};
+
ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
ppx_import = callPackage ../development/ocaml-modules/ppx_import (
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e930b2121d7b..e97a704c3de5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -174,6 +174,22 @@ let
propagatedBuildInputs = [ AlgorithmDiff ];
};
+ AlienBaseModuleBuild = buildPerlModule {
+ pname = "Alien-Base-ModuleBuild";
+ version = "1.15";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz";
+ sha256 = "13c9432cf41b34cb14df2454a03e540e2bd5dc9eb9c82824b6ad0f4c67793afd";
+ };
+ buildInputs = [ Test2Suite ];
+ propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ];
+ meta = {
+ homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild;
+ description = "A Module::Build subclass for building Alien:: modules and their libraries";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
AlienBuild = buildPerlPackage {
pname = "Alien-Build";
version = "2.37";
@@ -204,6 +220,21 @@ let
};
};
+ AlienLibGumbo = buildPerlModule {
+ pname = "Alien-LibGumbo";
+ version = "0.05";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/R/RU/RUZ/Alien-LibGumbo-0.05.tar.gz";
+ sha256 = "0fbe916ab11f680e5c28cd1ac800372323e2a0e06affc6c8b36279fc64d76517";
+ };
+ buildInputs = [ AlienBaseModuleBuild ];
+ propagatedBuildInputs = [ AlienBuild FileShareDir PathClass ];
+ meta = {
+ description = "Gumbo parser library";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
AlienLibxml2 = buildPerlPackage {
pname = "Alien-Libxml2";
version = "0.17";
@@ -3907,6 +3938,20 @@ let
};
};
+ CryptArgon2 = perlPackages.buildPerlModule {
+ pname = "Crypt-Argon2";
+ version = "0.010";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.010.tar.gz";
+ sha256 = "3ea1c006f10ef66fd417e502a569df15c4cc1c776b084e35639751c41ce6671a";
+ };
+ nativeBuildInputs = [ pkgs.ld-is-cc-hook ];
+ meta = {
+ description = "Perl interface to the Argon2 key derivation functions";
+ license = lib.licenses.cc0;
+ };
+ };
+
CryptBlowfish = buildPerlPackage {
pname = "Crypt-Blowfish";
version = "2.14";
@@ -4081,6 +4126,33 @@ let
};
};
+ CryptPassphrase = buildPerlPackage {
+ pname = "Crypt-Passphrase";
+ version = "0.003";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-0.003.tar.gz";
+ sha256 = "685aa090f8179a86d6896212ccf8ccfde7a79cce857199bb14e2277a10d240ad";
+ };
+ meta = {
+ description = "A module for managing passwords in a cryptographically agile manner";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ CryptPassphraseArgon2 = buildPerlPackage {
+ pname = "Crypt-Passphrase-Argon2";
+ version = "0.002";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.002.tar.gz";
+ sha256 = "3906ff81697d13804ee21bd5ab78ffb1c4408b4822ce020e92ecf4737ba1f3a8";
+ };
+ propagatedBuildInputs = with perlPackages; [ CryptArgon2 CryptPassphrase ];
+ meta = {
+ description = "An Argon2 encoder for Crypt::Passphrase";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
CryptPasswdMD5 = buildPerlModule {
pname = "Crypt-PasswdMD5";
version = "1.40";
@@ -4565,6 +4637,19 @@ let
};
};
+ CryptX509 = buildPerlPackage {
+ pname = "Crypt-X509";
+ version = "0.53";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz";
+ sha256 = "d2ff614f9457dc87ab277b81bced3532c3ed309b73b9a61aaefbe9488c9e660f";
+ };
+ propagatedBuildInputs = [ ConvertASN1 ];
+ meta = {
+ description = "Parse a X.509 certificate";
+ };
+ };
+
CwdGuard = buildPerlModule {
pname = "Cwd-Guard";
version = "0.05";
@@ -9163,7 +9248,7 @@ let
propagatedBuildInputs = [ Readonly Gtk3 ];
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
- ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
+ ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
make test
'';
meta = {
@@ -9430,6 +9515,21 @@ let
};
};
+ HTMLFormatExternal = buildPerlPackage {
+ pname = "HTML-FormatExternal";
+ version = "26";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/K/KR/KRYDE/HTML-FormatExternal-26.tar.gz";
+ sha256 = "3c59f233d0b10686a85aed0c994011cec68626da0128dea90b5c4fdc1746cfc3";
+ };
+ propagatedBuildInputs = [ IPCRun URI constant-defer ];
+ meta = {
+ homepage = http://user42.tuxfamily.org/html-formatexternal/index.html;
+ description = "HTML to text formatting using external programs";
+ license = lib.licenses.gpl3Plus;
+ };
+ };
+
HTMLFormatTextWithLinks = buildPerlModule {
pname = "HTML-FormatText-WithLinks";
version = "0.15";
@@ -9505,6 +9605,20 @@ let
};
};
+ HTMLGumbo = buildPerlModule {
+ pname = "HTML-Gumbo";
+ version = "0.18";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Gumbo-0.18.tar.gz";
+ sha256 = "bf50b61c24656cc3fc958602d80a9c7d017247af38d8dbfa0e9dec5b75425d5f";
+ };
+ propagatedBuildInputs = [ AlienLibGumbo ];
+ meta = {
+ description = "HTML5 parser based on gumbo C library";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
HTMLMason = buildPerlPackage {
pname = "HTML-Mason";
version = "1.59";
@@ -9868,6 +9982,21 @@ let
propagatedBuildInputs = [ XMLDOM ];
};
+ HTTPHeadersActionPack = buildPerlPackage {
+ pname = "HTTP-Headers-ActionPack";
+ version = "0.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTTP-Headers-ActionPack-0.09.tar.gz";
+ sha256 = "c78111ab857e48c69824903d4b6ce8293feffc6b5d670db550a767f853acc7da";
+ };
+ buildInputs = [ TestFatal TestWarnings ];
+ propagatedBuildInputs = [ HTTPDate HTTPMessage ModuleRuntime SubExporter URI ];
+ meta = {
+ description = "HTTP Action, Adventure and Excitement";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
HTTPHeaderParserXS = buildPerlPackage {
pname = "HTTP-HeaderParser-XS";
version = "0.20";
@@ -10673,6 +10802,16 @@ let
sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61";
};
+ patches = [
+ # Unfortunately, not every release is uploaded to CPAN so security fixes
+ # would need to be cherry-picked from releases
+ (fetchpatch {
+ name = "CVE-2021-22204.patch";
+ url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch";
+ sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj";
+ })
+ ];
+
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/exiftool
@@ -13630,6 +13769,22 @@ let
};
};
+ MojoliciousPluginSyslog = buildPerlPackage {
+ pname = "Mojolicious-Plugin-Syslog";
+ version = "0.04";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.04.tar.gz";
+ sha256 = "807d06b88304675a2bb9181bab123a0e16d3cf2f6a5753a168090ed88085a492";
+ };
+ propagatedBuildInputs = [ Mojolicious ];
+ meta = {
+ homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog";
+ description = "A plugin for enabling a Mojolicious app to log to syslog";
+ license = lib.licenses.artistic2;
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
MojoliciousPluginTextExceptions = buildPerlPackage {
pname = "Mojolicious-Plugin-TextExceptions";
version = "0.02";
@@ -13998,6 +14153,21 @@ let
};
};
+ MooXTypeTiny = buildPerlPackage {
+ pname = "MooX-TypeTiny";
+ version = "0.002003";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-TypeTiny-0.002003.tar.gz";
+ sha256 = "d81e26ff6f8db10261f0087f96dc54367dcb49a9f3de8d53238f834ece19624b";
+ };
+ buildInputs = [ TestFatal ];
+ propagatedBuildInputs = [ Moo TypeTiny ];
+ meta = {
+ description = "Optimized type checks for Moo + Type::Tiny";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
MooseAutobox = buildPerlModule {
pname = "Moose-Autobox";
version = "0.16";
@@ -16434,6 +16604,22 @@ let
};
};
+ PathDispatcher = buildPerlPackage {
+ pname = "Path-Dispatcher";
+ version = "1.08";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/E/ET/ETHER/Path-Dispatcher-1.08.tar.gz";
+ sha256 = "79a9f61c27408b4fd1ed234dac246974ddeafa7fe635a18fe41ec7783130ae2a";
+ };
+ buildInputs = [ ModuleBuildTiny TestFatal ];
+ propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ];
+ meta = {
+ homepage = https://github.com/karenetheridge/Path-Dispatcher;
+ description = "Flexible and extensible dispatch";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
PathIteratorRule = buildPerlPackage {
pname = "Path-Iterator-Rule";
version = "1.014";
@@ -16535,10 +16721,10 @@ let
PDFBuilder = buildPerlPackage {
pname = "PDF-Builder";
- version = "3.021";
+ version = "3.022";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz";
- sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93";
+ url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz";
+ sha256 = "0cfafyci5xar567z82w0vcjrwa6inf1a9ydszgkz51bi1ilj8as8";
};
checkInputs = [ TestException TestMemoryCycle ];
propagatedBuildInputs = [ FontTTF ];
@@ -18809,6 +18995,19 @@ let
};
};
+ StringCompareConstantTime = buildPerlPackage {
+ pname = "String-Compare-ConstantTime";
+ version = "0.321";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/F/FR/FRACTAL/String-Compare-ConstantTime-0.321.tar.gz";
+ sha256 = "0b26ba2b121d8004425d4485d1d46f59001c83763aa26624dff6220d7735d7f7";
+ };
+ meta = {
+ description = "Timing side-channel protected string compare";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
StringCRC32 = buildPerlPackage {
pname = "String-CRC32";
version = "2";
@@ -19000,6 +19199,36 @@ let
};
};
+ ShellConfigGenerate = buildPerlPackage {
+ pname = "Shell-Config-Generate";
+ version = "0.34";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.34.tar.gz";
+ sha256 = "84f451f22215dd68e9c18aa3f7ddb03a82007d166cfada003d0f166f571e0562";
+ };
+ buildInputs = [ Test2Suite ];
+ propagatedBuildInputs = [ ShellGuess ];
+ meta = {
+ homepage = https://metacpan.org/pod/Shell::Config::Generate;
+ description = "Portably generate config for any shell";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ ShellGuess = buildPerlPackage {
+ pname = "Shell-Guess";
+ version = "0.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz";
+ sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b";
+ };
+ meta = {
+ homepage = https://metacpan.org/pod/Shell::Guess;
+ description = "Make an educated guess about the shell in use";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
StringToIdentifierEN = buildPerlPackage {
pname = "String-ToIdentifier-EN";
version = "0.12";
@@ -21558,6 +21787,8 @@ let
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz";
sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h";
};
+ # libbtparse.so: cannot open shared object file (aarch64 only)
+ patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ];
perlPreHook = "export LD=$CC";
perlPostHook = lib.optionalString stdenv.isDarwin ''
oldPath="$(pwd)/btparse/src/libbtparse.dylib"
@@ -22151,6 +22382,21 @@ let
propagatedBuildInputs = [ URI ];
};
+ TextWordDiff = buildPerlPackage {
+ pname = "Text-WordDiff";
+ version = "0.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/T/TI/TIMK/Text-WordDiff-0.09.tar.gz";
+ sha256 = "fee699ca763adca2f4e18f4a8a836fd2102bc2820af708f8eb43356d5ae0d50e";
+ };
+ propagatedBuildInputs = [ AlgorithmDiff HTMLParser ];
+ meta = {
+ homepage = https://metacpan.org/release/Text-WordDiff;
+ description = "Track changes between documents";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TextWrapI18N = buildPerlPackage {
pname = "Text-WrapI18N";
version = "0.06";
@@ -23787,6 +24033,22 @@ let
};
};
+ WebMachine = buildPerlPackage {
+ pname = "Web-Machine";
+ version = "0.17";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/D/DR/DROLSKY/Web-Machine-0.17.tar.gz";
+ sha256 = "f139d2b3114c549e91847daaab8b75cb699e57daf5bbf0dbd13293f33fe5e22a";
+ };
+ buildInputs = [ NetHTTP TestFailWarnings TestFatal ];
+ propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ];
+ meta = {
+ homepage = http://metacpan.org/release/Web-Machine;
+ description = "A Perl port of Webmachine";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
WebServiceLinode = buildPerlModule {
pname = "WebService-Linode";
version = "0.29";
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 3ccaa3259350..c43a57056228 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; {
composer1 = callPackage ../development/php-packages/composer/1.x.nix { };
+ deployer = callPackage ../development/php-packages/deployer { };
+
php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80d8211a63f9..025f0b2ccb19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -247,8 +247,6 @@ in {
aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
- aioeventlet = callPackage ../development/python-modules/aioeventlet { };
-
aioextensions = callPackage ../development/python-modules/aioextensions { };
aiofiles = callPackage ../development/python-modules/aiofiles { };
@@ -313,10 +311,14 @@ in {
aionotion = callPackage ../development/python-modules/aionotion { };
+ aiopg = callPackage ../development/python-modules/aiopg { };
+
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aiopulse = callPackage ../development/python-modules/aiopulse { };
+ aiopvpc = callPackage ../development/python-modules/aiopvpc { };
+
aiopylgtv = callPackage ../development/python-modules/aiopylgtv { };
aiorecollect = callPackage ../development/python-modules/aiorecollect { };
@@ -349,6 +351,8 @@ in {
aiowinreg = callPackage ../development/python-modules/aiowinreg { };
+ aioymaps = callPackage ../development/python-modules/aioymaps { };
+
aiozeroconf = callPackage ../development/python-modules/aiozeroconf { };
airly = callPackage ../development/python-modules/airly { };
@@ -385,6 +389,8 @@ in {
amqplib = callPackage ../development/python-modules/amqplib { };
+ amqtt = callPackage ../development/python-modules/amqtt { };
+
android-backup = callPackage ../development/python-modules/android-backup { };
androidtv = callPackage ../development/python-modules/androidtv { };
@@ -405,7 +411,11 @@ in {
ansi2html = callPackage ../development/python-modules/ansi2html { };
- ansible = callPackage ../development/python-modules/ansible { };
+ ansible = callPackage ../development/python-modules/ansible/legacy.nix { };
+
+ ansible-base = callPackage ../development/python-modules/ansible/base.nix { };
+
+ ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { };
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
@@ -557,6 +567,8 @@ in {
asyncssh = callPackage ../development/python-modules/asyncssh { };
+ asyncstdlib = callPackage ../development/python-modules/asyncstdlib { };
+
async_stagger = callPackage ../development/python-modules/async_stagger { };
asynctest = callPackage ../development/python-modules/asynctest { };
@@ -607,6 +619,8 @@ in {
auth0-python = callPackage ../development/python-modules/auth0-python { };
+ authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { };
+
authheaders = callPackage ../development/python-modules/authheaders { };
authlib = callPackage ../development/python-modules/authlib { };
@@ -617,6 +631,8 @@ in {
autograd = callPackage ../development/python-modules/autograd { };
+ autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };
+
autologging = callPackage ../development/python-modules/autologging { };
automat = callPackage ../development/python-modules/automat { };
@@ -655,6 +671,8 @@ in {
aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
+ awscrt = callPackage ../development/python-modules/awscrt { };
+
awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };
awslambdaric = callPackage ../development/python-modules/awslambdaric { };
@@ -843,6 +861,8 @@ in {
azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { };
+ azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { };
+
azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { };
azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { };
@@ -923,6 +943,8 @@ in {
backports_weakref = callPackage ../development/python-modules/backports_weakref { };
+ backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { };
+
bacpypes = callPackage ../development/python-modules/bacpypes { };
banal = callPackage ../development/python-modules/banal { };
@@ -1069,6 +1091,8 @@ in {
block-io = callPackage ../development/python-modules/block-io { };
+ blspy = callPackage ../development/python-modules/blspy { };
+
bluepy = callPackage ../development/python-modules/bluepy { };
bluepy-devices = callPackage ../development/python-modules/bluepy-devices { };
@@ -1231,6 +1255,8 @@ in {
cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
+ castepxbin = callPackage ../development/python-modules/castepxbin { };
+
casttube = callPackage ../development/python-modules/casttube { };
catalogue = callPackage ../development/python-modules/catalogue { };
@@ -1257,6 +1283,8 @@ in {
connect-box = callPackage ../development/python-modules/connect_box { };
+ coqpit = callPackage ../development/python-modules/coqpit { };
+
cerberus = callPackage ../development/python-modules/cerberus { };
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
@@ -1321,6 +1349,12 @@ in {
chevron = callPackage ../development/python-modules/chevron { };
+ chiabip158 = callPackage ../development/python-modules/chiabip158 { };
+
+ chiapos = callPackage ../development/python-modules/chiapos { };
+
+ chiavdf = callPackage ../development/python-modules/chiavdf { };
+
chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
ci-info = callPackage ../development/python-modules/ci-info { };
@@ -1329,6 +1363,10 @@ in {
cirq = callPackage ../development/python-modules/cirq { };
+ cirq-core = callPackage ../development/python-modules/cirq-core { };
+
+ cirq-google = callPackage ../development/python-modules/cirq-google { };
+
ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
@@ -1361,6 +1399,8 @@ in {
click-completion = callPackage ../development/python-modules/click-completion { };
+ click-configfile = callPackage ../development/python-modules/click-configfile { };
+
click-datetime = callPackage ../development/python-modules/click-datetime { };
click-default-group = callPackage ../development/python-modules/click-default-group { };
@@ -1373,6 +1413,8 @@ in {
click-plugins = callPackage ../development/python-modules/click-plugins { };
+ click-spinner = callPackage ../development/python-modules/click-spinner { };
+
click-repl = callPackage ../development/python-modules/click-repl { };
click-threading = callPackage ../development/python-modules/click-threading { };
@@ -1407,8 +1449,16 @@ in {
cloudscraper = callPackage ../development/python-modules/cloudscraper { };
+ cloudsmith-api = callPackage ../development/python-modules/cloudsmith-api { };
+
clustershell = callPackage ../development/python-modules/clustershell { };
+ clvm = callPackage ../development/python-modules/clvm { };
+
+ clvm-rs = callPackage ../development/python-modules/clvm-rs { };
+
+ clvm-tools = callPackage ../development/python-modules/clvm-tools { };
+
cma = callPackage ../development/python-modules/cma { };
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
@@ -1451,6 +1501,8 @@ in {
colored = callPackage ../development/python-modules/colored { };
+ colored-traceback = callPackage ../development/python-modules/colored-traceback { };
+
coloredlogs = callPackage ../development/python-modules/coloredlogs { };
colorful = callPackage ../development/python-modules/colorful { };
@@ -1473,6 +1525,8 @@ in {
compiledb = callPackage ../development/python-modules/compiledb { };
+ concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { };
+
conda = callPackage ../development/python-modules/conda { };
ConfigArgParse = self.configargparse; # added 2021-03-18
@@ -1609,6 +1663,8 @@ in {
cvxpy = callPackage ../development/python-modules/cvxpy { };
+ cwcwidth = callPackage ../development/python-modules/cwcwidth { };
+
cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
cx_oracle = callPackage ../development/python-modules/cx_oracle { };
@@ -1695,6 +1751,8 @@ in {
datrie = callPackage ../development/python-modules/datrie { };
+ dawg-python = callPackage ../development/python-modules/dawg-python { };
+
dbf = callPackage ../development/python-modules/dbf { };
dbfread = callPackage ../development/python-modules/dbfread { };
@@ -1721,10 +1779,10 @@ in {
debugpy = callPackage ../development/python-modules/debugpy { };
- debut = callPackage ../development/python-modules/debut { };
-
decorator = callPackage ../development/python-modules/decorator { };
+ decopatch = callPackage ../development/python-modules/decopatch { };
+
deep_merge = callPackage ../development/python-modules/deep_merge { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
@@ -1743,6 +1801,8 @@ in {
delegator-py = callPackage ../development/python-modules/delegator-py { };
+ deltachat = callPackage ../development/python-modules/deltachat { };
+
deluge-client = callPackage ../development/python-modules/deluge-client { };
demjson = callPackage ../development/python-modules/demjson { };
@@ -1900,8 +1960,6 @@ in {
django-picklefield = callPackage ../development/python-modules/django-picklefield { };
- django_pipeline = callPackage ../development/python-modules/django-pipeline { };
-
django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };
@@ -1920,7 +1978,7 @@ in {
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
- djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { };
+ djangorestframework-jwt = self.drf-jwt;
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
@@ -2030,12 +2088,16 @@ in {
inherit (pkgs) graphviz;
};
+ dotmap = callPackage ../development/python-modules/dotmap { };
+
dparse = callPackage ../development/python-modules/dparse { };
dpath = callPackage ../development/python-modules/dpath { };
dpkt = callPackage ../development/python-modules/dpkt { };
+ drf-jwt = callPackage ../development/python-modules/drf-jwt { };
+
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
@@ -2289,6 +2351,11 @@ in {
fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
+ fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {
+ withPython = true;
+ inherit python;
+ });
+
fastpair = callPackage ../development/python-modules/fastpair { };
fastparquet = callPackage ../development/python-modules/fastparquet { };
@@ -2319,6 +2386,7 @@ in {
fenics = callPackage ../development/libraries/science/math/fenics {
pytest = self.pytest_4;
+ hdf5 = pkgs.hdf5_1_10;
};
ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
@@ -2533,6 +2601,8 @@ in {
fpylll = callPackage ../development/python-modules/fpylll { };
+ fpyutils = callPackage ../development/python-modules/fpyutils { };
+
freebox-api = callPackage ../development/python-modules/freebox-api { };
freetype-py = callPackage ../development/python-modules/freetype-py { };
@@ -2691,6 +2761,8 @@ in {
glasgow = callPackage ../development/python-modules/glasgow { };
+ glcontext = callPackage ../development/python-modules/glcontext { };
+
glob2 = callPackage ../development/python-modules/glob2 { };
globre = callPackage ../development/python-modules/globre { };
@@ -2971,8 +3043,12 @@ in {
hachoir = callPackage ../development/python-modules/hachoir { };
+ hdate = callPackage ../development/python-modules/hdate { };
+
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
+ ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ };
+
halo = callPackage ../development/python-modules/halo { };
handout = callPackage ../development/python-modules/handout { };
@@ -3067,6 +3143,8 @@ in {
hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
+ hsluv = callPackage ../development/python-modules/hsluv { };
+
hstspreload = callPackage ../development/python-modules/hstspreload { };
html2text = callPackage ../development/python-modules/html2text { };
@@ -3117,6 +3195,8 @@ in {
humanize = callPackage ../development/python-modules/humanize { };
+ humblewx = callPackage ../development/python-modules/humblewx { };
+
hupper = callPackage ../development/python-modules/hupper { };
hvac = callPackage ../development/python-modules/hvac { };
@@ -3154,6 +3234,10 @@ in {
hyppo = callPackage ../development/python-modules/hyppo { };
+ i2c-tools = callPackage ../development/python-modules/i2c-tools {
+ inherit (pkgs) i2c-tools;
+ };
+
i3ipc = callPackage ../development/python-modules/i3ipc { };
i3-py = callPackage ../development/python-modules/i3-py { };
@@ -3254,8 +3338,6 @@ in {
influxgraph = callPackage ../development/python-modules/influxgraph { };
- infoqscraper = callPackage ../development/python-modules/infoqscraper { };
-
inform = callPackage ../development/python-modules/inform { };
iniconfig = callPackage ../development/python-modules/iniconfig { };
@@ -3445,6 +3527,8 @@ in {
jsonlines = callPackage ../development/python-modules/jsonlines { };
+ json-logging = callPackage ../development/python-modules/json-logging { };
+
jsonmerge = callPackage ../development/python-modules/jsonmerge { };
json-merge-patch = callPackage ../development/python-modules/json-merge-patch { };
@@ -3537,6 +3621,8 @@ in {
jwcrypto = callPackage ../development/python-modules/jwcrypto { };
+ jxmlease = callPackage ../development/python-modules/jxmlease { };
+
k5test = callPackage ../development/python-modules/k5test {
inherit (pkgs) krb5Full findutils which;
};
@@ -3557,6 +3643,8 @@ in {
karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { };
+ karton-autoit-ripper = callPackage ../development/python-modules/karton-autoit-ripper { };
+
karton-classifier = callPackage ../development/python-modules/karton-classifier { };
karton-config-extractor = callPackage ../development/python-modules/karton-config-extractor { };
@@ -3591,6 +3679,8 @@ in {
keyring = callPackage ../development/python-modules/keyring { };
+ keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };
+
keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
@@ -3859,6 +3949,8 @@ in {
line_profiler = callPackage ../development/python-modules/line_profiler { };
+ linkify-it-py = callPackage ../development/python-modules/linkify-it-py { };
+
linode-api = callPackage ../development/python-modules/linode-api { };
linode = callPackage ../development/python-modules/linode { };
@@ -3901,6 +3993,8 @@ in {
localzone = callPackage ../development/python-modules/localzone { };
+ locationsharinglib = callPackage ../development/python-modules/locationsharinglib { };
+
locket = callPackage ../development/python-modules/locket { };
lockfile = callPackage ../development/python-modules/lockfile { };
@@ -4077,8 +4171,14 @@ in {
mcstatus = callPackage ../development/python-modules/mcstatus { };
+ md-toc = callPackage ../development/python-modules/md-toc { };
+
md2gemini = callPackage ../development/python-modules/md2gemini { };
+ mdformat = callPackage ../development/python-modules/mdformat { };
+
+ mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
+
MDP = callPackage ../development/python-modules/mdp { };
measurement = callPackage ../development/python-modules/measurement { };
@@ -4113,6 +4213,8 @@ in {
meshlabxml = callPackage ../development/python-modules/meshlabxml { };
+ meshtastic = callPackage ../development/python-modules/meshtastic { };
+
meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs
(oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently.
setupHook = null;
@@ -4225,6 +4327,8 @@ in {
mortgage = callPackage ../development/python-modules/mortgage { };
+ motioneye-client = callPackage ../development/python-modules/motioneye-client { };
+
moto = callPackage ../development/python-modules/moto { };
moviepy = callPackage ../development/python-modules/moviepy { };
@@ -4299,6 +4403,8 @@ in {
mutatormath = callPackage ../development/python-modules/mutatormath { };
+ mutesync = callPackage ../development/python-modules/mutesync { };
+
mwclient = callPackage ../development/python-modules/mwclient { };
mwdblib = callPackage ../development/python-modules/mwdblib { };
@@ -4317,6 +4423,10 @@ in {
mypy = callPackage ../development/python-modules/mypy { };
+ mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
+
+ mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { };
+
mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
@@ -4687,6 +4797,8 @@ in {
ovh = callPackage ../development/python-modules/ovh { };
+ ovoenergy = callPackage ../development/python-modules/ovoenergy { };
+
owslib = callPackage ../development/python-modules/owslib { };
oyaml = callPackage ../development/python-modules/oyaml { };
@@ -4798,6 +4910,8 @@ in {
pathvalidate = callPackage ../development/python-modules/pathvalidate { };
+ pathy = callPackage ../development/python-modules/pathy/default.nix { };
+
patiencediff = callPackage ../development/python-modules/patiencediff { };
patool = callPackage ../development/python-modules/patool { };
@@ -5067,7 +5181,7 @@ in {
poolsense = callPackage ../development/python-modules/poolsense { };
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
- inherit (pkgs.qt5) qtbase;
+ inherit (pkgs.qt5) qtbase qmake;
inherit (pkgs.libsForQt5) poppler;
};
@@ -5111,6 +5225,8 @@ in {
praw = callPackage ../development/python-modules/praw { };
+ prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { };
+
precis-i18n = callPackage ../development/python-modules/precis-i18n { };
pre-commit = callPackage ../development/python-modules/pre-commit { };
@@ -5133,7 +5249,9 @@ in {
prison = callPackage ../development/python-modules/prison { };
- privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
+ privacyidea = callPackage ../development/python-modules/privacyidea { };
+
+ pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
proboscis = callPackage ../development/python-modules/proboscis { };
@@ -5244,6 +5362,10 @@ in {
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
+ py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
+
+ py-ubjson = callPackage ../development/python-modules/py-ubjson { };
+
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
@@ -5354,6 +5476,10 @@ in {
pycfdns = callPackage ../development/python-modules/pycfdns { };
+ pycflow2dot = callPackage ../development/python-modules/pycflow2dot {
+ inherit (pkgs) graphviz;
+ };
+
pychannels = callPackage ../development/python-modules/pychannels { };
pychart = callPackage ../development/python-modules/pychart { };
@@ -5390,6 +5516,8 @@ in {
pycparser = callPackage ../development/python-modules/pycparser { };
+ py-canary = callPackage ../development/python-modules/py-canary { };
+
py-cid = callPackage ../development/python-modules/py-cid { };
py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { };
@@ -5427,6 +5555,8 @@ in {
pydeconz = callPackage ../development/python-modules/pydeconz { };
+ pydelijn = callPackage ../development/python-modules/pydelijn { };
+
pydenticon = callPackage ../development/python-modules/pydenticon { };
pydexcom = callPackage ../development/python-modules/pydexcom { };
@@ -5543,6 +5673,8 @@ in {
pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
+ pygatt = callPackage ../development/python-modules/pygatt { };
+
pygbm = callPackage ../development/python-modules/pygbm { };
pygccxml = callPackage ../development/python-modules/pygccxml { };
@@ -5605,6 +5737,8 @@ in {
pyi2cflash = callPackage ../development/python-modules/pyi2cflash { };
+ pyialarm = callPackage ../development/python-modules/pyialarm { };
+
pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { };
@@ -5653,6 +5787,8 @@ in {
pykodi = callPackage ../development/python-modules/pykodi { };
+ pykoplenti = callPackage ../development/python-modules/pykoplenti { };
+
pykwalify = callPackage ../development/python-modules/pykwalify { };
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
@@ -5753,6 +5889,8 @@ in {
pymetar = callPackage ../development/python-modules/pymetar { };
+ pymeteireann = callPackage ../development/python-modules/pymeteireann { };
+
pymetno = callPackage ../development/python-modules/pymetno { };
pymitv = callPackage ../development/python-modules/pymitv { };
@@ -5763,6 +5901,10 @@ in {
pymongo = callPackage ../development/python-modules/pymongo { };
+ pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
+
+ pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
+
pympler = callPackage ../development/python-modules/pympler { };
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
@@ -5809,6 +5951,8 @@ in {
pynest2d = callPackage ../development/python-modules/pynest2d { };
+ pynetbox = callPackage ../development/python-modules/pynetbox { };
+
pynetdicom = callPackage ../development/python-modules/pynetdicom { };
pynisher = callPackage ../development/python-modules/pynisher { };
@@ -5825,6 +5969,8 @@ in {
pynzb = callPackage ../development/python-modules/pynzb { };
+ pyobihai = callPackage ../development/python-modules/pyobihai { };
+
pyocr = callPackage ../development/python-modules/pyocr {
tesseract = pkgs.tesseract4;
};
@@ -5837,7 +5983,9 @@ in {
phonemizer = callPackage ../development/python-modules/phonemizer { };
- pyopencl = callPackage ../development/python-modules/pyopencl { };
+ pyopencl = callPackage ../development/python-modules/pyopencl {
+ mesa_drivers = pkgs.mesa.drivers;
+ };
pyopengl = callPackage ../development/python-modules/pyopengl { };
@@ -5855,6 +6003,8 @@ in {
inherit (pkgs) lz4;
};
+ pyotgw = callPackage ../development/python-modules/pyotgw { };
+
pyotp = callPackage ../development/python-modules/pyotp { };
pyowm = callPackage ../development/python-modules/pyowm { };
@@ -5896,6 +6046,8 @@ in {
pypinyin = callPackage ../development/python-modules/pypinyin { };
+ pypiserver = callPackage ../development/python-modules/pypiserver { };
+
pyplaato = callPackage ../development/python-modules/pyplaato { };
pyplatec = callPackage ../development/python-modules/pyplatec { };
@@ -6166,6 +6318,8 @@ in {
py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
+ pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };
+
pysvn = callPackage ../development/python-modules/pysvn {
inherit (pkgs) bash subversion apr aprutil expat neon openssl;
};
@@ -6249,6 +6403,8 @@ in {
pytest-cache = self.pytestcache; # added 2021-01-04
pytestcache = callPackage ../development/python-modules/pytestcache { };
+ pytest-cases = callPackage ../development/python-modules/pytest-cases{ };
+
pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { };
pytest-celery = callPackage ../development/python-modules/pytest-celery { };
@@ -6259,6 +6415,8 @@ in {
pytest-click = callPackage ../development/python-modules/pytest-click { };
+ pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { };
+
pytest-cov = self.pytestcov; # self 2021-01-04
pytestcov = callPackage ../development/python-modules/pytest-cov { };
@@ -6350,6 +6508,8 @@ in {
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+ pytest-regressions = callPackage ../development/python-modules/pytest-regressions { };
+
pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };
pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { };
@@ -6542,8 +6702,8 @@ in {
pythonnet = callPackage
../development/python-modules/pythonnet {
- # `mono >= 4.6` required to prevent crashes encountered with earlier versions.
- mono = pkgs.mono4;
+ # Using `mono > 5`, tests are failing..
+ mono = pkgs.mono5;
};
python-nmap = callPackage ../development/python-modules/python-nmap { };
@@ -6610,6 +6770,8 @@ in {
python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { };
+ python-socks = callPackage ../development/python-modules/python-socks { };
+
python-sql = callPackage ../development/python-modules/python-sql { };
python-stdnum = callPackage ../development/python-modules/python-stdnum { };
@@ -6658,6 +6820,8 @@ in {
pytoml = callPackage ../development/python-modules/pytoml { };
+ pytomlpp = callPackage ../development/python-modules/pytomlpp { };
+
pytools = callPackage ../development/python-modules/pytools { };
pytorch = callPackage ../development/python-modules/pytorch {
@@ -6741,6 +6905,10 @@ in {
pyvicare = callPackage ../development/python-modules/pyvicare { };
+ pyvisa = callPackage ../development/python-modules/pyvisa { };
+
+ pyvisa-py = callPackage ../development/python-modules/pyvisa-py { };
+
pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
pyvizio = callPackage ../development/python-modules/pyvizio { };
@@ -6787,6 +6955,8 @@ in {
pyx = callPackage ../development/python-modules/pyx { };
+ pyxb = callPackage ../development/python-modules/pyxb { };
+
pyxbe = callPackage ../development/python-modules/pyxbe { };
pyxdg = callPackage ../development/python-modules/pyxdg { };
@@ -7132,8 +7302,12 @@ in {
rsa = callPackage ../development/python-modules/rsa { };
+ rst2ansi = callPackage ../development/python-modules/rst2ansi { };
+
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
+ rtoml = callPackage ../development/python-modules/rtoml { };
+
Rtree = callPackage ../development/python-modules/Rtree {
inherit (pkgs) libspatialindex;
};
@@ -7195,9 +7369,22 @@ in {
samsungtvws = callPackage ../development/python-modules/samsungtvws { };
+ sanic = callPackage ../development/python-modules/sanic {
+ # pytest-sanic is doing ok for the sole purpose of testing Sanic.
+ pytest-sanic = self.pytest-sanic.overridePythonAttrs (oldAttrs: {
+ doCheck = false;
+ meta.broken = false;
+ });
+ # Don't pass any `sanic` to avoid dependency loops. `sanic-testing`
+ # has special logic to disable tests when this is the case.
+ sanic-testing = self.sanic-testing.override { sanic = null; };
+ };
+
sanic-auth = callPackage ../development/python-modules/sanic-auth { };
- sanic = callPackage ../development/python-modules/sanic { };
+ sanic-routing = callPackage ../development/python-modules/sanic-routing { };
+
+ sanic-testing = callPackage ../development/python-modules/sanic-testing { };
sapi-python-client = callPackage ../development/python-modules/sapi-python-client { };
@@ -7227,10 +7414,12 @@ in {
scikitimage = callPackage ../development/python-modules/scikit-image { };
- scikitlearn = callPackage ../development/python-modules/scikitlearn {
+ scikit-learn = callPackage ../development/python-modules/scikit-learn {
inherit (pkgs) gfortran glibcLocales;
};
+ scikitlearn = self.scikit-learn;
+
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
scikits-odes = callPackage ../development/python-modules/scikits-odes { };
@@ -7344,6 +7533,8 @@ in {
setproctitle = callPackage ../development/python-modules/setproctitle { };
+ setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { };
+
setuptools-git = callPackage ../development/python-modules/setuptools-git { };
setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
@@ -7429,9 +7620,9 @@ in {
signify = callPackage ../development/python-modules/signify { };
- sip = callPackage ../development/python-modules/sip { };
+ sip = callPackage ../development/python-modules/sip/default.nix { };
- sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
+ sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
six = callPackage ../development/python-modules/six { };
@@ -7461,8 +7652,6 @@ in {
slicerator = callPackage ../development/python-modules/slicerator { };
- slimit = callPackage ../development/python-modules/slimit { };
-
slither-analyzer = callPackage ../development/python-modules/slither-analyzer { };
slixmpp = callPackage ../development/python-modules/slixmpp {
@@ -7559,8 +7748,16 @@ in {
spacy = callPackage ../development/python-modules/spacy { };
+ spacy-alignments = callPackage ../development/python-modules/spacy-alignments { };
+
+ spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };
+
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
+ spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { };
+
+ spacy-transformers = callPackage ../development/python-modules/spacy-transformers { };
+
spake2 = callPackage ../development/python-modules/spake2 { };
spark_parser = callPackage ../development/python-modules/spark_parser { };
@@ -7585,6 +7782,8 @@ in {
spinners = callPackage ../development/python-modules/spinners { };
+ sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
+
sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
@@ -7607,6 +7806,8 @@ in {
sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
+ sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
+
sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { };
sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };
@@ -7619,6 +7820,8 @@ in {
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };
+ sphinxcontrib-seqdiag = callPackage ../development/python-modules/sphinxcontrib-seqdiag { };
+
sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz {
@@ -7635,6 +7838,8 @@ in {
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
+ sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };
+
sphinx-material = callPackage ../development/python-modules/sphinx-material { };
sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };
@@ -7853,8 +8058,6 @@ in {
tappy = callPackage ../development/python-modules/tappy { };
- tarman = callPackage ../development/python-modules/tarman { };
-
tasklib = callPackage ../development/python-modules/tasklib { };
taskw = callPackage ../development/python-modules/taskw { };
@@ -8028,6 +8231,8 @@ in {
tilestache = callPackage ../development/python-modules/tilestache { };
+ timeago = callPackage ../development/python-modules/timeago { };
+
timelib = callPackage ../development/python-modules/timelib { };
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
@@ -8084,6 +8289,8 @@ in {
torchvision = callPackage ../development/python-modules/torchvision { };
+ torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };
+
tornado = callPackage ../development/python-modules/tornado { };
# Used by circus and grab-site, 2020-08-29
@@ -8150,6 +8357,8 @@ in {
trytond = callPackage ../development/python-modules/trytond { };
+ ttp = callPackage ../development/python-modules/ttp { };
+
tunigo = callPackage ../development/python-modules/tunigo { };
tubeup = callPackage ../development/python-modules/tubeup { };
@@ -8248,6 +8457,8 @@ in {
uarray = callPackage ../development/python-modules/uarray { };
+ uc-micro-py = callPackage ../development/python-modules/uc-micro-py { };
+
ueberzug = callPackage ../development/python-modules/ueberzug {
inherit (pkgs.xorg) libX11 libXext;
};
@@ -8540,6 +8751,8 @@ in {
websockify = callPackage ../development/python-modules/websockify { };
+ webssh = callPackage ../development/python-modules/webssh { };
+
webtest = callPackage ../development/python-modules/webtest { };
webthing = callPackage ../development/python-modules/webthing { };
@@ -8741,6 +8954,8 @@ in {
yanc = callPackage ../development/python-modules/yanc { };
+ yangson = callPackage ../development/python-modules/yangson { };
+
yapf = callPackage ../development/python-modules/yapf { };
yappi = callPackage ../development/python-modules/yappi { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 74a15bb7ac7c..221da6daa9aa 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -178,6 +178,8 @@ with self; with super; {
importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { };
+ importlib-resources = callPackage ../development/python-modules/importlib-resources/2.nix { };
+
ipaddr = callPackage ../development/python-modules/ipaddr { };
ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { };
@@ -381,7 +383,9 @@ with self; with super; {
prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
- privacyidea = callPackage ../development/python-modules/privacyidea { };
+ privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
+
+ ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { };
progressbar231 = callPackage ../development/python-modules/progressbar231 { };
@@ -431,6 +435,8 @@ with self; with super; {
pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
+ pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { };
+
pykickstart = callPackage ../development/python-modules/pykickstart { };
pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };
@@ -518,7 +524,7 @@ with self; with super; {
scandir = callPackage ../development/python-modules/scandir { };
- scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {
+ scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix {
inherit (pkgs) gfortran glibcLocales;
};
@@ -604,8 +610,6 @@ with self; with super; {
traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
- trollius = callPackage ../development/python-modules/trollius { };
-
ttystatus = callPackage ../development/python-modules/ttystatus { };
TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index bfc576e65549..f5e11a0db8b5 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -53,6 +53,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
alkimia = callPackage ../development/libraries/alkimia { };
+ applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { };
+
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
dxflib = callPackage ../development/libraries/dxflib {};
@@ -121,6 +123,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
mauikit = callPackage ../development/libraries/mauikit { };
+ mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { };
+
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
openbr = callPackage ../development/libraries/openbr { };
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
new file mode 100644
index 000000000000..38f5e2a41565
--- /dev/null
+++ b/pkgs/top-level/release-haskell.nix
@@ -0,0 +1,279 @@
+/*
+ This is the Hydra jobset for the `haskell-updates` branch in Nixpkgs.
+ You can see the status of this jobset at
+ https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
+
+ To debug this expression you can use `hydra-eval-jobs` from
+ `pkgs.hydra-unstable` which prints the jobset description
+ to `stdout`:
+
+ $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
+*/
+{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }:
+
+let
+
+ releaseLib = import ./release-lib.nix {
+ inherit supportedSystems;
+ };
+
+ inherit (releaseLib)
+ pkgs
+ packagePlatforms
+ mapTestOn
+ aggregate
+ ;
+
+ inherit (pkgs) lib;
+
+ # helper function which traverses a (nested) set
+ # of derivations produced by mapTestOn and flattens
+ # it to a list of derivations suitable to be passed
+ # to `releaseTools.aggregate` as constituents.
+ accumulateDerivations = jobList:
+ lib.concatMap (
+ attrs:
+ if lib.isDerivation attrs
+ then [ attrs ]
+ else if lib.isAttrs attrs
+ then accumulateDerivations (lib.attrValues attrs)
+ else []
+ ) jobList;
+
+ # names of all subsets of `pkgs.haskell.packages`
+ compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages;
+
+ # list of all compilers to test specific packages on
+ all = with compilerNames; [
+ ghc884
+ ghc8104
+ ghc901
+ ];
+
+ # packagePlatforms applied to `haskell.packages.*`
+ compilerPlatforms = lib.mapAttrs
+ (_: v: packagePlatforms v)
+ pkgs.haskell.packages;
+
+ # This function lets you specify specific packages
+ # which are to be tested on a list of specific GHC
+ # versions and returns a job set for all specified
+ # combinations. See `jobs` below for an example.
+ versionedCompilerJobs = config: mapTestOn {
+ haskell.packages =
+ (lib.mapAttrs (
+ ghc: jobs:
+ lib.filterAttrs (
+ jobName: platforms:
+ lib.elem ghc (config."${jobName}" or [])
+ ) jobs
+ ) compilerPlatforms);
+ };
+
+ # hydra jobs for `pkgs` of which we import a subset of
+ pkgsPlatforms = packagePlatforms pkgs;
+
+ # names of packages in an attribute set that are maintained
+ maintainedPkgNames = set: builtins.attrNames
+ (lib.filterAttrs (
+ _: v: builtins.length (v.meta.maintainers or []) > 0
+ ) set);
+
+ recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
+
+ jobs = recursiveUpdateMany [
+ (mapTestOn {
+ haskellPackages = packagePlatforms pkgs.haskellPackages;
+ haskell.compiler = packagePlatforms pkgs.haskell.compiler;
+
+ tests = let
+ testPlatforms = packagePlatforms pkgs.tests;
+ in {
+ haskell = testPlatforms.haskell;
+ writers = testPlatforms.writers;
+ };
+
+ # top-level packages that depend on haskellPackages
+ inherit (pkgsPlatforms)
+ agda
+ arion
+ bench
+ bustle
+ blucontrol
+ cabal-install
+ cabal2nix
+ cachix
+ carp
+ cedille
+ client-ip-echo
+ darcs
+ dconf2nix
+ dhall
+ dhall-bash
+ dhall-docs
+ dhall-lsp-server
+ dhall-json
+ dhall-nix
+ dhall-text
+ diagrams-builder
+ elm2nix
+ fffuu
+ futhark
+ ghcid
+ git-annex
+ git-brunch
+ gitit
+ glirc
+ hadolint
+ haskell-ci
+ haskell-language-server
+ hasura-graphql-engine
+ hci
+ hercules-ci-agent
+ hinit
+ hedgewars
+ hledger
+ hledger-iadd
+ hledger-interest
+ hledger-ui
+ hledger-web
+ hlint
+ hpack
+ hyper-haskell
+ hyper-haskell-server-with-packages
+ icepeak
+ idris
+ ihaskell
+ jl
+ koka
+ krank
+ lambdabot
+ madlang
+ matterhorn
+ mueval
+ neuron-notes
+ niv
+ nix-delegate
+ nix-deploy
+ nix-diff
+ nix-linter
+ nix-output-monitor
+ nix-script
+ nix-tree
+ nixfmt
+ nota
+ ormolu
+ pandoc
+ pakcs
+ petrinizer
+ place-cursor-at
+ pinboard-notes-backup
+ pretty-simple
+ shake
+ shellcheck
+ sourceAndTags
+ spacecookie
+ spago
+ splot
+ stack
+ stack2nix
+ stutter
+ stylish-haskell
+ taffybar
+ tamarin-prover
+ taskell
+ termonad-with-packages
+ tldr-hs
+ tweet-hs
+ update-nix-fetchgit
+ uqm
+ uuagc
+ vaultenv
+ wstunnel
+ xmobar
+ xmonad-with-packages
+ yi
+ zsh-git-prompt
+ ;
+
+ elmPackages.elm = pkgsPlatforms.elmPackages.elm;
+ })
+ (versionedCompilerJobs {
+ # Packages which should be checked on more than the
+ # default GHC version. This list can be used to test
+ # the state of the package set with newer compilers
+ # and to confirm that critical packages for the
+ # package sets (like Cabal, jailbreak-cabal) are
+ # working as expected.
+ cabal-install = all;
+ Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
+ funcmp = all;
+ # Doesn't currently work on ghc-9.0:
+ # https://github.com/haskell/haskell-language-server/issues/297
+ haskell-language-server = with compilerNames; [ ghc884 ghc8104 ];
+ hoogle = all;
+ hsdns = all;
+ jailbreak-cabal = all;
+ language-nix = all;
+ nix-paths = all;
+ titlecase = all;
+ })
+ {
+ mergeable = pkgs.releaseTools.aggregate {
+ name = "haskell-updates-mergeable";
+ meta = {
+ description = ''
+ Critical haskell packages that should work at all times,
+ serves as minimum requirement for an update merge
+ '';
+ maintainers = lib.teams.haskell.members;
+ };
+ constituents = accumulateDerivations [
+ # haskell specific tests
+ jobs.tests.haskell
+ # writeHaskell and writeHaskellBin
+ # TODO: writeHaskell currently fails on darwin
+ jobs.tests.writers.x86_64-linux
+ jobs.tests.writers.aarch64-linux
+ # important top-level packages
+ jobs.cabal-install
+ jobs.cabal2nix
+ jobs.cachix
+ jobs.darcs
+ jobs.haskell-language-server
+ jobs.hledger
+ jobs.hledger-ui
+ jobs.hpack
+ jobs.niv
+ jobs.pandoc
+ jobs.stack
+ jobs.stylish-haskell
+ # important haskell (library) packages
+ jobs.haskellPackages.cabal-plan
+ jobs.haskellPackages.distribution-nixpkgs
+ jobs.haskellPackages.hackage-db
+ jobs.haskellPackages.policeman
+ jobs.haskellPackages.xmonad
+ jobs.haskellPackages.xmonad-contrib
+ # haskell packages maintained by @peti
+ # imported from the old hydra jobset
+ jobs.haskellPackages.hopenssl
+ jobs.haskellPackages.hsemail
+ jobs.haskellPackages.hsyslog
+ ];
+ };
+ maintained = pkgs.releaseTools.aggregate {
+ name = "maintained-haskell-packages";
+ meta = {
+ description = "Aggregate jobset of all haskell packages with a maintainer";
+ maintainers = lib.teams.haskell.members;
+ };
+ constituents = accumulateDerivations
+ (builtins.map
+ (name: jobs.haskellPackages."${name}")
+ (maintainedPkgNames pkgs.haskellPackages));
+ };
+ }
+ ];
+
+in jobs
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 1d928ce05a93..123bc1ead18b 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dr6w3h7i7xyqd04aw66x2ddm7xinvlw02pkk1sxczi8x21z16hf";
+ sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w3cq2m1qbmxp7yv3qs82ffn9y46vq5q04vqwxak6ln0ki0v4hn4";
+ sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wsa6kcgjx5am9hn44q2afg174m2gda4n8bfk5na17nj48s9g1ii";
+ sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0brr9kbmmc4fr2x8a7kj88yv8whfjfvalik3h82ypxlbg5b1c9iz";
+ sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04f7x7ycg73zc2v3lhvrnl072f7nl0nhp0sspfa2sqq14v4akmmb";
+ sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m009iki20hhwwj713bqdw57hmz650l7drfbajw32xn2qnawf294";
+ sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zjwcfr4qyff9ln4hhjb1csbjpvr3z4pdgvg8axvhcs86h4xpy2n";
+ sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
activemodel = {
dependencies = ["activesupport"];
@@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "118slj94hif5g1maaijlxsywrq75h7qdz20bq62303pkrzabjaxm";
+ sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jva5iqnjmj76mhhxcvx6xzda071cy80bhxn3r79f76pvgwwyymg";
+ sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1800ski0619mzyk2p2xcmy4xlym18g3lbqw8wb3ss06jhvn5dl5p";
+ sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc";
+ sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -147,10 +147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05brc25pfvak610mdwgjsc64di29yff9i9g72m6hyc21pdjwfy3n";
+ sha256 = "03xphzq4fgva2xiwlpc7jqp0jl6k022gp7alwg0r7vyai0zx6q5n";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
atomos = {
groups = ["default"];
@@ -219,10 +219,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "136aa800dgq6bmr0lb59mfj5q72r712wwp5wy5qxnp48adjw1k2h";
+ sha256 = "0aq55b8b33pl0yi2abib8i8d22rifji8nzfpf48vj0a0092rllcl";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
camping = {
dependencies = ["mab" "rack"];
@@ -683,10 +683,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
+ sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
data_objects = {
dependencies = ["addressable"];
@@ -745,10 +745,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z";
+ sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
type = "gem";
};
- version = "1.3.5";
+ version = "1.4.0";
};
domain_name = {
dependencies = ["unf"];
@@ -808,10 +808,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cql2cxl9bg8gbmmlzl4kvpq7y0gjldgarsnxq35vpd7ga3h54w2";
+ sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
type = "gem";
};
- version = "0.13.0";
+ version = "0.14.0";
};
eventmachine = {
groups = ["default"];
@@ -828,10 +828,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jn8s74nxsh0vmxv2fjrrrc3b2cgp8d267dyn206hbw5ki4pkd85";
+ sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7";
type = "gem";
};
- version = "0.80.1";
+ version = "0.81.0";
};
faraday = {
dependencies = ["faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"];
@@ -912,10 +912,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn";
+ sha256 = "0l5zk5pzyrydavyw2ai6yz97alg4qvd93mb19m6460vzrj6x00qg";
type = "gem";
};
- version = "2.2.3";
+ version = "2.2.4";
};
fog-dnsimple = {
dependencies = ["fog-core" "fog-json"];
@@ -985,10 +985,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hslcfns2ysvjyj21hjvp4hghrafw1sdl627fm0nj0wsncs94m67";
+ sha256 = "0jjgqg1iys8k5mjb1wlg8x26d97h1yikgipxwjf9rlyl4i725gn1";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
gio2 = {
dependencies = ["gobject-introspection"];
@@ -996,10 +996,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l30xsr1dgnzqfmln17arnqi8iga97ldf6zgbqrfby6a94v3ammd";
+ sha256 = "0m1dafspwk38jhk8kgk7v1r8pphz42mk9jkz8h3rvlxqnrnsl7sk";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
gitlab-markup = {
groups = ["default"];
@@ -1017,10 +1017,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l46ymdf7azpd137xq4rarbaq54hxs9rgfry0r6b0ywj74rmw9ih";
+ sha256 = "1qk30k15qk93mhw2dl191akqs9m0016avc8pwzvvcm7gk99qpbxc";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
globalid = {
dependencies = ["activesupport"];
@@ -1039,10 +1039,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11gas9hzq36a2bwqi7h5c6p6jihanbhsarwhv5fw53dxap4iwj25";
+ sha256 = "0wm1s6xa2cf1n2yvcya8ah57rc0q1klmnrvvdaby3qyn8a6gdlby";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
gpgme = {
dependencies = ["mini_portile2"];
@@ -1056,15 +1056,14 @@
version = "2.0.20";
};
gtk2 = {
- dependencies = ["atk" "gdk_pixbuf2" "pango"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v1ag6irp52asm0yaxa7s533czy7yzhanhgn1v0cndqpzqk8icfz";
+ sha256 = "09n8gz5h0d0wwrifr8c8z0b4vrd64xdi4lws8p6gpz0j0pxm5fzh";
type = "gem";
};
- version = "3.4.3";
+ version = "3.2.6";
};
hashie = {
groups = ["default"];
@@ -1300,10 +1299,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h2sc2la6dd808pfnd7vh66fqwc7xg3nd2jqr4pdqymxspk9zcsq";
+ sha256 = "1wbz3cjfrz3ii70lmmyspkm29x2wyr44ly0m818d2w7qi3igq79p";
type = "gem";
};
- version = "1.4.3";
+ version = "1.4.12";
};
libv8 = {
groups = ["default"];
@@ -1476,10 +1475,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
+ sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
type = "gem";
};
- version = "2.5.0";
+ version = "2.5.1";
};
minitest = {
groups = ["default"];
@@ -1639,10 +1638,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
+ sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
type = "gem";
};
- version = "1.11.3";
+ version = "1.11.5";
};
opus-ruby = {
dependencies = ["ffi"];
@@ -1683,10 +1682,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05smxn2jank7wqih59lhr30ab8f4qxdsdiiag5v7a0gjgzkmbi7f";
+ sha256 = "0vz880akmcgxf30mrmkld5zyvzr79qaaprnrn10yn7915qsqjh51";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
parallel = {
groups = ["default"];
@@ -1704,10 +1703,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04ri489irbbx6sbkclpgri7j7p99v2qib5g2i70xx5fay12ilny8";
+ sha256 = "1pxsi1i5z506xfzhiyavlasf8777h55ab40phvp7pfv9npmd5pnj";
type = "gem";
};
- version = "3.0.1.0";
+ version = "3.0.1.1";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -1776,10 +1775,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr";
+ sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
type = "gem";
};
- version = "0.14.1";
+ version = "0.13.1";
};
pry-byebug = {
dependencies = ["byebug" "pry"];
@@ -1787,10 +1786,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07cv2hddswb334777pjgc9avxn0x9qhrdr191g7windvnjk3scvg";
+ sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv";
type = "gem";
};
- version = "3.8.0";
+ version = "3.9.0";
};
pry-doc = {
dependencies = ["pry" "yard"];
@@ -1819,10 +1818,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
+ sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i";
type = "gem";
};
- version = "5.2.2";
+ version = "5.3.1";
};
racc = {
groups = ["default"];
@@ -1872,10 +1871,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yl6wy2gfvjkq0457plwadk7jwx5sbpqxl9aycbphskisis9g238";
+ sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -1905,10 +1904,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m3ckisji9n3li2700jpkyncsrh5b2z20zb0b4jl5x16cwsymr7b";
+ sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2";
type = "gem";
};
- version = "6.1.3.1";
+ version = "6.1.3.2";
};
rainbow = {
groups = ["default"];
@@ -1935,10 +1934,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
+ sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
type = "gem";
};
- version = "0.10.4";
+ version = "0.11.0";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -1987,10 +1986,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca";
+ sha256 = "1kdjqvd9zdim2im6492lb4f3559sblrxcnza2xm7j7qr8hhyvisj";
type = "gem";
};
- version = "0.1.1";
+ version = "0.1.2";
};
redcarpet = {
groups = ["default"];
@@ -2155,10 +2154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cgrj670wrdw202pddiawcx2jbkcp7ja8zbc646by7nrg9ax492d";
+ sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
type = "gem";
};
- version = "1.13.0";
+ version = "1.15.0";
};
rubocop-ast = {
dependencies = ["parser"];
@@ -2166,10 +2165,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
+ sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf";
type = "gem";
};
- version = "1.4.1";
+ version = "1.5.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@@ -2177,10 +2176,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15";
+ sha256 = "0sllna4r40gbw0llh8p9581mfjvi535gfby27m2b11q5x5phrhwc";
type = "gem";
};
- version = "1.10.2";
+ version = "1.11.3";
};
ruby-graphviz = {
dependencies = ["rexml"];
@@ -2227,11 +2226,13 @@
groups = ["default"];
platforms = [];
source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
- type = "gem";
+ url = "https://github.com/akr/ruby-terminfo";
+ rev = "8aaa20b15fcf922239c200a1cccbc8853c397bb4";
+ fetchSubmodules = false;
+ sha256 = "1ak85bmnaqwpyx07wb6wfa2cr06gb30gnmv9knijnsbv4q583xlz";
+ type = "git";
};
- version = "0.1.1";
+ version = "0.2";
};
ruby-vips = {
dependencies = ["ffi"];
@@ -2239,10 +2240,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wy58f9qijwvkmw1j40ak2v5nsr3wcwsa1nilfw047liwyi06yad";
+ sha256 = "1zd93idvk2qs3accbfg7g77fb02k8qlrq1arqm4bbx2ylk9j66kf";
type = "gem";
};
- version = "2.1.0";
+ version = "2.1.2";
};
ruby2_keywords = {
groups = ["default"];
@@ -2332,10 +2333,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i2zbx3zkrppvf7zmk5hpiji9kj18c0yavcr2c3i0gaqskhzvaj9";
+ sha256 = "18b89pmkfnb8q8n3q774ifn317wsxwgcqa0d9zklqsfyrg53768i";
type = "gem";
};
- version = "5.43.0";
+ version = "5.44.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@@ -2374,10 +2375,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cl3j7p3b5q7sxsx1va63c8imc5x6g99xablz08qrmqhpi0d6g6j";
+ sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl";
type = "gem";
};
- version = "0.1.2";
+ version = "0.1.3";
};
sinatra = {
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
@@ -2396,20 +2397,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0516kmcypysgf2lw8zm8n9yghv6igqgphhfgmgyzgiin388xw4gj";
+ sha256 = "07an5s5xfg8mll0h9ihdc1n23k6n9anil9ca07rm77aiq6k0n0vy";
type = "gem";
};
- version = "2.7.0";
+ version = "2.7.1";
};
slop = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
+ sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
type = "gem";
};
- version = "4.8.2";
+ version = "4.9.0";
};
snappy = {
groups = ["default"];
@@ -2509,10 +2510,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hy3kbcb6nwydy312rhjm4b30yavmayszzzyjpfdv6p0s8d9mfvb";
+ sha256 = "06fa5xpw5zrnhg0ds246l8sq49k22hpplqa1msxylnqibbsnb2y9";
type = "gem";
};
- version = "2.1.3";
+ version = "2.1.5";
};
treetop = {
dependencies = ["polyglot"];
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index e73eba8e1422..32559c0e7990 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -25,7 +25,7 @@ self: super: let
}; in stdenv // {
mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
- + optionalString stdenv.cc.isGNU " -static-libgcc";
+ + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc";
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
substitutions = {
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-20 02:17:08 +0000