diff options
Diffstat (limited to 'pkgs/top-level')
27 files changed, 3512 insertions, 2940 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e7c2deca6a115..afce83f9c5e06 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -3,11 +3,11 @@ lib: self: super: with self; let - # Removing recurseForDerivation prevents derivations of aliased attribute - # set to appear while listing all the packages available. + # Removing recurseForDerivation prevents derivations of aliased attribute set + # to appear while listing all the packages available. removeRecurseForDerivations = alias: with lib; - if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package @@ -17,107 +17,133 @@ let dontDistribute alias else alias; - # Make sure that we are not shadowing something from - # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n super - then throw "Alias ${n} is still in all-packages.nix" - else alias; + # Make sure that we are not shadowing something from all-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in all-packages.nix" + else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute - (removeRecurseForDerivations - (checkInPkgs n alias))) - aliases; + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; in - ### Deprecated aliases - for backward compatibility +### Deprecated aliases - for backward compatibility +### Please maintain this list in ASCIIbetical ordering. +### Hint: the "sections" are delimited by ### <letter> ### mapAliases ({ + # forceSystem should not be used directly in Nixpkgs. + # Added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; - PPSSPP = ppsspp; # added 2017-10-01 - QmidiNet = qmidinet; # added 2016-05-22 - accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; # added 2013-11-04 - adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 - aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - ag = silver-searcher; # added 2018-04-25 - aircrackng = aircrack-ng; # added 2016-01-14 - aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 - alienfx = throw "alienfx has been removed."; # added 2019-12-08 - alsaLib = alsa-lib; # added 2021-06-09 - alsaOss = alsa-oss; # added 2021-06-10 - alsaPlugins = alsa-plugins; # added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 - alsaTools = alsa-tools; # added 2021-06-10 - alsaUtils = alsa-utils; # added 2021-06-10 - amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 - aminal = throw "aminal was renamed to darktile."; # added 2021-09-28 - ammonite-repl = ammonite; # added 2017-05-02 - amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 - angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 - antimicroX = antimicrox; # added 2021-10-31 - arduino_core = arduino-core; # added 2015-02-04 - ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 - arora = throw "arora has been removed."; # added 2020-09-09 - asciidocFull = asciidoc-full; # added 2014-06-22 - asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 - at_spi2_atk = at-spi2-atk; # added 2018-02-25 - 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 - azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 + + ### A ### + + accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19 + adobeReader = adobe-reader; # Added 2013-11-04 + adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01 + aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + ag = silver-searcher; # Added 2018-04-25 + aircrackng = aircrack-ng; # Added 2016-01-14 + airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30 + alienfx = throw "alienfx has been removed."; # Added 2019-12-08 + alsaLib = alsa-lib; # Added 2021-06-09 + alsaOss = alsa-oss; # Added 2021-06-10 + alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 + alsaPlugins = alsa-plugins; # Added 2021-06-10 + alsaTools = alsa-tools; # Added 2021-06-10 + alsaUtils = alsa-utils; # Added 2021-06-10 + amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 + aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 + ammonite-repl = ammonite; # Added 2017-05-02 + amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 + angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 + antimicroX = antimicrox; # Added 2021-10-31 + ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 + arduino_core = arduino-core; # Added 2015-02-04 + arora = throw "arora has been removed."; # Added 2020-09-09 + asciidocFull = asciidoc-full; # Added 2014-06-22 + asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 + asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07 + at_spi2_atk = at-spi2-atk; # Added 2018-02-25 + 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 + azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 + + ### B ### + badtouch = authoscope; # Project was renamed, added 20210626 - bar-xft = lemonbar-xft; # added 2015-01-16 + bar-xft = lemonbar-xft; # Added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 - bash_5 = bash; # added 2021-08-20 - bashInteractive_5 = bashInteractive; # added 2021-08-20 - batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 - beegfs = throw "beegfs has been removed."; # added 2019-11-24 - beret = throw "beret has been removed"; # added 2021-11-16 + bashInteractive_5 = bashInteractive; # Added 2021-08-20 + bash_5 = bash; # Added 2021-08-20 + bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 + batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + beegfs = throw "beegfs has been removed."; # Added 2019-11-24 + beret = throw "beret has been removed"; # Added 2021-11-16 + bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 + blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 + bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 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 - bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 - bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 - btrfsProgs = btrfs-progs; # added 2016-01-03 - bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22 + 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 + btrfsProgs = btrfs-progs; # Added 2016-01-03 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; - bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-mysql = vaultwarden-mysql; bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; - bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 - btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 - buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 - buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 - buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 - buildkite-agent3 = buildkite-agent; # added 2018-09-26 - bundler_HEAD = bundler; # added 2015-11-15 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 - caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 - cantarell_fonts = cantarell-fonts; # added 2018-03-03 - cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 + bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 + buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12 + buildkite-agent3 = buildkite-agent; # Added 2018-09-26 + bundler_HEAD = bundler; # Added 2015-11-15 + bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 + bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 + + ### C ### + + caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13 + cantarell_fonts = cantarell-fonts; # Added 2018-03-03 + cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; - catfish = xfce.catfish; # added 2019-12-22 - ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25 - cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 - checkbashism = checkbashisms; # added 2016-08-16 - chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 + catfish = xfce.catfish; # Added 2019-12-22 + ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 + cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12 + cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05 + checkbashism = checkbashisms; # Added 2016-08-16 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 + chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; - cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - cifs_utils = cifs-utils; # added 2016-08 - ckb = ckb-next; # added 2018-10-21 + cifs_utils = cifs-utils; # Added 2016-08 + cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + ckb = ckb-next; # Added 2018-10-21 + callPackage_i686 = pkgsi686Linux.callPackage; + creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 # these are for convenience, not for backward compat and shouldn't expire clang5Stdenv = lowPrio llvmPackages_5.stdenv; @@ -129,69 +155,84 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; - clangAnalyzer = clang-analyzer; # added 2015-02-20 - claws-mail-gtk3 = claws-mail; # added 2021-07-10 - clawsMail = claws-mail; # added 2016-04-29 - claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # added 2021-12-05 - 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 - concurrencykit = libck; # added 2021-03 - 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 - coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 - cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 - cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 - cpp-gsl = microsoft_gsl; # added 2019-05-24 - cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cupsBjnp = cups-bjnp; # added 2016-01-02 - cups_filters = cups-filters; # added 2016-08 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + clangAnalyzer = clang-analyzer; # Added 2015-02-20 + claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 + claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + 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 + concurrencykit = libck; # Added 2021-03 + 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 + coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16 + corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 + 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 + cpp-gsl = microsoft_gsl; # Added 2019-05-24 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30 + cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 + crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 + cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + + # CUDA Toolkit + + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23 - cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 - cv = progress; # added 2015-09-06 - cvs_fast_export = cvs-fast-export; # added 2021-06-10 - d1x_rebirth = dxx-rebirth; # added 2018-04-25 - d2x_rebirth = dxx-rebirth; # added 2018-04-25 - dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_stable = dart; # added 2020-01-15 + cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cupsBjnp = cups-bjnp; # Added 2016-01-02 + cups_filters = cups-filters; # Added 2016-08 + curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # Added 2022-01-12 + curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 + cv = progress; # Added 2015-09-06 + cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + + ### D ### + + d1x_rebirth = dxx-rebirth; # Added 2018-04-25 + d2x_rebirth = dxx-rebirth; # Added 2018-04-25 + dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 - dbus_daemon = dbus.daemon; # added 2018-04-25 - dbus_glib = dbus-glib; # added 2018-02-25 - dbus_libs = dbus; # added 2018-04-25 - diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - dbus_tools = dbus.out; # added 2018-04-25 - deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 + dbus_daemon = dbus.daemon; # Added 2018-04-25 + dbus_glib = dbus-glib; # Added 2018-02-25 + dbus_libs = dbus; # Added 2018-04-25 + dbus_tools = dbus.out; # Added 2018-04-25 + dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 + deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; + debian_devscripts = debian-devscripts; # added 2016-03-23 - debugedit-unstable = debugedit; # added 2021-11-22 + debugedit-unstable = debugedit; # Added 2021-11-22 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 + deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 + deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 deltachat-electron = deltachat-desktop; # added 2021-07-18 + diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + deluge-1_x = throw '' Deluge 1.x (deluge-1_x) is no longer supported. Please use Deluge 2.x (deluge-2_x) instead, for example: @@ -199,95 +240,135 @@ mapAliases ({ services.deluge.package = pkgs.deluge-2_x; Note that it is NOT possible to switch back to Deluge 1.x after this change. - ''; # added 2021-08-18 - desktop_file_utils = desktop-file-utils; # added 2018-02-25 - devicemapper = lvm2; # added 2018-04-25 - digikam5 = digikam; # added 2017-02-18 - dmtx = dmtx-utils; # added 2018-04-25 - dnnl = oneDNN; # added 2020-04-22 - docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 - docbook_xml_xslt = docbook_xsl; # added 2018-04-25 - dolphinEmu = dolphin-emu; # added 2021-11-10 - dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10 - dotnet-netcore = dotnet-runtime; # added 2021-10-07 - double_conversion = double-conversion; # 2017-11-22 - docker_compose = docker-compose; # 2018-11-10 - draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 - dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 - dwarf_fortress = dwarf-fortress; # added 2016-01-23 - dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 - dylibbundler = macdylibbundler; # added 2021-04-24 - ec2_ami_tools = ec2-ami-tools; # added 2021-10-08 - ec2_api_tools = ec2-api-tools; # added 2021-10-08 - elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 - elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 - emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 - emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 - emacsPackages = emacs.pkgs; # added 2020-12-18 - enblendenfuse = enblend-enfuse; # 2015-09-30 - envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - epoxy = libepoxy; # 2021-11-11 - esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 - evolution_data_server = evolution-data-server; # added 2018-02-25 - etcdctl = etcd; # added 2018-04-25 - 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 + ''; # Added 2021-08-18 + + demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + desktop_file_utils = desktop-file-utils; # Added 2018-02-25 + devicemapper = lvm2; # Added 2018-04-25 + digikam5 = digikam; # Added 2017-02-18 + displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12 + dmtx = dmtx-utils; # Added 2018-04-25 + dnnl = oneDNN; # Added 2020-04-22 + docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25 + docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 + docbook_xml_xslt = docbook_xsl; # Added 2018-04-25 + docker_compose = docker-compose; # Added 2018-11-10 + dolphinEmu = dolphin-emu; # Added 2021-11-10 + dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 + dotnet-netcore = dotnet-runtime; # Added 2021-10-07 + double_conversion = double-conversion; # Added 2017-11-22 + draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 + dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03 + dwarf_fortress = dwarf-fortress; # Added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07 + dylibbundler = macdylibbundler; # Added 2021-04-24 + + ### E ### + + + ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 + ec2_api_tools = ec2-api-tools; # Added 2021-10-08 + ec2-utils = amazon-ec2-utils; # Added 2022-02-01 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + + # Electron + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2022-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2022-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2022-01-06 + electron_7 = throw "electron_7 has been removed in favor of newer versions"; # added 2022-02-08 + electron_8 = throw "electron_8 has been removed in favor of newer versions"; # added 2022-02-08 + + electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # Added 2022-01-01 + + # Emacs + emacs27Packages = emacs27.pkgs; # Added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 + emacsPackages = emacs.pkgs; # Added 2020-12-18 + emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 + emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 + emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18 + emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + + enblendenfuse = enblend-enfuse; # Added 2015-09-30 + encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 + envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + epoxy = libepoxy; # Added 2021-11-11 + esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 + etcdctl = etcd; # Added 2018-04-25 + euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01 + evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14 + evolution_data_server = evolution-data-server; # Added 2018-02-25 + exfat-utils = exfat; # Added 2015-09-11 + + ### F ### + + 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 - firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; - firefox-esr-wrapper = firefox-esr; # 2016-01 - firefox-wrapper = firefox; # 2016-01 - firefoxWrapper = firefox; # 2015-09 - - firestr = throw "firestr has been removed."; # added 2019-12-08 - fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 - flameGraph = flamegraph; # added 2018-04-25 - flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # added 2021-06-31 - flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 - flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 - foldingathome = fahclient; # added 2020-09-03 - font-awesome-ttf = font-awesome; # 2018-02-25 - # 2019-10-31 + ffadoFull = ffado; # Added 2018-05-01 + firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; + firefox-esr-wrapper = firefox-esr; # Added 2016-01 + firefoxWrapper = firefox; # Added 2015-09 + firefox-wrapper = firefox; # Added 2016-01 + firestr = throw "firestr has been removed."; # Added 2019-12-08 + firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + flameGraph = flamegraph; # Added 2018-04-25 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03 + fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26 + foldingathome = fahclient; # Added 2020-09-03 + font-awesome-ttf = font-awesome; # Added 2018-02-25 + fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. - ''; + ''; # Added 2019-10-31 + fontconfig-penultimate = throw '' fontconfig-penultimate has been removed. It was a fork of the abandoned fontconfig-ultimate. - ''; - # 2020-07-21 + ''; # Added 2020-07-21 + fontconfig_210 = throw '' fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 and has only been used for old fontconfig caches. ''; - foomatic_filters = foomatic-filters; # 2016-08 - fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07 + + foomatic_filters = foomatic-filters; # Added 2016-08 + fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; - fuse_exfat = exfat; # 2015-09-11 - fuseki = apache-jena-fuseki; # added 2018-04-25 - fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 - g4py = python3Packages.geant4; # added 2020-06-06 - gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # added 2020-06-06 - gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03 - 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 + fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 + fuse_exfat = exfat; # Added 2015-09-11 + fuseki = apache-jena-fuseki; # Added 2018-04-25 + fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 + + ### G ### + + g4py = python3Packages.geant4; # Added 2020-06-06 + gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03 + gdb-multitarget = gdb; # Added 2017-11-13 + gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22 + getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12 + gettextWithExpat = gettext; # Added 2016-02-19 + gfm = throw "gfm has been removed"; # Added 2021-01-15 + giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23 + giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 + git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + + gitAndTools = self // { darcsToGit = darcs-to-git; gitAnnex = git-annex; gitBrunch = git-brunch; @@ -295,225 +376,289 @@ mapAliases ({ gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; topGit = top-git; - }; - gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07 - glib_networking = glib-networking; # added 2018-02-25 - gmailieer = lieer; # added 2020-04-19 - gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 - gnome-mpv = celluloid; # added 2019-08-22 - gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 - gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 - gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 - # Added 2020-10-16 + }; # Added 2021-01-14 + + gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 + gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12 + gksu = throw "gksu has been removed"; # Added 2022-01-16 + glib_networking = glib-networking; # Added 2018-02-25 + gmailieer = lieer; # Added 2020-04-19 + gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 + gnash = throw "gnash has been removed; broken and abandoned upstream."; # added 2022-02-06 + gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome-mpv = celluloid; # Added 2019-08-22 + gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 + gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14 + gnome_user_docs = gnome-user-docs; # Added 2019-11-20 + gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10 + gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27 + gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" ] gnuradio3_7Packages; - }; - gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gnustep-make = gnustep.make; # added 2016-7-6 - gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 - gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 + }; # Added 2020-10-16 + gmock = gtest; # moved from top-level 2021-03-14 - go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 - go-pup = pup; # added 2017-12-19 - gobby5 = gobby; # added 2021-02-01 - gobjectIntrospection = gobject-introspection; # added 2018-12-02 - goimports = gotools; # added 2018-09-16 - gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 - google-gflags = gflags; # added 2019-07-25 - google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 - google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 - googleAuthenticator = google-authenticator; # added 2016-10-16 - grantlee5 = libsForQt5.grantlee; # added 2015-12-19 - graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 - graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 + + gnome3 = gnome; # Added 2021-05-07 + gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 + gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 + gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gnustep-make = gnustep.make; # Added 2016-7-6 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 + gobby5 = gobby; # Added 2021-02-01 + gobjectIntrospection = gobject-introspection; # Added 2018-12-02 + gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 + goimports = gotools; # Added 2018-09-16 + gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 + googleAuthenticator = google-authenticator; # Added 2016-10-16 + googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 + google-gflags = gflags; # Added 2019-07-25 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + go-pup = pup; # Added 2017-12-19 + gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 + graalvm11 = graalvm11-ce; - gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - 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 - gupnp_av = gupnp-av; # added 2018-02-25 - gupnp_dlna = gupnp-dlna; # added 2018-02-25 - gupnp_igd = gupnp-igd; # added 2018-02-25 - gupnptools = gupnp-tools; # added 2015-12-19 - gutenberg = zola; # added 2018-11-17 - hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - heimdalFull = heimdal; # added 2018-05-01 - hepmc = hepmc2; # added 2019-08-05 - hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 - hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 - holochain-go = throw "holochain-go was abandoned by upstream"; # added 2022-01-01 - ht-rust = xh; # added 2021-02-13 - htmlTidy = html-tidy; # added 2014-12-06 - hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 - iana_etc = iana-etc; # added 2017-03-08 - iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 - icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - idea = jetbrains; # added 2017-04-03 - imagemagick7_light = imagemagick_light; # added 2021-02-22 - imagemagick7 = imagemagick; # added 2021-02-22 - imagemagick7Big = imagemagickBig; # added 2021-02-22 + graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + grantlee5 = libsForQt5.grantlee; # Added 2015-12-19 + gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 + gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25 + gtk_doc = gtk-doc; # Added 2018-02-25 + gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 + gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + guileCairo = guile-cairo; # Added 2017-09-24 + guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guile_lib = guile-lib; # Added 2017-09-24 + guileLint = guile-lint; # Added 2017-09-27 + guile_ncurses = guile-ncurses; # Added 2017-09-24 + gupnp_av = gupnp-av; # Added 2018-02-25 + gupnp_dlna = gupnp-dlna; # Added 2018-02-25 + gupnp_igd = gupnp-igd; # Added 2018-02-25 + gupnptools = gupnp-tools; # Added 2015-12-19 + gutenberg = zola; # Added 2018-11-17 + gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06 + gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06 + + ### H ### + + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + heimdalFull = heimdal; # Added 2018-05-01 + heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 + hepmc = hepmc2; # Added 2019-08-05 + hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11 + hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25 + holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 + htmlTidy = html-tidy; # Added 2014-12-06 + ht-rust = xh; # Added 2021-02-13 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06 + + ### I ### + + iana_etc = iana-etc; # Added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 + icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream."; # Added 2022-02-15 + icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + idea = jetbrains; # Added 2017-04-03 + imagemagick7Big = imagemagickBig; # Added 2021-02-22 + imagemagick7 = imagemagick; # Added 2021-02-22 + imagemagick7_light = imagemagick_light; # Added 2021-02-22 + impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 + i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; - infiniband-diags = rdma-core; # added 2019-08-09 + infiniband-diags = rdma-core; # Added 2019-08-09 + ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # Added 2022-01-12 inotifyTools = inotify-tools; - inter-ui = inter; # added 2021-03-27 + inter-ui = inter; # Added 2021-03-27 + iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 iproute = iproute2; # moved from top-level 2021-03-14 - i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 + + ### J ### + + jack2Full = jack2; # moved from top-level 2021-03-14 - jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 - jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 - jbuilder = dune_1; # added 2018-09-09 + jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21 + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 + jbuilder = dune_1; # Added 2018-09-09 + 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 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; - joseki = apache-jena-fuseki; # added 2016-02-28 + joseki = apache-jena-fuseki; # Added 2016-02-28 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead."; - jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - json_glib = json-glib; # added 2018-02-25 - kafkacat = kcat; # added 2021-10-07 - kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 - k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 - kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 + + # Julia + 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 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 + + json_glib = json-glib; # Added 2018-02-25 + jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + + ### K ### + + k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 + kafkacat = kcat; # Added 2021-10-07 + 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 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 + kdiff3-qt5 = kdiff3; # Added 2017-02-18 + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + keepassx-community = keepassxc; # Added 2017-11 + keepassx-reboot = keepassx-community; # Added 2017-02-01 + keepassx2-http = keepassx-reboot; # Added 2016-10-17 + keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01 + kerberos = libkrb5; # moved from top-level 2021-03-14 + kexectools = kexec-tools; # Added 2021-09-03 + keybase-go = keybase; # Added 2016-08-24 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10 + keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 + kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + 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."; # Added 2021-03-09 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # Added 2020-04-28 + kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 + knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # Added 2022-01-01 kodiGBM = kodi-gbm; 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 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 - julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 - 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 - keepassx-community = keepassxc; # added 2017-11 - keepassx-reboot = keepassx-community; # added 2017-02-01 - keepassx2-http = keepassx-reboot; # added 2016-10-17 - kexectools = kexec-tools; # added 2021-09-03 - keybase-go = keybase; # added 2016-08-24 - keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14 - 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."; # added 2019-12-10 - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 + kodiPlugins = kodiPackages; # Added 2021-03-09; + kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + krename-qt5 = krename; # Added 2017-02-18 krita-beta = krita; # moved from top-level 2021-12-23 - kvm = qemu_kvm; # added 2018-04-25 + kvm = qemu_kvm; # Added 2018-04-25 + + ### L ### + + lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; - letsencrypt = certbot; # added 2016-05-16 - libaudit = audit; # added 2018-04-25 - libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 - libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 - libcap_manpages = libcap.doc; # added 2016-04-29 - libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 - libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04 - libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libcap_progs = libcap.out; # added 2016-04-29 - libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 - libdbusmenu-glib = libdbusmenu; # added 2018-05-01 - liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 - liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 - liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 - libgnome_keyring = libgnome-keyring; # added 2018-02-25 - libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 - libgpgerror = libgpg-error; # added 2021-09-04 - libgumbo = gumbo; # added 2018-01-21 - libGL_driver = mesa.drivers; # added 2019-05-28 - libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 - libjpeg_drop = libjpeg_original; # added 2020-06-05 - libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # added 2021-11-09 - liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 - liblastfm = libsForQt5.liblastfm; # added 2020-06-14 - liblrdf = lrdf; # added 2018-04-25 + letsencrypt = certbot; # Added 2016-05-16 + libGL_driver = mesa.drivers; # Added 2019-05-28 + libaudit = audit; # Added 2018-04-25 + libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25 + libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25 + libcap_manpages = libcap.doc; # Added 2016-04-29 + libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 + libcap_progs = libcap.out; # Added 2016-04-29 + libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16 + libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04 + libdbusmenu-glib = libdbusmenu; # Added 2018-05-01 + libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19 + liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12 + liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12 + libgksu = throw "libgksu has been removed"; # Added 2022-01-16 + libgnome_keyring = libgnome-keyring; # Added 2018-02-25 + libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25 + libgpgerror = libgpg-error; # Added 2021-09-04 + libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 + libgumbo = gumbo; # Added 2018-01-21 + libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libjpeg_drop = libjpeg_original; # Added 2020-06-05 + libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28 + libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09 + liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05 + liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 + liblrdf = lrdf; # Added 2018-04-25 + libmsgpack = msgpack; # Added 2018-08-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; - libqrencode = qrencode; # added 2019-01-01 - librdf = lrdf; # added 2020-03-22 - librecad2 = librecad; # backwards compatibility alias, added 2015-10 - librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24 - libseat = seatd; # added 2021-06-24 - libsysfs = sysfsutils; # added 2018-04-25 - libtidy = html-tidy; # added 2014-12-21 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 + libqrencode = qrencode; # Added 2019-01-01 + librdf = lrdf; # Added 2020-03-22 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + libseat = seatd; # Added 2021-06-24 + libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 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."; # Added 2020-06-22 + libsysfs = sysfsutils; # Added 2018-04-25 + libtidy = html-tidy; # Added 2014-12-21 + libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 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 - libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libudev = udev; # Added 2018-04-25 + libungif = giflib; # Added 2020-02-12 + libusb = libusb1; # Added 2020-04-28 + libva-full = libva; # Added 2018-03-26 + libva1-full = libva1; # Added 2018-03-26 libwnck3 = libwnck; - lilypond-unstable = lilypond; # added 2021-03-11 - links = links2; # added 2016-01-31 - linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09 - linux_rpi0 = linuxKernel.kernels.linux_rpi1; + lilypond-unstable = lilypond; # Added 2021-03-11 + lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + links = links2; # Added 2016-01-31 + linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09 + + # Linux kernels + linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; + linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; + linuxPackages_4_14 = linuxKernel.packages.linux_4_14; + linuxPackages_4_19 = linuxKernel.packages.linux_4_19; + linuxPackages_4_4 = linuxKernel.packages.linux_4_4; + linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_5_10 = linuxKernel.packages.linux_5_10; + linuxPackages_5_15 = linuxKernel.packages.linux_5_15; + linuxPackages_5_16 = linuxKernel.packages.linux_5_16; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; - linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; - linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; - linuxPackages_4_4 = linuxKernel.packages.linux_4_4; - linuxPackages_4_9 = linuxKernel.packages.linux_4_9; - linuxPackages_4_14 = linuxKernel.packages.linux_4_14; - linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; - linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_5_4 = linuxKernel.packages.linux_5_4; - linuxPackages_5_10 = linuxKernel.packages.linux_5_10; - linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - + linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; + linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; + linux_4_14 = linuxKernel.kernels.linux_4_14; + linux_4_19 = linuxKernel.kernels.linux_4_19; + linux_4_4 = linuxKernel.kernels.linux_4_4; + linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_5_10 = linuxKernel.kernels.linux_5_10; + linux_5_15 = linuxKernel.kernels.linux_5_15; + linux_5_16 = linuxKernel.kernels.linux_5_16; + linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_4_4 = linuxKernel.kernels.linux_4_4; - linux_4_9 = linuxKernel.kernels.linux_4_9; - linux_4_14 = linuxKernel.kernels.linux_4_14; - linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_5_4 = linuxKernel.kernels.linux_5_4; - linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; - linux_5_10 = linuxKernel.kernels.linux_5_10; - linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux_5_15 = linuxKernel.kernels.linux_5_15; - # added 2020-04-04 + # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; - # added 2021-04-04 + # Added 2021-04-04 linuxPackages_xen_dom0 = linuxPackages; linuxPackages_latest_xen_dom0 = linuxPackages_latest; linuxPackages_xen_dom0_hardened = linuxPackages_hardened; linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - # added 2021-08-16 + # Added 2021-08-16 linuxPackages_latest_hardened = throw '' The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches frequently lag behind the upstream kernel. In some cases this meant that this attribute @@ -527,151 +672,201 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 - loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - lobster-two = google-fonts; # added 2021-07-22 - lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 - lua5_expat = luaPackages.luaexpat; # added 2017-05-02 - lua5_sec = luaPackages.luasec; # added 2017-05-02 - lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 + + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + lobster-two = google-fonts; # Added 2021-07-22 + love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 + lttngTools = lttng-tools; # Added 2014-07-31 + lttngUst = lttng-ust; # Added 2014-07-31 + lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02 + lua5_expat = luaPackages.luaexpat; # Added 2017-05-02 + lua5_sec = luaPackages.luasec; # Added 2017-05-02 + lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 - m3d-linux = m33-linux; # added 2016-08-13 - mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21 - man_db = man-db; # added 2016-05 - manpages = man-pages; # added 2015-12-06 - marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - mysql = mariadb; # moved from top-level 2021-03-14 + + ### M ### + + m3d-linux = m33-linux; # Added 2016-08-13 + mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 + mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + man_db = man-db; # Added 2016-05 + manpages = man-pages; # Added 2015-12-06 + marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 - 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 - mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 - monero = monero-cli; # added 2021-11-28 - mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + 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 + 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 + mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 + meme = meme-image-generator; # Added 2021-04-21 + memtest86 = memtest86plus; # Added 2019-05-08 + mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 + mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mess = mame; # Added 2019-10-30 + metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12 + mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12 + midoriWrapper = midori; # Added 2015-01 + mime-types = mailcap; # Added 2022-01-21 + mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 + mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 + mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19 + mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25 + moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; + module_init_tools = kmod; # Added 2016-04-22 + monero = monero-cli; # Added 2021-11-28 + monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + + morituri = whipper; # Added 2018-09-13 + mozart-binary = mozart2-binary; # Added 2019-09-23 + mozart = mozart2-binary; # Added 2019-09-23 + mpc_cli = mpc-cli; # moved from top-level 2022-01-24 + mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpich2 = mpich; # Added 2018-08-06 + msf = metasploit; # Added 2018-04-25 + multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 + mumble_git = pkgs.mumble; # Added 2019-08-01 + murmur_git = pkgs.murmur; # Added 2019-08-01 mysql-client = hiPrio mariadb.client; - memtest86 = memtest86plus; # added 2019-05-08 - mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # added 2021-10-18 - mesa_noglu = mesa; # added 2019-05-28 + mysql = mariadb; # moved from top-level 2021-03-14 + # NOTE: 2018-07-12: legacy alias: # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - midoriWrapper = midori; # added 2015-01 - mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # added 2020-08-15 - mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 - mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 - moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; - module_init_tools = kmod; # added 2016-04-22 - mozart = mozart2-binary; # added 2019-09-23 - mozart-binary = mozart2-binary; # added 2019-09-23 - mpd_clientlib = libmpdclient; # added 2021-02-11 - mpich2 = mpich; # added 2018-08-06 - msf = metasploit; # added 2018-04-25 - libmsgpack = msgpack; # added 2018-08-17 - mssys = ms-sys; # added 2015-12-13 - mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 - multipath_tools = multipath-tools; # added 2016-01-21 - mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 - mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 - mysqlWorkbench = mysql-workbench; # added 2017-01-19 + mesa_noglu = mesa; # Added 2019-05-28 + + mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 + mssys = ms-sys; # Added 2015-12-13 + multipath_tools = multipath-tools; # Added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 + mupen64plus1_5 = mupen64plus; # Added 2016-02-12 + mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15 + mysqlWorkbench = mysql-workbench; # Added 2017-01-19 + + ### N ### + + net_snmp = net-snmp; # Added 2019-12-21 nagiosPluginsOfficial = monitoring-plugins; - navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 - ncat = nmap; # added 2016-01-26 - netcat-openbsd = libressl.nc; # added 2018-04-25 - netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - nfsUtils = nfs-utils; # added 2014-12-06 - nginxUnstable = nginxMainline; # added 2018-04-25 - nilfs_utils = nilfs-utils; # added 2018-04-25 + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 + ncat = nmap; # Added 2016-01-26 + neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 + netcat-openbsd = libressl.nc; # Added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25 + neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + nfsUtils = nfs-utils; # Added 2014-12-06 + nginxUnstable = nginxMainline; # Added 2018-04-25 + nilfs_utils = nilfs-utils; # Added 2018-04-25 nix-direnv-flakes = nix-direnv; - nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixStable; # added 2021-05-21 - nmap_graphical = nmap-graphical; # added 2017-01-19 - nmap-unfree = nmap; # added 2021-04-06 - nologin = shadow; # added 2018-04-25 - nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 - now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05 - nxproxy = nx-libs; # added 2019-02-15 + nix-review = nixpkgs-review; # Added 2019-12-22 + nixFlakes = nixVersions.stable; # Added 2021-05-21 + nixStable = nixVersions.stable; # Added 2022-01-24 + nixUnstable = nixVersions.unstable; # Added 2022-01-26 + nix_2_3 = nixVersions.nix_2_3; + nix_2_4 = nixVersions.nix_2_4; + nix_2_5 = nixVersions.nix_2_5; + nix_2_6 = nixVersions.nix_2_6; + nmap-unfree = nmap; # Added 2021-04-06 + nmap_graphical = nmap-graphical; # Added 2017-01-19 + nologin = shadow; # Added 2018-04-25 + nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 + noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 + now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 + nxproxy = nx-libs; # Added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; - oauth2_proxy = oauth2-proxy; # added 2021-04-18 - opencascade_oce = opencascade; # added 2018-04-25 - oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 + + ### O ### + + oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # Added 2020-10-09 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 + oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # Added 2019-12-10 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # Added 2021-01-24 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 ofp = throw "ofp is not compatible with odp-dpdk"; - olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - opencl-icd = ocl-icd; # added 2017-01-20 - openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 - openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 - openexr_ctl = ctl; # added 2018-04-25 - openisns = open-isns; # added 2020-01-28 - openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 - openjpeg_2 = openjpeg; # added 2021-01-25 - openmpt123 = libopenmpt; # added 2021-09-05 - opensans-ttf = open-sans; # added 2018-12-04 - openssh_with_kerberos = openssh; # added 2018-01-28 - orchis = orchis-theme; # added 2021-06-09 - onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 - osquery = throw "osquery has been removed."; # added 2019-11-24 - osxfuse = macfuse-stubs; # added 2021-03-20 - otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 - OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 - OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 - owncloudclient = owncloud-client; # added 2016-08 - ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 - p11_kit = p11-kit; # added 2018-02-25 - packet-cli = metal-cli; # added 2021-10-25 - paperless = paperless-ng; # added 2021-06-06 - parity = openethereum; # added 2020-08-01 - parquet-cpp = arrow-cpp; # added 2018-09-08 - pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 - pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 - pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 - perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 - perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 - pgp-tools = signing-party; # added 2017-03-26 - pg_tmp = ephemeralpg; # added 2018-01-16 + olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 + openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + opencascade_oce = opencascade; # Added 2018-04-25 + opencl-icd = ocl-icd; # Added 2017-01-20 + openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openexr_ctl = ctl; # Added 2018-04-25 + openisns = open-isns; # Added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 + openjpeg_2 = openjpeg; # Added 2021-01-25 + openmpt123 = libopenmpt; # Added 2021-09-05 + opensans-ttf = open-sans; # Added 2018-12-04 + openssh_with_kerberos = openssh; # Added 2018-01-28 + orchis = orchis-theme; # Added 2021-06-09 + osquery = throw "osquery has been removed."; # Added 2019-11-24 + osxfuse = macfuse-stubs; # Added 2021-03-20 + otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 + owncloudclient = owncloud-client; # Added 2016-08 + + ### P ### + + PPSSPP = ppsspp; # Added 2017-10-01 + + p11_kit = p11-kit; # Added 2018-02-25 + packet-cli = metal-cli; # Added 2021-10-25 + paperless = paperless-ng; # Added 2021-06-06 + parity = openethereum; # Added 2020-08-01 + parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 + parquet-cpp = arrow-cpp; # Added 2018-09-08 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04 + pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 + perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12 + perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12 + pgp-tools = signing-party; # Added 2017-03-26 + pg_tmp = ephemeralpg; # Added 2018-01-16 # Obsolete PHP version aliases - php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03 - php73Packages = php73; # added 2021-06-03 - php73Extensions = php73; # added 2021-06-03 + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # Added 2021-06-03 + php73Packages = php73; # Added 2021-06-03 + php73Extensions = php73; # Added 2021-06-03 php-embed = throw '' php*-embed has been dropped, you can build something similar with the following snippet: php74.override { embedSupport = true; apxs2Support = false; } - ''; # added 2020-04-01 - php73-embed = php-embed; # added 2020-04-01 - php74-embed = php-embed; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-embed = php-embed; # Added 2020-04-01 + php74-embed = php-embed; # Added 2020-04-01 phpPackages-embed = throw '' php*Packages-embed has been dropped, you can build something similar with the following snippet: (php74.override { embedSupport = true; apxs2Support = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-embed = phpPackages-embed; php74Packages-embed = phpPackages-embed; @@ -686,9 +881,9 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; } - ''; # added 2020-04-01 - php73-unit = php-unit; # added 2020-04-01 - php74-unit = php-unit; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-unit = php-unit; # Added 2020-04-01 + php74-unit = php-unit; # Added 2020-04-01 phpPackages-unit = throw '' php*Packages-unit has been dropped, you can build something @@ -701,174 +896,196 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-unit = phpPackages-unit; php74Packages-unit = phpPackages-unit; - pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatex = pidgin-latex; # added 2018-01-08 - pidginlatexSF = pidgin-latex; # added 2014-11-02 - pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 - pidginosd = pidgin-osd; # added 2018-01-08 - pidginotr = pidgin-otr; # added 2018-01-08 - pidginsipe = pidgin-sipe; # added 2018-01-08 - pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 - piwik = matomo; # added 2018-01-16 - pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 - pleroma-otp = pleroma; # added 2021-07-10 - pltScheme = racket; # just to be sure + pidgin-with-plugins = pidgin; # Added 2016-06 + pidginlatex = pidgin-latex; # Added 2018-01-08 + pidginlatexSF = pidgin-latex; # Added 2014-11-02 + pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08 + pidginosd = pidgin-osd; # Added 2018-01-08 + pidginotr = pidgin-otr; # Added 2018-01-08 + pidginsipe = pidgin-sipe; # Added 2018-01-08 + pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08 + pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19 + piwik = matomo; # Added 2018-01-16 + pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02 + pleroma-otp = pleroma; # Added 2021-07-10 plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 - pmtools = acpica-tools; # added 2018-11-01 - polarssl = mbedtls; # added 2018-04-25 - poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + pltScheme = racket; # just to be sure + pmtools = acpica-tools; # Added 2018-11-01 + polarssl = mbedtls; # Added 2018-04-25 + polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 + poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19 + + # postgresql postgresql96 = postgresql_9_6; - postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03 + postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 + # postgresql plugins - pgjwt = postgresqlPackages.pgjwt; + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_cron = postgresqlPackages.pg_cron; + pg_hll = postgresqlPackages.pg_hll; pg_repack = postgresqlPackages.pg_repack; - pgroonga = postgresqlPackages.pgroonga; pg_similarity = postgresqlPackages.pg_similarity; + pg_topn = postgresqlPackages.pg_topn; + pgjwt = postgresqlPackages.pgjwt; + pgroonga = postgresqlPackages.pgroonga; pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; + postgis = postgresqlPackages.postgis; + tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 + timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 timescaledb = postgresqlPackages.timescaledb; + tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; - cstore_fdw = postgresqlPackages.cstore_fdw; - pg_hll = postgresqlPackages.pg_hll; - pg_cron = postgresqlPackages.pg_cron; - pg_topn = postgresqlPackages.pg_topn; - pinentry_curses = pinentry-curses; # added 2019-10-14 - pinentry_emacs = pinentry-emacs; # added 2019-10-14 - pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 - pinentry_qt = pinentry-qt; # added 2019-10-14 - pinentry_gnome = pinentry-gnome; # added 2019-10-14 - pinentry_qt5 = pinentry-qt; # added 2020-02-11 - postgis = postgresqlPackages.postgis; - # end - 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 - proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # added 2021-06-30 - proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 - prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16 - pygmentex = texlive.bin.pygmentex; # added 2019-12-15 - pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21 + + phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # Added 2019-11-22 + 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 + pinentry_curses = pinentry-curses; # Added 2019-10-14 + pinentry_emacs = pinentry-emacs; # Added 2019-10-14 + pinentry_gnome = pinentry-gnome; # Added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 + pinentry_qt = pinentry-qt; # Added 2019-10-14 + pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10 + 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 + proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 + proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12 + prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16 + pulseaudioLight = pulseaudio; # Added 2018-04-25 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13 + pulseeffects-pw = easyeffects; # Added 2021-07-07 + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 + pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 + pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # Added 2021-03-21 + 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 pyo3-pack = maturin; - pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 - pulseaudioLight = pulseaudio; # added 2018-04-25 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13 - pulseeffects-pw = easyeffects; # added 2021-07-07 - 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 - python-swiftclient = swiftclient; # added 2021-09-09 - quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 - qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 - qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 - qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 - qt5ct = libsForQt5.qt5ct; # added 2021-12-27 - quake3game = ioquake3; # added 2016-01-14 - quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 - qvim = throw "qvim has been removed."; # added 2020-08-31 - qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 - qwt6 = libsForQt5.qwt; # added 2015-12-19 - qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04 - qtcurve = libsForQt5.qtcurve; # added 2020-11-07 - quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 - raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 - 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 - rng_tools = rng-tools; # added 2018-10-24 + pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-01 + python = python2; # Added 2022-01-11 + python-swiftclient = swiftclient; # Added 2021-09-09 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # Added 2021-03-08 + pythonFull = python2Full; # Added 2022-01-11 + pythonPackages = python.pkgs; # Added 2022-01-11 + + ### Q ### + + QmidiNet = qmidinet; # Added 2016-05-22 + qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qflipper = qFlipper; # Added 2022-02-11 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 + qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 + qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 + quake3game = ioquake3; # Added 2016-01-14 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 + quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03 + qvim = throw "qvim has been removed."; # Added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 + qwt6 = libsForQt5.qwt; # Added 2015-12-19 + + ### R ### + + radare2-cutter = cutter; # Added 2021-03-30 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 + rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01 + 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 + recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 + redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 + renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # Added 2022-01-12 + residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 + retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 + retroshare06 = retroshare; + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 + rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 + ring-daemon = jami-daemon; # Added 2021-10-26 + rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 + rng_tools = rng-tools; # Added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 + rpiboot-unstable = rpiboot; # Added 2021-07-30 rssglx = rss-glx; #added 2015-03-25 - rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 - # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, - # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14 - recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27 - retroshare06 = retroshare; - gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 - rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 - riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 - ring-daemon = jami-daemon; # added 2021-10-26 - radare2-cutter = cutter; # added 2021-03-30 - redkite = throw "redkite was archived by upstream"; # added 2021-04-12 - redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25 - retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 - rkt = throw "rkt was archived by upstream"; # added 2020-05-16 - rpiboot-unstable = rpiboot; # added 2021-07-30 - rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08 - rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 + rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rubyMinimal = throw "rubyMinimal was removed due to being unused"; + rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; - runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 - rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19 - 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 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 - s2n = s2n-tls; # added 2021-03-03 - s6Dns = s6-dns; # added 2018-07-23 - s6Networking = s6-networking; # added 2018-07-23 - s6LinuxUtils = s6-linux-utils; # added 2018-07-23 - s6PortableUtils = s6-portable-utils; # added 2018-07-23 - sagemath = sage; # added 2018-10-27 - sam = deadpixi-sam; # added 2018-04-25 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 - saneBackends = sane-backends; # added 2016-01-02 - saneBackendsGit = sane-backends; # added 2016-01-02 - sane-backends-git = sane-backends; # added 2021-02-19 - saneFrontends = sane-frontends; # added 2016-01-02 - scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 - scim = sc-im; # added 2016-01-22 - scollector = bosun; # added 2018-04-25 - scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # added 2021-10-07 - sdlmame = mame; # added 2019-10-30 - seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 + runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 + rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 + rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 + rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + + # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, + # due to it being inside the linuxPackagesFor function. + rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + + ### S ### + + s2n = s2n-tls; # Added 2021-03-03 + s6Dns = s6-dns; # Added 2018-07-23 + s6LinuxUtils = s6-linux-utils; # Added 2018-07-23 + s6Networking = s6-networking; # Added 2018-07-23 + s6PortableUtils = s6-portable-utils; # Added 2018-07-23 + sagemath = sage; # Added 2018-10-27 + sam = deadpixi-sam; # Added 2018-04-25 + samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25 + sane-backends-git = sane-backends; # Added 2021-02-19 + saneBackends = sane-backends; # Added 2016-01-02 + saneBackendsGit = sane-backends; # Added 2016-01-02 + saneFrontends = sane-frontends; # Added 2016-01-02 + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 + scim = sc-im; # Added 2016-01-22 + scollector = bosun; # Added 2018-04-25 + scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 + sdlmame = mame; # Added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; - sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11 - shared_mime_info = shared-mime-info; # added 2018-02-25 - skrooge2 = skrooge; # added 2017-02-18 + sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + shared_mime_info = shared-mime-info; # Added 2018-02-25 + shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 + sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 + skrooge2 = skrooge; # Added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; - skype = skypeforlinux; # added 2017-07-27 - skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 - skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14 - slack-dark = slack; # added 2020-03-27 - slic3r-prusa3d = prusa-slicer; # added 2019-05-21 + skype = skypeforlinux; # Added 2017-07-27 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14 + skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31 + slack-dark = slack; # Added 2020-03-27 + slic3r-prusa3d = prusa-slicer; # Added 2019-05-21 + slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 + slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 + slurm-full = slurm; # Added 2018-05-1 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 - slurm-full = slurm; # added 2018-05-1 - smbclient = samba; # added 2018-04-25 - smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 - slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 - slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 - solr_8 = solr; # added 2021-01-30 - spectral = neochat; # added 2020-12-27 - sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + smbclient = samba; # Added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04 + solr_8 = solr; # Added 2021-01-30 - # added 2020-02-10 + # Added 2020-02-10 sourceHanSansPackages = { japanese = source-han-sans; korean = source-han-sans; @@ -889,366 +1106,331 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - source-sans-pro = source-sans; # added 2021-10-20 - source-serif-pro = source-serif; # added 2021-10-20 + source-sans-pro = source-sans; # Added 2021-10-20 + source-serif-pro = source-serif; # Added 2021-10-20 - net_snmp = net-snmp; # added 2019-12-21 - oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09 spaceOrbit = space-orbit; # added 2016-05-23 + spectral = neochat; # Added 2020-12-27 speech_tools = speech-tools; # added 2018-04-25 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 + 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 + spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead."; # added 2022-01-04 + # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell + spidermonkey = spidermonkey_78; # Added 2020-10-09 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 + sqliteInteractive = sqlite-interactive; # Added 2014-12-06 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 - svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 - swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 - swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 - swtpm-tpm2 = swtpm; # added 2021-02-26 - syncthing-cli = syncthing; # added 2021-04-06 - system_config_printer = system-config-printer; # added 2016-01-03 - systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 - systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 - systool = sysfsutils; # added 2018-04-25 - tahoelafs = tahoe-lafs; # added 2018-03-26 - tangogps = foxtrotgps; # added 2020-01-26 + 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 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 + sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + surf-webkit2 = surf; # Added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17 + swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14 + swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23 + swtpm-tpm2 = swtpm; # Added 2021-02-26 + syncthing-cli = syncthing; # Added 2021-04-06 + synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 + system_config_printer = system-config-printer; # Added 2016-01-03 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 + systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 + systool = sysfsutils; # Added 2018-04-25 + + ### T ### + + tahoelafs = tahoe-lafs; # Added 2018-03-26 + tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; - telepathy_farstream = telepathy-farstream; # added 2018-02-25 - telepathy_gabble = telepathy-gabble; # added 2018-02-25 - telepathy_glib = telepathy-glib; # added 2018-02-25 - telepathy_haze = telepathy-haze; # added 2018-02-25 - telepathy_idle = telepathy-idle; # added 2018-02-25 - telepathy_logger = telepathy-logger; # added 2018-02-25 - telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 - telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 - telepathy_qt = telepathy-qt; # added 2018-02-25 - telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 - telepathy_salut = telepathy-salut; # added 2018-02-25 - telnet = inetutils; # added 2018-05-15 - terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21 - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15 - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08 - terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 - terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 - terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 - terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 - tesseract_4 = tesseract4; # added 2018-12-19 - tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 - tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 - tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 - tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 - tftp_hpa = tftp-hpa; # added 2015-04-03 - timescale-prometheus = promscale; # added 2020-09-29 - timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 - tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 - torbrowser = tor-browser-bundle-bin; # added 2017-04-05 - torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - 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 - 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 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02 + telepathy_farstream = telepathy-farstream; # Added 2018-02-25 + telepathy_gabble = telepathy-gabble; # Added 2018-02-25 + telepathy_glib = telepathy-glib; # Added 2018-02-25 + telepathy_haze = telepathy-haze; # Added 2018-02-25 + telepathy_idle = telepathy-idle; # Added 2018-02-25 + telepathy_logger = telepathy-logger; # Added 2018-02-25 + telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25 + telepathy_qt = telepathy-qt; # Added 2018-02-25 + telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19 + telepathy_salut = telepathy-salut; # Added 2018-02-25 + telnet = inetutils; # Added 2018-05-15 + terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28 + terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28 + terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 + terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; + terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 + terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 + tesseract_4 = tesseract4; # Added 2018-12-19 + tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03 + tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03 + tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03 + tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03 + tftp_hpa = tftp-hpa; # Added 2015-04-03 + thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25."; + thunderbird-bin-68 = thunderbird-68; + timescale-prometheus = promscale; # Added 2020-09-29 + timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 + tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27 + tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11 + tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01 + torbrowser = tor-browser-bundle-bin; # Added 2017-04-05 + torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + 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 + transfig = fig2dev; # Added 2022-02-15 + transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 + transmission_gtk = transmission-gtk; # Added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; - trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 - truecrypt = veracrypt; # added 2018-10-24 - tshark = wireshark-cli; # added 2018-04-25 - tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 - typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11 - uberwriter = apostrophe; # added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 - ucsFonts = ucs-fonts; # added 2016-07-15 - ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 - ultrastardx-beta = ultrastardx; # added 2017-08-12 - unicorn-emu = unicorn; # added 2020-10-29 - unifiStable = unifi6; # added 2020-12-28 - untrunc = untrunc-anthwlock; # added 2021-02-01 - usb_modeswitch = usb-modeswitch; # added 2016-05-10 - usbguard-nox = usbguard; # added 2019-09-04 - utillinux = util-linux; # added 2020-11-24 + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29 + truecrypt = veracrypt; # Added 2018-10-24 + tshark = wireshark-cli; # Added 2018-04-25 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11 + + ### U ### + + uberwriter = apostrophe; # Added 2020-04-23 + ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + ucsFonts = ucs-fonts; # Added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11 + ultrastardx-beta = ultrastardx; # Added 2017-08-12 + unicorn-emu = unicorn; # Added 2020-10-29 + unifiStable = unifi6; # Added 2020-12-28 + untrunc = untrunc-anthwlock; # Added 2021-02-01 + urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 + urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 + urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 + urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 + urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 + urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 + urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 + urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 + usb_modeswitch = usb-modeswitch; # Added 2016-05-10 + usbguard-nox = usbguard; # Added 2019-09-04 + utillinux = util-linux; # Added 2020-11-24 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; - v4l_utils = v4l-utils; # added 2019-08-07 + + ### V ### + + v4l_utils = v4l-utils; # Added 2019-08-07 v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; - vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 - varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15 - venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 - vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 - vimbWrapper = vimb; # added 2015-01 - vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 - vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 - virtviewer = virt-viewer; # added 2015-12-24 - virtmanager = virt-manager; # added 2019-10-29 - virtmanager-qt = virt-manager-qt; # added 2019-10-29 - virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 - vorbisTools = vorbis-tools; # added 2016-01-26 - vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29 - way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13 - webkit = webkitgtk; # added 2019-03-05 - webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 - wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11 - wineStaging = wine-staging; # added 2018-01-08 - winusb = woeusb; # added 2017-12-22 - winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 - wireguard = wireguard-tools; # added 2018-05-19 - morituri = whipper; # added 2018-09-13 - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19 - xp-pen-g430 = pentablet-driver; # added 2020-05-03 - xdg_utils = xdg-utils; # added 2021-02-01 - xfceUnstable = xfce4-14; # added 2019-09-17 + vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15 + vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 + vimbWrapper = vimb; # Added 2015-01 + vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05 + vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 + virtmanager = virt-manager; # Added 2019-10-29 + virtmanager-qt = virt-manager-qt; # Added 2019-10-29 + virtviewer = virt-viewer; # Added 2015-12-24 + vorbisTools = vorbis-tools; # Added 2016-01-26 + vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29 + + ### W ### + + way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 + webkit = webkitgtk; # Added 2019-03-05 + webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron."; # added 2022-02-08 + wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 + wineFull = winePackages.full; # Added 2017-05-27 + wineMinimal = winePackages.minimal; # Added 2017-05-27 + wineStable = winePackages.stable; # Added 2017-05-27 + wineStaging = wine-staging; # Added 2018-01-08 + wineUnstable = winePackages.unstable; # Added 2017-05-27 + wineWayland = wine-wayland; + winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10 + winusb = woeusb; # Added 2017-12-22 + wireguard = wireguard-tools; # Added 2018-05-19 + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18 + wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31 + + ### X ### + + x11 = xlibsWrapper; # Added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 + xbmc = kodi; # Added 2018-04-25 + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 + xbmcPlain = kodiPlain; # Added 2018-04-25 + xbmcPlugins = kodiPackages; # Added 2018-04-25 + xdg_utils = xdg-utils; # Added 2021-02-01 + xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 xfce4-14 = xfce; - xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 - x11 = xlibsWrapper; # added 2015-09 - xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 - xbmc = kodi; # added 2018-04-25 - 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 + xfceUnstable = xfce4-14; # Added 2019-09-17 + 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"; - pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; - xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 - xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" - + "and is broken. Working alternatives are libinput and synaptics."); - xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 - 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 + xp-pen-g430 = pentablet-driver; # Added 2020-05-03 + xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09 + xf86_input_mtrack = throw '' + xf86_input_mtrack has been removed from nixpkgs as it is broken and + unmaintained. Working alternatives are libinput and synaptics. + ''; + xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20 + 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 + + ### Y ### + yacc = bison; # moved from top-level 2021-03-14 - youtubeDL = youtube-dl; # added 2014-10-26 + yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 + youtubeDL = youtube-dl; # Added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; - yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 - yuzu = yuzu-mainline; # added 2021-01-25 - zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07 - zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 - zdfmediathk = mediathekview; # added 2019-01-19 - - gnome_user_docs = gnome-user-docs; # added 2019-11-20 - # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # added 2020-10-09 - libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 - libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 - - # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 - # branch-off + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08 + yuzu = yuzu-mainline; # Added 2021-01-25 - # added 2017-05-27 - wineMinimal = winePackages.minimal; - wineFull = winePackages.full; - wineStable = winePackages.stable; - wineUnstable = winePackages.unstable; + ### Z ### - # added 2018-03-26 - libva-full = libva; - libva1-full = libva1; + zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 + zdfmediathk = mediathekview; # Added 2019-01-19 + zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28 - # forceSystem should not be used directly in Nixpkgs. - # added 2018-07-16 - forceSystem = system: _: - (import self.path { localSystem = { inherit system; }; }); - callPackage_i686 = pkgsi686Linux.callPackage; + # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 + # branch-off - inherit (ocaml-ng) # added 2016-09-14 + inherit (ocaml-ng) # Added 2016-09-14 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 - ocamlPackages_4_03 - ocamlPackages_latest; + ocamlPackages_4_03 ocamlPackages_latest; - mumble_git = pkgs.mumble; # added 2019-08-01 - murmur_git = pkgs.murmur; # added 2019-08-01 - zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17 + zabbix44 = throw '' + Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at + https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 + ''; # Added 2020-08-17 - # added 2019-09-06 + # Added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; - # added 2020-06-22 + # Added 2020-06-22 zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { # added 2016-09-14 + +} // (with ocaml-ng; { # Added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; }) // { - gnatsd = nats-server; # added 2019-10-28 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - dina-font-pcf = dina-font; # added 2020-02-09 - - /* Cleanup before 20.09 */ - oraclejdk8psu = throw '' - oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! - ''; - oraclejre8psu = oraclejdk8psu; - oraclejdk8psu_distro = oraclejdk8psu; - - dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 - sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; - todolist = throw "todolist is now ultralist."; # added 2020-12-27 - - /* Cleanup before 21.05 */ - riot-desktop = throw "riot-desktop is now element-desktop!"; - riot-web = throw "riot-web is now element-web"; - - ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; - - /* Added 2021-01-02 */ - ttyrec = ovh-ttyrec; - - tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12 - - zplugin = zinit; # Added 2021-01-30 - - 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. - ''; + The package doesn't compile anymore on NixOS and both development & + maintenance is abandoned by upstream. + ''; # Cleanup before 21.11, Added 2021-05-07 + ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + dina-font-pcf = dina-font; # Added 2020-02-09 + dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # Added 2020-02-02 + gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + gnatsd = nats-server; # Added 2019-10-28 - # Added 2021-06-01 obs-gstreamer = throw '' obs-gstreamer has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-gstreamer. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-move-transition = throw '' obs-move-transition has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-move-transition. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-multi-rtmp = throw '' obs-multi-rtmp has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-multi-rtmp. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-ndi = throw '' obs-ndi has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-ndi. - ''; + ''; # Added 2021-06-01 - obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 + obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 - # Added 2021-06-01 obs-wlrobs = throw '' wlrobs has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.wlrobs. - ''; + ''; # Added 2021-06-01 + + oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream."; # Cleanup before 20.09 + oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 + oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 + riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 + sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 + todolist = throw "todolist is now ultralist."; # Added 2020-12-27 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12 + ttyrec = ovh-ttyrec; # Added 2021-01-02 + zplugin = zinit; # Added 2021-01-30 + + inherit (stdenv.hostPlatform) system; # Added 2021-10-22 + + # LLVM packages for (integration) testing that should not be used inside Nixpkgs: + llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_git.tools; + targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; + }); /* 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 */ - inherit (plasma5Packages) breeze-icons oxygen-icons5; - inherit (plasma5Packages) - akonadi akregator ark - bomber bovo - dolphin dragon - elisa - ffmpegthumbs filelight - granatier gwenview - k3b - kaddressbook kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget kgpg - khelpcenter - kig kigo killbots kitinerary - kleopatra klettres klines - kmag kmail kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole kontact korganizer - kpkpass - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager kwave - marble minuet - okular - picmi - spectacle - yakuake - ; inherit (plasma5Packages) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth - discover - kactivitymanagerd - kde-cli-tools kde-gtk-config kdeplasma-addons - kgamma5 - kinfocenter - kmenuedit - kscreen kscreenlocker ksshaskpass - kwallet-pam kwayland-integration kwin kwrited - milou - oxygen - plasma-browser-integration - plasma-desktop - plasma-integration - plasma-nm - plasma-pa - plasma-systemmonitor - plasma-thunderbolt - plasma-vault - plasma-workspace plasma-workspace-wallpapers - polkit-kde-agent powerdevil - qqc2-breeze-style - sddm-kcm systemsettings - xdg-desktop-portal-kde - plasma-phone-components - plasma-nano + akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook + kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config + kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy + kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary + kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact + korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares + ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet + okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop + plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components + plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style + sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake ; + inherit (plasma5Packages.thirdParty) - plasma-applet-caffeine-plus - plasma-applet-virtual-desktop-bar - kwin-dynamic-workspaces - kwin-tiling krohnkite krunner-symbols + kwin-dynamic-workspaces + kwin-tiling + plasma-applet-caffeine-plus + plasma-applet-virtual-desktop-bar ; + inherit (libsForQt5) sddm ; - # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_git.tools; - targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; - }); - - inherit (stdenv.hostPlatform) system; # added 2021-10-22 - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cdcff558977c..787ea39ae4944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -147,6 +147,8 @@ with pkgs; { name = "auto-patchelf-hook"; deps = [ bintools ]; } ../build-support/setup-hooks/auto-patchelf.sh; + appflowy = callPackage ../applications/office/appflowy { }; + appimageTools = callPackage ../build-support/appimage { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; @@ -180,12 +182,10 @@ with pkgs; althttpd = callPackage ../servers/althttpd { }; - among-sus = callPackage ../games/among-sus { }; + anders = callPackage ../applications/science/logic/anders { }; ankisyncd = callPackage ../servers/ankisyncd { }; - antsimulator = callPackage ../games/antsimulator { }; - aocd = with python3Packages; toPythonApplication aocd; astrolog = callPackage ../applications/science/astronomy/astrolog { }; @@ -202,16 +202,22 @@ with pkgs; fission = callPackage ../development/tools/fission { }; + appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bada-bib = callPackage ../applications/science/misc/bada-bib {}; + bakelite = callPackage ../tools/backup/bakelite { }; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bingo = callPackage ../development/tools/bingo {}; + breakpad = callPackage ../development/misc/breakpad { }; buf = callPackage ../development/tools/buf { }; @@ -244,14 +250,16 @@ with pkgs; castxml = callPackage ../development/tools/castxml { inherit (llvmPackages) libclang llvm; - inherit (python3Packages) sphinx; + inherit (python3.pkgs) sphinx; }; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; + + btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -277,14 +285,16 @@ with pkgs; cm256cc = callPackage ../development/libraries/cm256cc { }; + cocogitto = callPackage ../development/tools/cocogitto { + inherit (darwin.apple_sdk.frameworks) Security; + }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; colmena = callPackage ../tools/admin/colmena { }; - colobot = callPackage ../games/colobot {}; - colorz = callPackage ../tools/misc/colorz { }; colorpicker = callPackage ../tools/misc/colorpicker { }; @@ -293,6 +303,8 @@ with pkgs; commitlint = nodePackages."@commitlint/cli"; + commit-formatter = callPackage ../applications/version-management/commit-formatter { }; + containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; @@ -313,12 +325,16 @@ with pkgs; deadcode = callPackage ../development/tools/deadcode { }; + deadnix = callPackage ../development/tools/deadnix { }; + each = callPackage ../tools/text/each { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; evans = callPackage ../development/tools/evans { }; + firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; + frugal = callPackage ../development/tools/frugal { }; glade = callPackage ../development/tools/glade { }; @@ -331,6 +347,10 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; @@ -341,7 +361,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -361,7 +381,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -379,8 +399,6 @@ with pkgs; oletools = with python3.pkgs; toPythonApplication oletools; - creddump = callPackage ../tools/security/creddump {}; - credential-detector = callPackage ../tools/security/credential-detector { }; credslayer = callPackage ../tools/security/credslayer { }; @@ -427,11 +445,7 @@ with pkgs; dotfiles = callPackage ../applications/misc/dotfiles { }; - dotnetenv = callPackage ../build-support/dotnetenv { - dotnetfx = dotnetfx40; - }; - - dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; + # Dotnet dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); @@ -444,6 +458,17 @@ with pkgs; dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; + buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; + nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; + + dotnetenv = callPackage ../build-support/dotnet/dotnetenv { + dotnetfx = dotnetfx40; + }; + + buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; + fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; + dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; + dumb-init = callPackage ../applications/virtualization/dumb-init {}; umoci = callPackage ../applications/virtualization/umoci {}; @@ -529,6 +554,8 @@ with pkgs; run = callPackage ../development/tools/run { }; + mblock-mlink = callPackage ../development/tools/mblock-mlink { }; + mod = callPackage ../development/tools/mod { }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -643,11 +670,6 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - fetchNuGet = callPackage ../build-support/fetchnuget { }; - buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; - buildDotnetModule = callPackage ../build-support/build-dotnet-module { }; - nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; - fetchgx = callPackage ../build-support/fetchgx { }; resolveMirrorURLs = {url}: fetchurl { @@ -683,18 +705,24 @@ with pkgs; madonctl = callPackage ../applications/misc/madonctl { }; - maelstrom = callPackage ../games/maelstrom { }; - copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; + makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { }; + makeAutostartItem = callPackage ../build-support/make-startupitem { }; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } - ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook + { deps = [ dieHook ]; + substitutions = { + shell = targetPackages.runtimeShell; + passthru.tests = tests.makeWrapper; + }; + } + ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = let f = { cc, sanitizers }: let @@ -791,6 +819,11 @@ with pkgs; substitutions = { inherit (binutils) targetPrefix; }; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; + writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; + + desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; } + ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; @@ -858,7 +891,7 @@ with pkgs; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; - acme-sh = callPackage ../tools/admin/acme.sh { }; + acme-sh = callPackage ../tools/admin/acme-sh { }; acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; @@ -911,6 +944,8 @@ with pkgs; acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + adrgen = callPackage ../tools/misc/adrgen { }; + adriconf = callPackage ../tools/graphics/adriconf { }; amass = callPackage ../tools/networking/amass { }; @@ -968,8 +1003,6 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; - airtame = callPackage ../applications/misc/airtame { }; - aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { @@ -993,6 +1026,8 @@ with pkgs; libgamemode32 = pkgsi686Linux.gamemode.lib; }; + gay = callPackage ../tools/misc/gay { }; + elkhound = callPackage ../development/tools/elkhound { }; weidu = callPackage ../tools/games/weidu { }; @@ -1001,6 +1036,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; + gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; @@ -1009,6 +1046,10 @@ with pkgs; godspeed = callPackage ../tools/networking/godspeed { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; + + headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; linux-router = callPackage ../tools/networking/linux-router { }; @@ -1019,7 +1060,7 @@ with pkgs; pferd = callPackage ../tools/misc/pferd {}; - qflipper = callPackage ../tools/misc/qflipper { }; + qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; quich = callPackage ../tools/misc/quich { } ; @@ -1062,6 +1103,10 @@ with pkgs; stdenv = clangStdenv; }; + archi = callPackage ../tools/misc/archi { }; + + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1069,8 +1114,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - archi = callPackage ../tools/misc/archi { }; - contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1081,8 +1124,6 @@ with pkgs; eterm = callPackage ../applications/terminal-emulators/eterm { }; - evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); - foot = callPackage ../applications/terminal-emulators/foot { }; germinal = callPackage ../applications/terminal-emulators/germinal { }; @@ -1093,30 +1134,16 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; - iqueue = callPackage ../development/libraries/iqueue {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; - lifecycled = callPackage ../tools/misc/lifecycled { }; - - lilo = callPackage ../tools/misc/lilo { }; - - lilyterm = callPackage ../applications/terminal-emulators/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - - logseq = callPackage ../applications/misc/logseq { }; + kitty-themes = callPackage ../misc/kitty-themes {}; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -1130,24 +1157,26 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - natls = callPackage ../tools/misc/natls { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; - - pikchr = callPackage ../tools/graphics/pikchr { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + rxvt-unicode-emoji = rxvt-unicode.override { + rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; + }; + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override { + emojiSupport = true; + }; + sakura = callPackage ../applications/terminal-emulators/sakura { }; st = callPackage ../applications/terminal-emulators/st { @@ -1166,8 +1195,6 @@ with pkgs; terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -1177,36 +1204,56 @@ with pkgs; termonad = termonad-with-packages; - termsyn = callPackage ../data/fonts/termsyn { }; - tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; tilix = callPackage ../applications/terminal-emulators/tilix { }; - timedoctor = callPackage ../applications/office/timedoctor { }; - - tvnamer = callPackage ../tools/misc/tvnamer { }; - - twine = with python3Packages; toPythonApplication twine; - wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; - writefreely = callPackage ../applications/misc/writefreely { }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { }; yaft = callPackage ../applications/terminal-emulators/yaft { }; + writefreely = callPackage ../applications/misc/writefreely { }; + + iqueue = callPackage ../development/libraries/iqueue { }; + + lifecycled = callPackage ../tools/misc/lifecycled { }; + + lilo = callPackage ../tools/misc/lilo { }; + + logseq = callPackage ../applications/misc/logseq { + electron = electron_15; + }; + + natls = callPackage ../tools/misc/natls { }; + + notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; + + pikchr = callPackage ../tools/graphics/pikchr { }; + + popsicle = callPackage ../tools/misc/popsicle { }; + + terminal-colors = callPackage ../applications/misc/terminal-colors { }; + + termsyn = callPackage ../data/fonts/termsyn { }; + + timedoctor = callPackage ../applications/office/timedoctor { }; + + tvnamer = callPackage ../tools/misc/tvnamer { }; + + twine = with python3Packages; toPythonApplication twine; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -1217,6 +1264,8 @@ with pkgs; amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; + amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { }; + amber = callPackage ../tools/text/amber { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1291,7 +1340,7 @@ with pkgs; ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; - archivebox = python3Packages.callPackage ../applications/misc/archivebox { }; + archivebox = callPackage ../applications/misc/archivebox { }; archivemount = callPackage ../tools/filesystems/archivemount { }; @@ -1473,8 +1522,6 @@ with pkgs; ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; - ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; - exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; altermime = callPackage ../tools/networking/altermime {}; @@ -1493,7 +1540,7 @@ with pkgs; client = true; }); - antennas = callPackage ../servers/antennas { }; + antennas = nodePackages.antennas; apg = callPackage ../tools/security/apg { }; @@ -1568,8 +1615,6 @@ with pkgs; buildbot-full = with python3Packages; toPythonApplication buildbot-full; buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; - bunny = callPackage ../tools/package-management/bunny { }; - bunyan-rs = callPackage ../development/tools/bunyan-rs { }; callaudiod = callPackage ../applications/audio/callaudiod { }; @@ -1631,8 +1676,6 @@ with pkgs; corsair = with python3Packages; toPythonApplication corsair-scan; - corsmisc = callPackage ../tools/security/corsmisc { }; - cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; }; @@ -1663,6 +1706,8 @@ with pkgs; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + dcap = callPackage ../tools/networking/dcap { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { @@ -1689,6 +1734,8 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; + dontgo403 = callPackage ../tools/security/dontgo403 { }; + dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; dot-http = callPackage ../development/tools/dot-http { @@ -1709,10 +1756,6 @@ with pkgs; emplace = callPackage ../tools/package-management/emplace { }; - encryptr = callPackage ../tools/security/encryptr { - gconf = gnome2.GConf; - }; - enchive = callPackage ../tools/security/enchive { }; enjarify = callPackage ../tools/misc/enjarify { }; @@ -1749,6 +1792,8 @@ with pkgs; fspy = callPackage ../applications/misc/fspy { }; + fluffychat = callPackage ../applications/networking/instant-messengers/fluffychat { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genann = callPackage ../development/libraries/genann { }; @@ -1759,9 +1804,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo115Module; - }; + galene = callPackage ../servers/web-apps/galene { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1789,7 +1832,7 @@ with pkgs; github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; - gitless = callPackage ../applications/version-management/gitless { python = python3; }; + gitless = callPackage ../applications/version-management/gitless { }; gistyc = with python3Packages; toPythonApplication gistyc; @@ -1883,8 +1926,14 @@ with pkgs; ipgrep = callPackage ../tools/networking/ipgrep { }; + itch = callPackage ../games/itch {}; + + itch-setup = callPackage ../games/itch-setup {}; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; lsix = callPackage ../tools/graphics/lsix { }; @@ -1935,6 +1984,8 @@ with pkgs; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; @@ -1949,10 +2000,6 @@ with pkgs; kwakd = callPackage ../servers/kwakd { }; - chunkwm = callPackage ../os-specific/darwin/chunkwm { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; - }; - kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { @@ -2042,7 +2089,6 @@ with pkgs; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (python3Packages) sphinx; }; aria = aria2; @@ -2078,7 +2124,7 @@ with pkgs; avro-c = callPackage ../development/libraries/avro-c { }; - avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; + avro-cpp = callPackage ../development/libraries/avro-c++ { }; aws = callPackage ../tools/virtualization/aws { }; @@ -2129,9 +2175,9 @@ with pkgs; badvpn = callPackage ../tools/networking/badvpn {}; - barcode = callPackage ../tools/graphics/barcode {}; + baget = callPackage ../servers/web-apps/baget { }; - bashburn = callPackage ../tools/cd-dvd/bashburn { }; + barcode = callPackage ../tools/graphics/barcode {}; bashmount = callPackage ../tools/filesystems/bashmount {}; @@ -2192,12 +2238,10 @@ with pkgs; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - bitbucket-cli = python2Packages.bitbucket-cli; + bitbucket-cli = callPackage ../tools/misc/bitbucket-cli { }; bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; - blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; - blitz = callPackage ../development/libraries/blitz { }; blockbook = callPackage ../servers/blockbook { }; @@ -2275,7 +2319,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2331,11 +2375,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - bsod = callPackage ../misc/emulators/bsod { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; - - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2343,9 +2385,7 @@ with pkgs; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - btrbk = callPackage ../tools/backup/btrbk { - asciidoc = asciidoc-full; - }; + btrbk = callPackage ../tools/backup/btrbk { }; buildpack = callPackage ../development/tools/buildpack { }; @@ -2368,8 +2408,6 @@ with pkgs; textual-window-manager = tmux; }; - bypass403 = callPackage ../tools/security/bypass403 { }; - bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; @@ -2464,19 +2502,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2504,6 +2542,8 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; + cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; @@ -2528,7 +2568,7 @@ with pkgs; clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; }; cloudbrute = callPackage ../tools/security/cloudbrute { }; @@ -2552,7 +2592,11 @@ with pkgs; colpack = callPackage ../applications/science/math/colpack { }; - commitizen = callPackage ../applications/version-management/commitizen {}; + cz-cli = callPackage ../applications/version-management/cz-cli {}; + + comma = callPackage ../tools/package-management/comma { }; + + commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; common-licenses = callPackage ../data/misc/common-licenses {}; @@ -2608,6 +2652,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swaytools = callPackage ../tools/wayland/swaytools { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -2757,10 +2803,6 @@ with pkgs; dehydrated = callPackage ../tools/admin/dehydrated { }; - deis = callPackage ../development/tools/deis {}; - - deisctl = callPackage ../development/tools/deisctl {}; - deja-dup = callPackage ../applications/backup/deja-dup { }; dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { }; @@ -2842,9 +2884,9 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -2883,7 +2925,7 @@ with pkgs; duf = callPackage ../tools/misc/duf { }; inherit (ocaml-ng.ocamlPackages_4_10) dune_1; - inherit (ocamlPackages) dune_2 dune-release; + inherit (ocamlPackages) dune_2 dune_3 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -2930,11 +2972,12 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; - }; - element-desktop-wayland = element-desktop.override { - useWayland = true; + electron = electron_15; }; + element-desktop-wayland = writeScriptBin "element-desktop" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" + ''; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { conf = config.element-web.conf or {}; @@ -2952,8 +2995,6 @@ with pkgs; enca = callPackage ../tools/text/enca { }; - enigma = callPackage ../games/enigma {}; - ent = callPackage ../tools/misc/ent { }; envconsul = callPackage ../tools/system/envconsul { }; @@ -2980,6 +3021,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extrude = callPackage ../tools/security/extrude { }; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { @@ -2990,6 +3033,8 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; + findimagedupes = callPackage ../tools/graphics/findimagedupes { }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -3082,8 +3127,6 @@ with pkgs; gbsplay = callPackage ../applications/audio/gbsplay { }; - gdrivefs = python27Packages.gdrivefs; - gdrive = callPackage ../applications/networking/gdrive { }; gdu = callPackage ../tools/system/gdu { }; @@ -3115,8 +3158,12 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; + ghidra = callPackage ../tools/security/ghidra/build.nix { }; + ghidra-bin = callPackage ../tools/security/ghidra { }; + gh2md = callPackage ../tools/backup/gh2md { }; + gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; giph = callPackage ../applications/video/giph { }; @@ -3165,11 +3212,15 @@ with pkgs; goa = callPackage ../development/tools/goa { }; + goawk = callPackage ../tools/text/goawk { }; + gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { }; + godu = callPackage ../tools/misc/godu { + buildGoModule = buildGo116Module; + }; goss = callPackage ../tools/misc/goss { }; @@ -3179,9 +3230,9 @@ with pkgs; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; - gotypist = callPackage ../games/gotypist { }; - - gping = callPackage ../tools/networking/gping { }; + gping = callPackage ../tools/networking/gping { + inherit (darwin.apple_sdk.frameworks) Security; + }; gpu-burn = callPackage ../applications/misc/gpu-burn { }; @@ -3207,18 +3258,12 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; - grapejuice = callPackage ../games/grapejuice { - wine = wineWowPackages.unstable; - }; - hdate = callPackage ../applications/misc/hdate { }; heatseeker = callPackage ../tools/misc/heatseeker { }; hebcal = callPackage ../tools/misc/hebcal {}; - heroic = callPackage ../games/heroic {}; - hexio = callPackage ../development/tools/hexio { }; hexyl = callPackage ../tools/misc/hexyl { }; @@ -3255,6 +3300,8 @@ with pkgs; ifm = callPackage ../tools/graphics/ifm {}; + iina = callPackage ../applications/video/iina { }; + ink = callPackage ../tools/misc/ink { }; inklecate = callPackage ../development/compilers/inklecate {}; @@ -3265,6 +3312,8 @@ with pkgs; interlock = callPackage ../servers/interlock {}; + invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; + iotools = callPackage ../tools/misc/iotools { }; jellyfin = callPackage ../servers/jellyfin { }; @@ -3307,6 +3356,10 @@ with pkgs; krapslog = callPackage ../tools/misc/krapslog { }; + krill = callPackage ../servers/krill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -3371,6 +3424,8 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; + mandown = callPackage ../tools/misc/mandown { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; @@ -3395,19 +3450,11 @@ with pkgs; megacmd = callPackage ../applications/misc/megacmd { }; - meritous = callPackage ../games/meritous { }; - - oh-my-git = callPackage ../games/oh-my-git { }; - - opendune = callPackage ../games/opendune { }; - merriweather = callPackage ../data/fonts/merriweather { }; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - # TODO: call a sprintable to deprecate Meson 0.57 as soon as possible - meson = callPackage ../development/tools/build-managers/meson/0.57 { }; - meson_0_60 = callPackage ../development/tools/build-managers/meson/0.60 { }; + meson = callPackage ../development/tools/build-managers/meson { }; meson-tools = callPackage ../misc/meson-tools { }; @@ -3415,8 +3462,6 @@ with pkgs; midicsv = callPackage ../tools/audio/midicsv { }; - mididings = callPackage ../tools/audio/mididings { }; - miniscript = callPackage ../applications/blockchains/miniscript { }; miniserve = callPackage ../tools/misc/miniserve { @@ -3465,6 +3510,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; @@ -3473,6 +3520,8 @@ with pkgs; mrkd = with python3Packages; toPythonApplication mrkd; + nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -3507,6 +3556,8 @@ with pkgs; nrsc5 = callPackage ../applications/misc/nrsc5 { }; + nsync = callPackage ../development/libraries/nsync { }; + nwipe = callPackage ../tools/security/nwipe { }; nx2elf = callPackage ../tools/compression/nx2elf { }; @@ -3525,6 +3576,10 @@ with pkgs; oneshot = callPackage ../tools/networking/oneshot { }; + orjail = callPackage ../tools/security/orjail { }; + + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; + xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; @@ -3597,8 +3652,6 @@ with pkgs; pyCA = python3Packages.callPackage ../applications/video/pyca {}; - pyrit = callPackage ../tools/security/pyrit {}; - pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; procs = callPackage ../tools/admin/procs { @@ -3614,9 +3667,9 @@ with pkgs; reg = callPackage ../tools/virtualization/reg { }; - river = callPackage ../applications/window-managers/river { - zig = zig_0_8_1; - }; + river = callPackage ../applications/window-managers/river { }; + + rivercarro = callPackage ../applications/misc/rivercarro { }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; @@ -3630,7 +3683,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3652,9 +3705,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; - - snipes = callPackage ../games/snipes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -3666,8 +3717,6 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - space-cadet-pinball = callPackage ../games/space-cadet-pinball { }; - ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { }; @@ -3767,14 +3816,16 @@ with pkgs; libmaxminddb = null; }; + rtrtr = callPackage ../servers/rtrtr { + inherit (darwin.apple_sdk.frameworks) Security; + }; + xmlbeans = callPackage ../tools/misc/xmlbeans { }; xmlsort = perlPackages.XMLFilterSort; xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { }; - mar1d = callPackage ../games/mar1d { } ; - mcrypt = callPackage ../tools/misc/mcrypt { }; mongoaudit = callPackage ../tools/security/mongoaudit { }; @@ -3867,14 +3918,7 @@ with pkgs; bdsync = callPackage ../tools/backup/bdsync { }; - 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; - }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; beanstalkd = callPackage ../servers/beanstalkd { }; @@ -3934,8 +3978,6 @@ with pkgs; birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; - blastem = callPackage ../misc/emulators/blastem { }; - blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; blueberry = callPackage ../tools/bluetooth/blueberry { }; @@ -3970,6 +4012,8 @@ with pkgs; buku = callPackage ../applications/misc/buku { }; + bukut = callPackage ../applications/misc/bukut { }; + byzanz = callPackage ../applications/video/byzanz {}; ori = callPackage ../tools/backup/ori { }; @@ -4127,7 +4171,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4177,8 +4221,6 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - crabz = callPackage ../tools/compression/crabz { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -4199,10 +4241,16 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; + uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; + unify = with python3Packages; toPythonApplication unify; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; + unparam = callPackage ../tools/misc/unparam { }; + + inherit (nodePackages) uppy-companion; + usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; @@ -4260,9 +4308,7 @@ with pkgs; ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_15; - }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4318,6 +4364,8 @@ with pkgs; inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + artim-dark = callPackage ../data/themes/artim-dark {}; + bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -4354,6 +4402,8 @@ with pkgs; checkmate = callPackage ../development/tools/checkmate { }; + circup = callPackage ../development/tools/circup { }; + civetweb = callPackage ../development/libraries/civetweb { }; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; @@ -4493,10 +4543,19 @@ with pkgs; curlFull = curl.override { ldapSupport = true; + gsaslSupport = true; + rtmpSupport = true; + pslSupport = true; + }; + + curlHTTP3 = curl.override { + openssl = quictls; + http3Support = true; }; curl = curlMinimal.override ({ idnSupport = true; + zstdSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; @@ -4682,7 +4741,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { - inherit (pythonPackages) mutagen python wrapPython; + inherit (python2Packages) mutagen python wrapPython; }; dirdiff = callPackage ../tools/text/dirdiff { @@ -4726,8 +4785,6 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; - docbookrx = callPackage ../tools/typesetting/docbookrx { }; - docear = callPackage ../applications/office/docear { }; dockbarx = callPackage ../applications/misc/dockbarx { }; @@ -4744,11 +4801,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; - dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -4756,8 +4813,6 @@ with pkgs; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; - doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; - dorkscout = callPackage ../tools/security/dorkscout { }; downonspot = callPackage ../applications/misc/downonspot { }; @@ -4915,6 +4970,10 @@ with pkgs; s-tar = callPackage ../tools/archivers/s-tar {}; + solo2-cli = callPackage ../tools/security/solo2-cli { + inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit; + }; + sonota = callPackage ../tools/misc/sonota { }; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; @@ -4927,9 +4986,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = schildichat-desktop.override { - useWayland = true; - }; + schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" + ''; schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { conf = config.schildichat-web.conf or {}; @@ -4947,10 +5007,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; - - trac = pythonPackages.callPackage ../tools/misc/trac { }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -4985,16 +5043,22 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { }; + utahfs = callPackage ../applications/networking/utahfs { + buildGoPackage = buildGo116Package; + }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; wallutils = callPackage ../tools/graphics/wallutils { }; + worker-build = callPackage ../development/tools/worker-build { }; + wrangler = callPackage ../development/tools/wrangler { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; + snowflake = callPackage ../tools/networking/snowflake { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -5119,20 +5183,20 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { - electron = electron_14; + electron = electron_12; }; + ethercalc = callPackage ../servers/web-apps/ethercalc { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { }; - eventstat = callPackage ../os-specific/linux/eventstat { }; evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; @@ -5246,14 +5310,20 @@ with pkgs; }; }; + fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { }; + fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; + fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; @@ -5287,10 +5357,6 @@ with pkgs; flannel = callPackage ../tools/networking/flannel { }; cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix {}; - flare = callPackage ../games/flare { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - flashbench = callPackage ../os-specific/linux/flashbench { }; flatpak = callPackage ../development/libraries/flatpak { }; @@ -5337,7 +5403,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -5353,6 +5419,8 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + frr = callPackage ../servers/frr { }; + hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -5367,6 +5435,8 @@ with pkgs; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; + faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { }; + faraday-cli = callPackage ../tools/security/faraday-cli { }; fastlane = callPackage ../tools/admin/fastlane { }; @@ -5461,12 +5531,6 @@ with pkgs; freac = callPackage ../applications/audio/freac { }; - freedroid = callPackage ../games/freedroid { }; - - freedroidrpg = callPackage ../games/freedroidrpg { }; - - freenukum = callPackage ../games/freenukum { }; - freebind = callPackage ../tools/networking/freebind { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -5567,6 +5631,8 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garage = callPackage ../tools/filesystems/garage { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -5615,15 +5681,13 @@ with pkgs; geteltorito = callPackage ../tools/misc/geteltorito { }; - getmail = callPackage ../tools/networking/getmail { }; - getmail6 = callPackage ../tools/networking/getmail6 { }; getopt = callPackage ../tools/misc/getopt { }; gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../applications/networking/gftp { + gftp = callPackage ../applications/networking/ftp/gftp { gtk = gtk2; }; @@ -5631,6 +5695,8 @@ with pkgs; gfbgraph = callPackage ../development/libraries/gfbgraph { }; + gfold = callPackage ../applications/version-management/git-and-tools/gfold { }; + ggobi = callPackage ../tools/graphics/ggobi { }; gh = callPackage ../applications/version-management/git-and-tools/gh { }; @@ -5709,9 +5775,6 @@ with pkgs; git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { }; - # support for bugzilla - git-bz = callPackage ../applications/version-management/git-and-tools/git-bz { }; - git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { }; git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; @@ -5850,8 +5913,6 @@ with pkgs; github-runner = callPackage ../development/tools/continuous-integration/github-runner { }; - gitinspector = callPackage ../applications/version-management/gitinspector { }; - gitkraken = callPackage ../applications/version-management/gitkraken { }; gitlab = callPackage ../applications/version-management/gitlab { }; @@ -5907,19 +5968,17 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gnash = callPackage ../misc/gnash { - autoreconfHook = buildPackages.autoreconfHook269; - }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; - gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { }; + gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; @@ -5960,11 +6019,11 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - gnupg22 = callPackage ../tools/security/gnupg/22.nix { + gnupg23 = callPackage ../tools/security/gnupg/23.nix { guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; - gnupg = gnupg22; + gnupg = gnupg23; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; @@ -6001,7 +6060,9 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { }; + goofys = callPackage ../tools/filesystems/goofys { + buildGoModule = buildGo116Module; + }; go-sct = callPackage ../tools/X11/go-sct { }; @@ -6028,16 +6089,20 @@ with pkgs; google-fonts = callPackage ../data/fonts/google-fonts { }; - google-clasp = callPackage ../development/misc/google-clasp { }; + google-clasp = nodePackages."@google/clasp"; google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; - google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; + google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; + google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { }; + + google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { }; + gdown = with python3Packages; toPythonApplication gdown; gopro = callPackage ../tools/video/gopro { }; @@ -6046,6 +6111,8 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; + gost = callPackage ../tools/networking/gost { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -6075,6 +6142,8 @@ with pkgs; hamlib = hamlib_4; }; + gprojector = callPackage ../applications/science/astronomy/gprojector { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -6208,8 +6277,6 @@ with pkgs; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; - gtklick = callPackage ../applications/audio/gtklick {}; - gtdialog = callPackage ../development/libraries/gtdialog {}; gtkd = callPackage ../development/libraries/gtkd { }; @@ -6240,9 +6307,7 @@ with pkgs; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gvpe = callPackage ../tools/networking/gvpe { - openssl = openssl_1_0_2; - }; + gvpe = callPackage ../tools/networking/gvpe {}; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -6588,6 +6653,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; inql = callPackage ../tools/security/inql { }; @@ -6621,8 +6688,6 @@ with pkgs; ioping = callPackage ../tools/system/ioping { }; - iops = callPackage ../tools/system/iops { }; - ior = callPackage ../tools/system/ior { }; iouyap = callPackage ../tools/networking/iouyap { }; @@ -6637,9 +6702,15 @@ with pkgs; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo116Module; + }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { + buildGoModule = buildGo116Module; + }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo116Module; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -6692,6 +6763,8 @@ with pkgs; itm-tools = callPackage ../development/tools/misc/itm-tools { }; + ite-backlight = callPackage ../misc/ite-backlight { }; + iwgtk = callPackage ../tools/networking/iwgtk { }; ix = callPackage ../tools/misc/ix { }; @@ -6704,6 +6777,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; + jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -6720,6 +6795,8 @@ with pkgs; jet = callPackage ../development/tools/jet { }; + jfmt = callPackage ../development/tools/jfmt { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -6739,6 +6816,8 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; + jless = callPackage ../development/tools/jless { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -6747,8 +6826,6 @@ with pkgs; jsvc = callPackage ../tools/system/jsvc { }; - jumpnbump = callPackage ../games/jumpnbump { }; - junkie = callPackage ../tools/networking/junkie { }; just = callPackage ../development/tools/just { }; @@ -6858,8 +6935,6 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - keeperrl = callPackage ../games/keeperrl { }; - kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; @@ -6915,8 +6990,6 @@ with pkgs; klystrack = callPackage ../applications/audio/klystrack { }; - knockknock = callPackage ../tools/security/knockknock { }; - knockpy = callPackage ../tools/security/knockpy { }; kore = callPackage ../development/web/kore { }; @@ -6967,14 +7040,14 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; - ligo = callPackage ../development/compilers/ligo { }; + ligo = callPackage ../development/compilers/ligo { + coq = coq_8_14; + }; ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - lbreakout2 = callPackage ../games/lbreakout2 { }; - lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { }; lego = callPackage ../tools/admin/lego { }; @@ -7076,8 +7149,6 @@ with pkgs; ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; - lunar-client = callPackage ../games/lunar-client {}; - lvmsync = callPackage ../tools/backup/lvmsync { }; kapp = callPackage ../tools/networking/kapp {}; @@ -7112,6 +7183,8 @@ with pkgs; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; + matrix-conduit = callPackage ../servers/matrix-conduit { }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails (https://github.com/NixOS/nixpkgs/issues/76093) */ matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; @@ -7154,6 +7227,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { + inherit (darwin.apple_sdk.frameworks) Security; + }; + mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7298,7 +7375,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7456,6 +7533,9 @@ with pkgs; libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; + libportal-gtk3 = libportal.override { variant = "gtk3"; }; + libportal-gtk4 = libportal.override { variant = "gtk4"; }; + libportal-qt5 = libportal.override { variant = "qt5"; }; libmicrodns = callPackage ../development/libraries/libmicrodns { }; @@ -7573,8 +7653,6 @@ with pkgs; lshw = callPackage ../tools/system/lshw { }; - ltris = callPackage ../games/ltris { }; - lunatic = callPackage ../development/interpreters/lunatic { }; lv = callPackage ../tools/text/lv { }; @@ -7593,6 +7671,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + lziprecover = callPackage ../tools/compression/lziprecover { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; @@ -7605,6 +7685,8 @@ with pkgs; lzop = callPackage ../tools/compression/lzop { }; + lzwolf = callPackage ../games/lzwolf { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; macchina = callPackage ../tools/misc/macchina { @@ -7635,8 +7717,6 @@ with pkgs; mailsend = callPackage ../tools/networking/mailsend { }; - mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; - mailutils = callPackage ../tools/networking/mailutils { sasl = gsasl; }; @@ -7716,6 +7796,8 @@ with pkgs; guile = guile_1_8; }; + mcstatus = with python3Packages; toPythonApplication mcstatus; + mdbtools = callPackage ../tools/misc/mdbtools { }; mdk = callPackage ../development/tools/mdk { }; @@ -7724,11 +7806,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7738,15 +7820,13 @@ with pkgs; mencal = callPackage ../applications/misc/mencal { } ; - metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; - metar = callPackage ../applications/misc/metar { }; mfcuk = callPackage ../tools/security/mfcuk { }; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -7825,6 +7905,8 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + modsecurity-crs = callPackage ../tools/security/modsecurity-crs { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; molotov = callPackage ../applications/video/molotov {}; @@ -7843,6 +7925,10 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; + morgen = callPackage ../applications/office/morgen { + electron = electron_15; + }; + mosh = callPackage ../tools/networking/mosh { }; mpage = callPackage ../tools/text/mpage { }; @@ -7875,6 +7961,8 @@ with pkgs; mtr = callPackage ../tools/networking/mtr {}; + mtr-exporter = callPackage ../tools/networking/mtr-exporter {}; + mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; mtx = callPackage ../tools/backup/mtx {}; @@ -7903,10 +7991,6 @@ with pkgs; munge = callPackage ../tools/security/munge { }; - munt = libsForQt5.callPackage ../applications/audio/munt { - jack = libjack2; - }; - mutagen = callPackage ../tools/misc/mutagen { }; mycli = callPackage ../tools/admin/mycli { }; @@ -7962,7 +8046,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -7996,6 +8080,8 @@ with pkgs; netboot = callPackage ../tools/networking/netboot {}; + netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; + netcat = libressl.nc; netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -8080,20 +8166,20 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_1; + nomad = nomad_1_2; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { - buildGoPackage = buildGo115Package; + nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { + buildGoModule = buildGo116Module; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; - nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { - buildGoModule = buildGo116Module; + nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { + buildGoModule = buildGo117Module; inherit (linuxPackages) nvidia_x11; nvidiaGpuSupport = config.cudaSupport or false; }; @@ -8102,6 +8188,8 @@ with pkgs; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + nomad-pack = callPackage ../applications/networking/cluster/nomad-pack { }; + nomino = callPackage ../tools/misc/nomino { }; notable = callPackage ../applications/misc/notable { }; @@ -8130,8 +8218,12 @@ with pkgs; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + panicparse = callPackage ../tools/misc/panicparse { }; + patray = callPackage ../tools/audio/patray { }; pasystray = callPackage ../tools/audio/pasystray { }; @@ -8144,8 +8236,6 @@ with pkgs; pnmixer = callPackage ../tools/audio/pnmixer { }; - pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; - pulsemixer = callPackage ../tools/audio/pulsemixer { }; pwsafe = callPackage ../applications/misc/pwsafe { }; @@ -8278,7 +8368,9 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + buildGoModule = buildGo116Module; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -8352,9 +8444,6 @@ with pkgs; 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 { }; - openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; opencc = callPackage ../tools/text/opencc { }; @@ -8375,6 +8464,8 @@ with pkgs; opendylan-bootstrap = opendylan_bin; }; + openfec = callPackage ../development/libraries/openfec { }; + ophis = python3Packages.callPackage ../development/compilers/ophis { }; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; @@ -8410,6 +8501,8 @@ with pkgs; luaPackages = lua53Packages; }; + opensbi = callPackage ../misc/opensbi { }; + opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; @@ -8477,6 +8570,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8484,7 +8578,9 @@ with pkgs; openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; - optifine = callPackage ../tools/games/minecraft/optifine { }; + optifinePackages = callPackage ../tools/games/minecraft/optifine { }; + + optifine = optifinePackages.optifine-latest; optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; @@ -8529,7 +8625,9 @@ with pkgs; ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; + ovito = libsForQt5.callPackage ../applications/graphics/ovito { + inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; + }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; @@ -8557,6 +8655,8 @@ with pkgs; page = callPackage ../tools/misc/page { }; + PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; @@ -8637,11 +8737,6 @@ with pkgs; pngout = callPackage ../tools/graphics/pngout { }; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { - flex = flex_2_5_35; - openssl = openssl_1_0_2; - }; - patch = gnupatch; patchage = callPackage ../applications/audio/patchage { }; @@ -8677,8 +8772,6 @@ with pkgs; pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; - pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { }; - pdfcrack = callPackage ../tools/security/pdfcrack { }; pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; @@ -8689,12 +8782,8 @@ with pkgs; pdftoipe = callPackage ../tools/graphics/pdftoipe { }; - fmodex = callPackage ../games/zandronum/fmod.nix { }; - pdfminer = with python3Packages; toPythonApplication pdfminer; - pdfmod = callPackage ../applications/misc/pdfmod { }; - pdf-quench = callPackage ../applications/misc/pdf-quench { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -8709,6 +8798,8 @@ with pkgs; pcapc = callPackage ../tools/networking/pcapc { }; + pdm = callPackage ../tools/package-management/pdm { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; @@ -8739,11 +8830,13 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_12; + wlroots = wlroots_0_14; }; phodav = callPackage ../tools/networking/phodav { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; + pim6sd = callPackage ../servers/pim6sd { }; phosh = callPackage ../applications/window-managers/phosh { }; @@ -8761,10 +8854,14 @@ with pkgs; xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; + pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; + pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { }; + pinsel = callPackage ../tools/misc/pinsel { }; + piping-server-rust = callPackage ../servers/piping-server-rust { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -8856,6 +8953,8 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; + podman-tui = callPackage ../applications/virtualization/podman-tui { }; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { @@ -8868,8 +8967,6 @@ with pkgs; poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; - polysh = callPackage ../tools/networking/polysh { }; - ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -8948,8 +9045,6 @@ with pkgs; pastebinit = callPackage ../tools/misc/pastebinit { }; - pifi = callPackage ../applications/audio/pifi { }; - pmacct = callPackage ../tools/networking/pmacct { }; pmix = callPackage ../development/libraries/pmix { }; @@ -8992,8 +9087,6 @@ with pkgs; pwndbg = callPackage ../development/tools/misc/pwndbg { }; - pycangjie = pythonPackages.pycangjie; - pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; pydb = callPackage ../development/tools/pydb { }; @@ -9006,8 +9099,6 @@ with pkgs; teapot = callPackage ../applications/office/teapot { }; - pythonIRClib = pythonPackages.pythonIRClib; - pyditz = callPackage ../applications/misc/pyditz { pythonPackages = python27Packages; }; @@ -9091,6 +9182,8 @@ with pkgs; qmk = callPackage ../tools/misc/qmk { }; + qodem = callPackage ../tools/networking/qodem { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; @@ -9099,7 +9192,9 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = callPackage ../development/libraries/qscintilla { }; + qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { }; + + qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; qshowdiff = callPackage ../tools/text/qshowdiff { }; @@ -9143,7 +9238,7 @@ with pkgs; radvd = callPackage ../tools/networking/radvd { }; - rainbowstream = pythonPackages.rainbowstream; + rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; rambox = callPackage ../applications/networking/instant-messengers/rambox { }; @@ -9157,9 +9252,11 @@ with pkgs; rarian = callPackage ../development/libraries/rarian { }; + ratman = callPackage ../tools/networking/ratman { }; + ratools = callPackage ../tools/networking/ratools { }; - rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; + ratt = callPackage ../applications/misc/ratt { }; rc = callPackage ../shells/rc { }; @@ -9173,6 +9270,8 @@ with pkgs; real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; + realesrgan-ncnn-vulkan = callPackage ../tools/graphics/realesrgan-ncnn-vulkan { }; + react-native-debugger = callPackage ../development/tools/react-native-debugger { }; read-edid = callPackage ../os-specific/linux/read-edid { }; @@ -9185,7 +9284,9 @@ with pkgs; rep = callPackage ../development/tools/rep { }; - reicast = callPackage ../misc/emulators/reicast { }; + repseek = callPackage ../applications/science/biology/repseek { }; + + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9300,6 +9401,10 @@ with pkgs; rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnote = callPackage ../applications/graphics/rnote { + inherit (gst_all_1) gstreamer; + }; + rnp = callPackage ../tools/security/rnp { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -9322,14 +9427,14 @@ with pkgs; rmtrash = callPackage ../tools/misc/rmtrash { }; + roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; - rpg-cli = callPackage ../games/rpg-cli { }; - rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; @@ -9371,11 +9476,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; - - runelite = callPackage ../games/runelite { }; - - runescape = callPackage ../games/runescape-launcher { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -9383,6 +9484,8 @@ with pkgs; runzip = callPackage ../tools/archivers/runzip { }; + unzoo = callPackage ../tools/archivers/unzoo { }; + ruplacer = callPackage ../tools/text/ruplacer { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9477,7 +9580,7 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = callPackage ../applications/science/misc/sasview {}; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -9507,6 +9610,8 @@ with pkgs; screenkey = callPackage ../applications/video/screenkey { }; + scrub = callPackage ../tools/misc/scrub { }; + scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; scriptaculous = callPackage ../development/libraries/scriptaculous { }; @@ -9525,6 +9630,8 @@ with pkgs; sdate = callPackage ../tools/misc/sdate { }; + sdat2img = callPackage ../tools/filesystems/sdat2img { }; + sdcv = callPackage ../applications/misc/sdcv { }; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; @@ -9605,10 +9712,6 @@ with pkgs; shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { - openssl = openssl_1_0_2; - }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -9621,8 +9724,12 @@ with pkgs; sigal = callPackage ../applications/misc/sigal { }; + sigi = callPackage ../applications/misc/sigi { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signald = callPackage ../applications/networking/instant-messengers/signald { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -9664,6 +9771,10 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair {}; + sketchybar = callPackage ../os-specific/darwin/sketchybar { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight; + }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; @@ -9695,8 +9806,6 @@ with pkgs; conf = config.slstatus.conf or null; }; - sm64ex = callPackage ../games/sm64ex { }; - smartdns = callPackage ../tools/networking/smartdns { }; smartmontools = callPackage ../tools/system/smartmontools { @@ -9752,6 +9861,11 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; + spire = callPackage ../tools/security/spire { }; + # to match naming of other package repositories + spire-agent = spire.agent; + spire-server = spire.server; + spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; @@ -9807,10 +9921,6 @@ with pkgs; sqls = callPackage ../applications/misc/sqls { }; - starsector = callPackage ../games/starsector { - openjdk = openjdk8; - }; - stdman = callPackage ../data/documentation/stdman { }; stderred = callPackage ../tools/misc/stderred { }; @@ -10031,6 +10141,8 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper {}; + syft = callPackage ../tools/admin/syft { }; + Sylk = callPackage ../applications/networking/Sylk {}; privoxy = callPackage ../tools/networking/privoxy { @@ -10057,6 +10169,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + tagtime = callPackage ../applications/misc/tagtime { }; + inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; @@ -10146,6 +10260,10 @@ with pkgs; termplay = callPackage ../tools/misc/termplay { }; + testEqualDerivation = callPackage ../build-support/test-equal-derivation.nix { }; + + tetrd = callPackage ../applications/networking/tetrd { }; + tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin @@ -10184,6 +10302,16 @@ with pkgs; inherit (nodePackages) thelounge; + theLoungePlugins = with lib; let + pkgs = filterAttrs (name: _: hasPrefix "thelounge-" name) nodePackages; + getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg) + (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs); + in + recurseIntoAttrs { + plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin"); + themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); + }; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; @@ -10198,13 +10326,13 @@ with pkgs; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; + tile38 = callPackage ../servers/tile38 { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; - - tilp2 = callPackage ../applications/science/math/tilp2 { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10212,7 +10340,7 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; - timekeeper = callPackage ../applications/office/timekeeper { }; + timetagger = callPackage ../servers/timetagger { }; timezonemap = callPackage ../development/libraries/timezonemap { }; @@ -10228,9 +10356,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -10282,6 +10410,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + tokio-console = callPackage ../development/tools/tokio-console { }; + toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { @@ -10292,8 +10422,6 @@ with pkgs; tor = callPackage ../tools/security/tor { }; - tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -10412,6 +10540,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuhi = callPackage ../applications/misc/tuhi { }; + tuir = callPackage ../applications/misc/tuir { }; tunnelto = callPackage ../tools/networking/tunnelto { @@ -10506,8 +10636,6 @@ with pkgs; untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; - unvanquished = callPackage ../games/unvanquished { }; - up = callPackage ../tools/misc/up { }; upterm = callPackage ../tools/misc/upterm { }; @@ -10668,6 +10796,8 @@ with pkgs; SDL = SDL_sixel; }; + witness = callPackage ../tools/security/witness { }; + openconnect = openconnect_gnutls; openconnect_openssl = callPackage ../tools/networking/openconnect { @@ -10704,7 +10834,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -10760,6 +10890,10 @@ with pkgs; wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; + wg-netmanager = callPackage ../tools/networking/wg-netmanager { + inherit (darwin.apple_sdk.frameworks) Security; + }; + woff2 = callPackage ../development/web/woff2 { }; woof = callPackage ../tools/misc/woof { }; @@ -10792,7 +10926,9 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; + textql = callPackage ../development/tools/textql { + buildGoPackage = buildGo116Package; + }; html2text = callPackage ../tools/text/html2text { }; @@ -10848,10 +10984,6 @@ with pkgs; ts = callPackage ../tools/system/ts { }; - transfig = callPackage ../tools/graphics/transfig { - libpng = libpng12; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; @@ -10918,8 +11050,6 @@ with pkgs; xbanish = callPackage ../tools/X11/xbanish { }; - xbill = callPackage ../games/xbill { }; - xbrightness = callPackage ../tools/X11/xbrightness { }; xdg-launch = callPackage ../applications/misc/xdg-launch { }; @@ -11141,8 +11271,6 @@ with pkgs; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; - xmage = callPackage ../games/xmage { }; - xml2 = callPackage ../tools/text/xml/xml2 { }; xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { }; @@ -11202,7 +11330,9 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { }; + yajsv = callPackage ../tools/misc/yajsv { + buildGoModule = buildGo116Module; + }; yallback = callPackage ../development/tools/analysis/yallback { }; @@ -11324,6 +11454,8 @@ with pkgs; zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; @@ -11366,6 +11498,8 @@ with pkgs; zmap = callPackage ../tools/security/zmap { }; + zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; + ### SHELLS @@ -11448,6 +11582,8 @@ with pkgs; zsh-prezto = callPackage ../shells/zsh/zsh-prezto { }; + yash = callPackage ../shells/yash { }; + grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; powerline = with python3Packages; toPythonApplication powerline; @@ -11594,8 +11730,6 @@ with pkgs; tex = texlive.combined.scheme-medium; }; - asn1c = callPackage ../development/compilers/asn1c { }; - aspectj = callPackage ../development/compilers/aspectj { }; atasm = callPackage ../development/compilers/atasm { }; @@ -11735,7 +11869,7 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) crystal_1_0 crystal_1_1 @@ -11769,9 +11903,7 @@ with pkgs; elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix; - elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { - inherit (darwin.apple_sdk.frameworks) Security; - }); + elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; @@ -12306,6 +12438,10 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; + t-rex = callPackage ../servers/t-rex { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -12343,21 +12479,21 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ + go_1_18 = callPackage ../development/compilers/go/1.18.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; @@ -12371,7 +12507,7 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_16; + go = go_1_17; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -12401,6 +12537,10 @@ with pkgs; idris2 = callPackage ../development/compilers/idris2 { }; + inherit (callPackage ../development/tools/database/indradb { }) + indradb-server + indradb-client; + intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; intercal = callPackage ../development/compilers/intercal { }; @@ -12417,8 +12557,8 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15; - openjfx = openjfx15; + inherit (javaPackages) openjfx11 openjfx15 openjfx17; + openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -12474,6 +12614,8 @@ with pkgs; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + lingua-franca = callPackage ../development/compilers/lingua-franca { }; + openspin = callPackage ../development/compilers/openspin { }; oraclejdk = jdkdistro true false; @@ -12513,7 +12655,20 @@ with pkgs; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2_0_27; + libgit2 = libgit2.overrideAttrs (_: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + patches = []; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; + }); }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { @@ -12628,10 +12783,7 @@ with pkgs; /**/ if platform.isDarwin then 11 else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then - /**/ if platform.isRiscV then 11 - else if platform.isMusl then 11 - else 7 + else if platform.isLinux then 11 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the @@ -12816,7 +12968,7 @@ with pkgs; ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 - ocamlformat_0_19_0; + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1; orc = callPackage ../development/compilers/orc { }; @@ -12863,7 +13015,6 @@ with pkgs; }; pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; - pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; qbe = callPackage ../development/compilers/qbe { }; @@ -12909,18 +13060,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_57 = callPackage ../development/compilers/rust/1_57.nix { + rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_57; + rust = rust_1_58; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_57 = rust_1_57.packages.stable; - rustPackages = rustPackages_1_57; + rustPackages_1_58 = rust_1_58.packages.stable; + rustPackages = rustPackages_1_58; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -13097,6 +13248,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; + rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -13237,6 +13389,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { @@ -13250,7 +13404,6 @@ with pkgs; vala-lint = callPackage ../development/tools/vala-lint { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_40 vala_0_48 vala_0_52 vala_0_54 @@ -13268,7 +13421,11 @@ with pkgs; # Others should instead delegate to the next stage's choice with # `targetPackages.stdenv.cc.bintools`. This one is different just to # provide the default choice, avoiding infinite recursion. - bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils + # See the bintools attribute for the logic and reasoning. We need to provide + # a default here, since eval will hit this function when bootstrapping + # stdenv where the bintools attribute doesn't exist, but will never actually + # be evaluated -- callPackage ends up being too eager. + bintools ? pkgs.bintools , libc ? bintools.libc , # libc++ from the default LLVM version is bound at the top level, but we # want the C++ library to be explicitly chosen by the caller, and null by @@ -13319,6 +13476,7 @@ with pkgs; yosys = callPackage ../development/compilers/yosys { }; yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { }; yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { }; + yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { }; z88dk = callPackage ../development/compilers/z88dk { }; @@ -13479,12 +13637,18 @@ with pkgs; io = callPackage ../development/interpreters/io { }; + ivy = callPackage ../development/interpreters/ivy { }; + j = callPackage ../development/interpreters/j { stdenv = clangStdenv; }; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc921.jacinda; + janet = callPackage ../development/interpreters/janet {}; + jpm = callPackage ../development/interpreters/janet/jpm.nix {}; + jelly = callPackage ../development/interpreters/jelly {}; jimtcl = callPackage ../development/interpreters/jimtcl {}; @@ -13524,11 +13688,8 @@ with pkgs; lolcode = callPackage ../development/interpreters/lolcode { }; - love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; }; - love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; - love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love_11 = callPackage ../development/interpreters/love/11.1.nix { }; + love_11 = callPackage ../development/interpreters/love/11.nix { }; love = love_0_10; wabt = callPackage ../development/tools/wabt { }; @@ -13579,8 +13740,12 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nextflow = callPackage ../development/interpreters/nextflow { }; + ngn-k = callPackage ../development/interpreters/ngn-k { }; + obb = callPackage ../development/interpreters/clojure/obb.nix { }; + octave = callPackage ../development/interpreters/octave { python = python3; mkDerivation = stdenv.mkDerivation; @@ -13650,7 +13815,6 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python = python2; python2 = python27; python3 = python39; pypy = pypy2; @@ -13659,11 +13823,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override { - self = pythonFull; - pythonAttr = "pythonFull"; - x11Support = true; - }; python2Full = python2.override { self = python2Full; pythonAttr = "python2Full"; @@ -13700,7 +13859,6 @@ with pkgs; }; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python.pkgs; python2Packages = python2.pkgs; python3Packages = python3.pkgs; @@ -13710,9 +13868,9 @@ with pkgs; # Python package sets. python27Packages = python27.pkgs; python37Packages = python37.pkgs; - python38Packages = recurseIntoAttrs python38.pkgs; + python38Packages = python38.pkgs; python39Packages = recurseIntoAttrs python39.pkgs; - python310Packages = python310.pkgs; + python310Packages = recurseIntoAttrs python310.pkgs; python311Packages = python311.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; @@ -13763,15 +13921,10 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire {}; pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; + wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; pyradio = callPackage ../applications/audio/pyradio {}; - pyrex = pyrex095; - - pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; - - pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - racket = callPackage ../development/interpreters/racket { # racket 6.11 doesn't build with gcc6 + recent glibc: # https://github.com/racket/racket/pull/1886 @@ -13804,8 +13957,6 @@ with pkgs; inherit (ocamlPackages) reason; - renpy = callPackage ../development/interpreters/renpy { }; - pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; @@ -13831,13 +13982,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_7 - ruby_3_0; + ruby_3_0 + ruby_3_1; ruby = ruby_2_7; rubyPackages = rubyPackages_2_7; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; + rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; mruby = callPackage ../development/compilers/mruby { }; @@ -13856,7 +14009,6 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; @@ -13883,6 +14035,7 @@ with pkgs; wasm3 = callPackage ../development/interpreters/wasm3 { }; + yex-lang = callPackage ../development/interpreters/yex-lang { }; ### DEVELOPMENT / MISC @@ -13931,12 +14084,6 @@ with pkgs; guile-git = callPackage ../development/guile-modules/guile-git { }; - guile-gnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome2.GConf; - guile = guile_2_0; - inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; - }; - guile-json = callPackage ../development/guile-modules/guile-json { }; guile-lib = callPackage ../development/guile-modules/guile-lib { }; @@ -13980,7 +14127,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -14097,12 +14244,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_3 - electron_4 - electron_5 - electron_6 - electron_7 - electron_8 electron_9 electron_10 electron_11 @@ -14110,7 +14251,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -14196,6 +14338,15 @@ with pkgs; bazel_self = bazel_4; }; + bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk11_headless; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + bazel_self = bazel_5; + }; + bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; @@ -14215,15 +14366,7 @@ with pkgs; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { - # error: no viable constructor or deduction guide for deduction of template arguments of 'map' - stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then - llvmPackages_11.stdenv - else - stdenv; - }; - - bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + bear = callPackage ../development/tools/build-managers/bear { }; bingrep = callPackage ../development/tools/analysis/bingrep { }; @@ -14290,6 +14433,8 @@ with pkgs; bloaty = callPackage ../development/tools/bloaty { }; + bloomrpc = callPackage ../development/web/bloomrpc { }; + bloop = callPackage ../development/tools/build-managers/bloop { }; bossa = callPackage ../development/embedded/bossa { @@ -14398,11 +14543,13 @@ with pkgs; cfr = callPackage ../development/tools/java/cfr { }; + cfripper = callPackage ../tools/security/cfripper { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { }; chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { }; @@ -14444,9 +14591,9 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; - ctmg = callPackage ../tools/security/ctmg { }; + cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; + ctmg = callPackage ../tools/security/ctmg { }; cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -14515,7 +14662,9 @@ with pkgs; cwltool = callPackage ../applications/science/misc/cwltool { }; - dprint = callPackage ../development/tools/dprint { }; + dprint = callPackage ../development/tools/dprint { + inherit (darwin.apple_sdk.frameworks) Security; + }; libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -14539,9 +14688,12 @@ with pkgs; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; - libsigrok = callPackage ../development/tools/libsigrok { }; + libsigrok = callPackage ../development/tools/libsigrok { + python = python3; + }; # old version: libsigrok_0_3 = libsigrok.override { + python = python3; version = "0.3.0"; sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; doInstallCheck = false; @@ -14636,6 +14788,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dura = callPackage ../development/tools/misc/dura { }; + dwfv = callPackage ../applications/science/electronics/dwfv { }; dwz = callPackage ../development/tools/misc/dwz { }; @@ -14656,6 +14810,8 @@ with pkgs; egypt = callPackage ../development/tools/analysis/egypt { }; + elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs { }; + elfinfo = callPackage ../development/tools/misc/elfinfo { }; elfkickers = callPackage ../development/tools/misc/elfkickers { }; @@ -14666,6 +14822,8 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; + ent-go = callPackage ../development/tools/ent { }; + epm = callPackage ../development/tools/misc/epm { }; eresi = callPackage ../development/tools/analysis/eresi { }; @@ -14674,9 +14832,20 @@ with pkgs; eweb = callPackage ../development/tools/literate-programming/eweb { }; - eztrace = callPackage ../development/tools/profiling/EZTrace { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - ezquake = callPackage ../games/ezquake { }; + Literate = callPackage ../development/tools/literate-programming/Literate { }; + + md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; + + # NOTE: Override and set useIcon = false to use Awk instead of Icon. + noweb = callPackage ../development/tools/literate-programming/noweb { }; + + nuweb = callPackage ../development/tools/literate-programming/nuweb { + tex = texlive.combined.scheme-medium; + }; + + eztrace = callPackage ../development/tools/profiling/EZTrace { }; faas-cli = callPackage ../development/tools/faas-cli { }; @@ -14724,8 +14893,6 @@ with pkgs; fundoc = callPackage ../development/tools/fundoc { }; - funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -14740,8 +14907,6 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - fedpkg = callPackage ../development/tools/fedpkg { }; - flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -14775,8 +14940,6 @@ with pkgs; gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {}; - gnome-hexgl = callPackage ../games/gnome-hexgl {}; - gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; @@ -14867,6 +15030,8 @@ with pkgs; ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + confluent-cli = callPackage ../development/tools/confluent-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -14893,8 +15058,6 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/embedded/arduino/ino { }; - inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { }; @@ -14907,6 +15070,8 @@ with pkgs; jam = callPackage ../development/tools/build-managers/jam { }; + ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { }; + javacc = callPackage ../development/tools/parsing/javacc { jdk = jdk8; }; @@ -14923,10 +15088,6 @@ with pkgs; jpexs = callPackage ../development/tools/jpexs { }; - julius = callPackage ../games/julius { }; - - augustus = callPackage ../games/augustus { }; - k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; k2tf = callPackage ../development/tools/misc/k2tf { }; @@ -14967,6 +15128,8 @@ with pkgs; kubectx = callPackage ../development/tools/kubectx { }; + kube-linter = callPackage ../development/tools/kube-linter { }; + kube-prompt = callPackage ../development/tools/kube-prompt { }; kubei = callPackage ../tools/security/kubei { }; @@ -15001,8 +15164,6 @@ with pkgs; laminar = callPackage ../development/tools/continuous-integration/laminar { }; - Literate = callPackage ../development/tools/literate-programming/Literate {}; - lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -15072,7 +15233,7 @@ with pkgs; mkcert = callPackage ../development/tools/misc/mkcert { }; - mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mkdocs = with python3Packages; toPythonApplication mkdocs; mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; @@ -15121,12 +15282,9 @@ with pkgs; jre_headless = jre8_headless; }; - nwjs = callPackage ../development/tools/nwjs { - gconf = gnome2.GConf; - }; + nwjs = callPackage ../development/tools/nwjs { }; nwjs-sdk = callPackage ../development/tools/nwjs { - gconf = gnome2.GConf; sdk = true; }; @@ -15135,11 +15293,6 @@ with pkgs; gconf = gnome2.GConf; }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. - noweb = callPackage ../development/tools/literate-programming/noweb { }; - - nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; - nrfutil = callPackage ../development/tools/misc/nrfutil { }; obelisk = callPackage ../development/tools/ocaml/obelisk { }; @@ -15168,8 +15321,6 @@ with pkgs; panopticon = callPackage ../development/tools/analysis/panopticon {}; - pants = callPackage ../development/tools/build-managers/pants {}; - parinfer-rust = callPackage ../development/tools/parinfer-rust {}; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; @@ -15268,7 +15419,6 @@ with pkgs; r10k = callPackage ../tools/system/r10k { }; radare2 = callPackage ../development/tools/analysis/radare2 ({ - inherit (gnome2) vte; lua = lua5; } // (config.radare or {})); @@ -15457,7 +15607,7 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { }; + spruce = callPackage ../development/tools/misc/spruce {}; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -15506,9 +15656,7 @@ with pkgs; c2ffi = callPackage ../development/tools/misc/c2ffi { }; - c3c = callPackage ../development/compilers/c3c { - llvmPackages = llvmPackages_11; - }; + c3c = callPackage ../development/compilers/c3c { }; swfmill = callPackage ../tools/video/swfmill { }; @@ -15588,7 +15736,9 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_3_0; + }; tweak = callPackage ../applications/editors/tweak { }; @@ -15596,7 +15746,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - uddup = python3Packages.callPackage ../tools/security/uddup { }; + uddup = callPackage ../tools/security/uddup { }; udis86 = callPackage ../development/tools/udis86 { }; @@ -15723,13 +15873,17 @@ with pkgs; nsis = callPackage ../development/tools/nsis { }; + tockloader = callPackage ../development/tools/misc/tockloader { }; + ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; + abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -15779,11 +15933,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; @@ -16264,7 +16414,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -16280,6 +16430,14 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + vapoursynth = callPackage ../development/libraries/vapoursynth { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + + vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; + + vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; + vmmlib = callPackage ../development/libraries/vmmlib { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; @@ -16324,6 +16482,7 @@ with pkgs; far2l = callPackage ../applications/misc/far2l { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; }; farbfeld = callPackage ../development/libraries/farbfeld { }; @@ -16355,11 +16514,16 @@ with pkgs; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; }; + ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + }; # Aliases ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -16494,10 +16658,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - # https://github.com/burrowers/garble/issues/124 - buildGoModule = buildGo115Module; - }; + garble = callPackage ../build-support/go/garble.nix { }; gcab = callPackage ../development/libraries/gcab { }; @@ -16570,8 +16731,6 @@ with pkgs; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - giblib = callPackage ../development/libraries/giblib { }; - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { }; @@ -16590,32 +16749,19 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 { + libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { + libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - - libgit2_1_1 = libgit2.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; + patches = []; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -16632,10 +16778,10 @@ with pkgs; glew110 = callPackage ../development/libraries/glew/1.10.nix { inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; - glew-egl = glew.overrideAttrs (oldAttrs: { - pname = "glew-egl"; - makeFlags = oldAttrs.makeFlags ++ [ "SYSTEM=linux-egl" ]; - }); + glew-egl = callPackage ../development/libraries/glew { + inherit (darwin.apple_sdk.frameworks) OpenGL; + enableEGL = true; + }; glfw = glfw3; glfw-wayland = glfw.override { @@ -16802,14 +16948,10 @@ with pkgs; gflags = callPackage ../development/libraries/gflags { }; - gfm = callPackage ../applications/science/math/gfm { }; - gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; - grib-api = callPackage ../development/libraries/grib-api { }; - grilo = callPackage ../development/libraries/grilo { }; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; @@ -16860,8 +17002,6 @@ with pkgs; pgweb = callPackage ../development/tools/database/pgweb { }; - gpgstats = callPackage ../tools/security/gpgstats { }; - gpshell = callPackage ../development/tools/misc/gpshell { }; grantlee = callPackage ../development/libraries/grantlee { }; @@ -16952,8 +17092,6 @@ with pkgs; gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; - gnome-menus = callPackage ../development/libraries/gnome-menus { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -16971,7 +17109,7 @@ with pkgs; gtkextra = callPackage ../development/libraries/gtkextra { }; gtk3 = callPackage ../development/libraries/gtk/3.x.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore; }; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { @@ -16996,17 +17134,9 @@ with pkgs; gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; @@ -17083,9 +17213,9 @@ with pkgs; herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; - autoreconfHook = buildPackages.autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; @@ -17242,6 +17372,8 @@ with pkgs; indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; + indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; @@ -17270,11 +17402,12 @@ with pkgs; iso-flags = callPackage ../data/icons/iso-flags { }; ispc = callPackage ../development/compilers/ispc { - stdenv = llvmPackages_11.stdenv; - llvmPackages = llvmPackages_11; + inherit (llvmPackages) stdenv; }; - isso = callPackage ../servers/isso { }; + isso = callPackage ../servers/isso { + nodejs = nodejs-14_x; + }; itk4 = callPackage ../development/libraries/itk/4.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -17794,8 +17927,6 @@ with pkgs; libgringotts = callPackage ../development/libraries/libgringotts { }; - libgroove = callPackage ../development/libraries/libgroove { }; - libgrss = callPackage ../development/libraries/libgrss { }; libgweather = callPackage ../development/libraries/libgweather { }; @@ -17810,9 +17941,7 @@ with pkgs; libinklevel = callPackage ../development/libraries/libinklevel { }; - libnats-c = callPackage ../development/libraries/libnats-c { - openssl = openssl_1_0_2; - }; + libnats-c = callPackage ../development/libraries/libnats-c { }; liburing = callPackage ../development/libraries/liburing { }; @@ -17887,6 +18016,9 @@ with pkgs; libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; + libffiBoot = libffi.override { + doCheck = false; + }; libfreeaptx = callPackage ../development/libraries/libfreeaptx { }; @@ -17908,8 +18040,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - libgksu = callPackage ../development/libraries/libgksu { }; - libgnt = callPackage ../development/libraries/libgnt { }; libgpg-error = callPackage ../development/libraries/libgpg-error { }; @@ -17953,6 +18083,8 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libhwy = callPackage ../development/libraries/libhwy { }; + libHX = callPackage ../development/libraries/libHX { }; libibmad = callPackage ../development/libraries/libibmad { }; @@ -18181,6 +18313,8 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; + llama = callPackage ../applications/misc/llama { }; + malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; @@ -18219,7 +18353,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -18372,6 +18506,8 @@ with pkgs; libpst = callPackage ../development/libraries/libpst { }; + libptytty = callPackage ../development/libraries/libptytty { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -18475,9 +18611,7 @@ with pkgs; libtiff = if stdenv.isDarwin && stdenv.isAarch64 then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } - else callPackage ../development/libraries/libtiff { - inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; - }; + else callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -18524,6 +18658,8 @@ with pkgs; libudev-zero = callPackage ../development/libraries/libudev-zero { }; + libudfread = callPackage ../development/libraries/libudfread { }; + libuecc = callPackage ../development/libraries/libuecc { }; libui = callPackage ../development/libraries/libui { @@ -18562,6 +18698,8 @@ with pkgs; udev = systemdMinimal; }; + libusbgx = callPackage ../development/libraries/libusbgx { }; + libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libutempter = callPackage ../development/libraries/libutempter { }; @@ -18603,7 +18741,6 @@ with pkgs; libvirt = callPackage ../development/libraries/libvirt { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; - libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; @@ -18691,7 +18828,9 @@ with pkgs; libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { }; + libxslt = callPackage ../development/libraries/libxslt { + python = python3; + }; libxsmm = callPackage ../development/libraries/libxsmm { }; @@ -18707,6 +18846,8 @@ with pkgs; libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + libyang = callPackage ../development/libraries/libyang { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; @@ -18949,9 +19090,7 @@ with pkgs; ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { - openssl = openssl_1_0_2; - }; + mysocketw = callPackage ../development/libraries/mysocketw { }; mythes = callPackage ../development/libraries/mythes { }; @@ -18961,6 +19100,8 @@ with pkgs; nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; + ncnn = callPackage ../development/libraries/ncnn { }; + ndpi = callPackage ../development/libraries/ndpi { }; nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; @@ -18990,10 +19131,6 @@ with pkgs; neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - openssl = openssl_1_0_2; - }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {}; @@ -19119,7 +19256,9 @@ with pkgs; openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackage ../development/libraries/openbabel { }; + openbabel3 = callPackage ../development/libraries/openbabel { + python = python3; + }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -19143,10 +19282,12 @@ with pkgs; opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; + ffmpeg = ffmpeg_4; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + ffmpeg = ffmpeg_4; }; opencv3WithoutCuda = opencv3.override { @@ -19156,6 +19297,7 @@ with pkgs; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; pythonPackages = python3Packages; + ffmpeg = ffmpeg_4; }; opencv = opencv4; @@ -19224,6 +19366,8 @@ with pkgs; opensubdiv = callPackage ../development/libraries/opensubdiv { }; + opensupaplex = callPackage ../games/opensupaplex { }; + open-wbo = callPackage ../applications/science/logic/open-wbo {}; openwsman = callPackage ../development/libraries/openwsman {}; @@ -19232,8 +19376,6 @@ with pkgs; openhmd = callPackage ../development/libraries/openhmd { }; - openrct2 = callPackage ../games/openrct2 { }; - openwebrx = callPackage ../applications/radio/openwebrx { inherit (python3Packages) buildPythonPackage buildPythonApplication setuptools; @@ -19254,8 +19396,6 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; - pangoxsl = callPackage ../development/libraries/pangoxsl { }; - pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; pcg_c = callPackage ../development/libraries/pcg-c { }; @@ -19655,6 +19795,8 @@ with pkgs; rubberband = callPackage ../development/libraries/rubberband { }; + rure = callPackage ../development/libraries/rure { }; + rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; s2geometry = callPackage ../development/libraries/s2geometry { }; @@ -19720,6 +19862,8 @@ with pkgs; SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; sdrplay = callPackage ../applications/radio/sdrplay {}; @@ -19775,6 +19919,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; @@ -20005,7 +20151,7 @@ with pkgs; subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil = callPackage ../development/libraries/audio/suil { }; @@ -20139,9 +20285,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo115Module; - }; + trillian = callPackage ../tools/misc/trillian { }; twolame = callPackage ../development/libraries/twolame { }; @@ -20192,17 +20336,9 @@ with pkgs; gnutls = gnutls; }); - v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ - inherit (python2Packages) python gyp; - icu = icu58; # v8-5.4.232 fails against icu4c-59.1 - } // lib.optionalAttrs stdenv.isLinux { - # doesn't build with gcc7 - stdenv = gcc6Stdenv; - }); + v8 = callPackage ../development/libraries/v8 { }; - v8 = callPackage ../development/libraries/v8 { - inherit (python2Packages) python; - }; + v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; @@ -20282,7 +20418,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; @@ -20320,7 +20456,10 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; + # bump when majoring of packages have updated + webrtc-audio-processing = webrtc-audio-processing_0_3; wildmidi = callPackage ../development/libraries/wildmidi { }; @@ -20344,21 +20483,14 @@ with pkgs; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; - }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { @@ -20373,10 +20505,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) setfile rez derez; - }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; @@ -20413,6 +20542,8 @@ with pkgs; xed = callPackage ../development/libraries/xed { }; + xedit = callPackage ../applications/editors/xedit { }; + xine-lib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -20573,10 +20704,6 @@ with pkgs; httpunit = callPackage ../development/libraries/java/httpunit { }; - gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { }; - - gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -20619,39 +20746,29 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo115Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_15; - }; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoPackage != buildGo117Package`. buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; + buildGo118Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_18; + }; - buildGoPackage = buildGo116Package; + buildGoPackage = buildGo117Package; - buildGo115Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_15; - }; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoModule != buildGo117Module`. buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; + buildGo118Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_18; + }; - buildGoModule = buildGo116Module; + buildGoModule = buildGo117Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -20757,6 +20874,8 @@ with pkgs; packages = []; }; + rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; }; + rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (_: {})) pkgs; }); @@ -20771,6 +20890,8 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; + alps = callPackage ../servers/alps { }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -20783,6 +20904,7 @@ with pkgs; mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; + mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; @@ -20890,7 +21012,7 @@ with pkgs; erlang = erlangR22; }; - couchpotato = callPackage ../servers/couchpotato {}; + dcnnt = python3Packages.callPackage ../servers/dcnnt { }; dendrite = callPackage ../servers/dendrite { }; @@ -20935,13 +21057,16 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_15; jdk = openjdk11; gn = gn1924; }; - etcd = callPackage ../servers/etcd { }; + ergochat = callPackage ../servers/irc/ergochat { }; + + etcd = etcd_3_3; + etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; + etcd_3_5 = callPackage ../servers/etcd/3.5.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; @@ -20955,8 +21080,11 @@ with pkgs; # _compat can probably be removed on next minor version after 0.10.0 lua = lua5_2_compat; withExtraLibs = []; + withExtraLuaPackages = _: []; }; + prosody-filer = callPackage ../servers/xmpp/prosody-filer { }; + biboumi = callPackage ../servers/xmpp/biboumi { }; elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { @@ -21007,9 +21135,13 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo116Module; - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + + promtail = grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; + }); grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -21045,6 +21177,8 @@ with pkgs; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; + home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; + hqplayerd = callPackage ../servers/hqplayerd { }; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; @@ -21127,7 +21261,7 @@ with pkgs; mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; + mailman-rss = callPackage ../tools/misc/mailman-rss { }; mailman-web = with python3.pkgs; toPythonApplication mailman-web; @@ -21146,16 +21280,12 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - buildGoModule = buildGo117Module; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; mbtileserver = callPackage ../servers/mbtileserver { }; - mediatomb = callPackage ../servers/mediatomb { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -21181,7 +21311,6 @@ with pkgs; mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { - stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small mpdWithFeatures; @@ -21207,7 +21336,9 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; + mycorrhiza = callPackage ../servers/mycorrhiza { + buildGoModule = buildGo116Module; + }; myserver = callPackage ../servers/http/myserver { }; @@ -21223,7 +21354,9 @@ with pkgs; unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoModule = buildGo116Module; + }; nginx = nginxStable; @@ -21347,7 +21480,6 @@ with pkgs; }; pulseaudio = callPackage ../servers/pulseaudio ({ - inherit (darwin) Libc; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; } // lib.optionalAttrs stdenv.isDarwin { # Default autoreconfHook (2.70) fails on darwin, @@ -21383,9 +21515,7 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; - easyeffects = callPackage ../applications/audio/easyeffects { - glibmm = glibmm_2_68; - }; + easyeffects = callPackage ../applications/audio/easyeffects { }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; @@ -21416,10 +21546,17 @@ with pkgs; asio = asio_1_10; }; - mariadb = callPackage ../servers/sql/mariadb { + inherit (callPackage ../servers/sql/mariadb { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + }) + mariadb_104 + mariadb_105 + mariadb_106 + mariadb_107 + mariadb_108 + ; + mariadb = mariadb_106; mongodb = hiPrio mongodb-3_4; @@ -21461,12 +21598,8 @@ with pkgs; }; influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { - buildGoModule = buildGo117Module; - }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { - buildGoModule = buildGo117Module; - }; + influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; + influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -21545,9 +21678,7 @@ with pkgs; openfire = callPackage ../servers/xmpp/openfire { }; - softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; }; - softether_4_29 = callPackage ../servers/softether/4.29.nix { }; - softether = softether_4_29; + softether = callPackage ../servers/softether { }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; @@ -21677,16 +21808,16 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; - inherit (pythonPackages) buildPythonPackage qpid-python; + inherit (python2Packages) buildPythonPackage qpid-python; }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + elixir = elixir_1_12; }; - radicale1 = callPackage ../servers/radicale/1.x.nix { }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; radicale3 = callPackage ../servers/radicale/3.x.nix { }; @@ -21753,7 +21884,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -21783,14 +21916,8 @@ with pkgs; # see also openssl, which has/had this same trick }; - sickbeard = callPackage ../servers/sickbeard { }; - sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; - sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; - - sigurlx = callPackage ../tools/security/sigurlx { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -21824,11 +21951,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - syncserver = callPackage ../servers/syncserver { }; - - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo117Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -21868,7 +21991,9 @@ with pkgs; inherit (callPackages ../servers/unifi { }) unifiLTS unifi5 - unifi6; + unifi6 + unifi7; + unifi = unifi6; unifi-video = callPackage ../servers/unifi-video { }; @@ -21879,10 +22004,14 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; + vouch-proxy = callPackage ../servers/vouch-proxy { + buildGoModule = buildGo116Module; + }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + virtiofsd = callPackage ../servers/misc/virtiofsd { }; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -22053,6 +22182,10 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + bluez5-experimental = callPackage ../os-specific/linux/bluez { + withExperimental = true; + }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { # pulseaudio-modules-bt is most likely to be used with pulseaudioFull pulseaudio = pulseaudioFull; @@ -22170,6 +22303,8 @@ with pkgs; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -22222,7 +22357,7 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; + gmailctl = callPackage ../applications/networking/gmailctl { }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22242,6 +22377,8 @@ with pkgs; gradm = callPackage ../os-specific/linux/gradm { }; + gt = callPackage ../os-specific/linux/gt { }; + inherit (nodePackages) gtop; hd-idle = callPackage ../os-specific/linux/hd-idle { }; @@ -22274,9 +22411,7 @@ with pkgs; ifmetric = callPackage ../os-specific/linux/ifmetric {}; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { - openssl = openssl_1_0_2; - }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils {}; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; @@ -22296,7 +22431,7 @@ with pkgs; iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); - # hiPrio for collisions with inetutils (ping and tftpd.8.gz) + # hiPrio for collisions with inetutils (ping) iptables = callPackage ../os-specific/linux/iptables { }; iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; @@ -22359,6 +22494,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linthesia = callPackage ../games/linthesia/default.nix { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -22516,6 +22653,8 @@ with pkgs; lockdep = callPackage ../os-specific/linux/lockdep { }; + lsirec = callPackage ../os-specific/linux/lsirec { }; + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; @@ -22715,19 +22854,13 @@ with pkgs; quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { - openssl = openssl_1_0_2; - }; - linux-pam = callPackage ../os-specific/linux/pam { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { - llvmPackages = llvmPackages_11; - }; + odin = callPackage ../development/compilers/odin { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -22835,7 +22968,9 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + quick-lint-js = callPackage ../development/tools/quick-lint-js { }; + + linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; @@ -22890,7 +23025,9 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { + boost = boost172; + }; setools = callPackage ../os-specific/linux/setools { }; @@ -22898,6 +23035,8 @@ with pkgs; sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; + sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; + sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -22941,7 +23080,7 @@ with pkgs; # break some cyclic dependencies util-linux = util-linuxMinimal; # provide a super minimal gnupg used for systemd-machined - gnupg = callPackage ../tools/security/gnupg/22.nix { + gnupg = callPackage ../tools/security/gnupg/23.nix { enableMinimal = true; guiSupport = false; pcsclite = null; @@ -23041,6 +23180,7 @@ with pkgs; ubootNovena ubootOdroidC2 ubootOdroidXU3 + ubootOlimexA64Olinuxino ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -23053,6 +23193,7 @@ with pkgs; ubootQemuAarch64 ubootQemuArm ubootQemuRiscv64Smode + ubootQemuX86 ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit @@ -23259,8 +23400,6 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cdetheme { }; - charis-sil = callPackage ../data/fonts/charis-sil { }; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; @@ -23455,6 +23594,10 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; + + graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; + greybird = callPackage ../data/themes/greybird { }; gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; @@ -23487,6 +23630,8 @@ with pkgs; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; + hannom = callPackage ../data/fonts/hannom { }; + hanazono = callPackage ../data/fonts/hanazono { }; hermit = callPackage ../data/fonts/hermit { }; @@ -23543,6 +23688,8 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -23599,6 +23746,8 @@ with pkgs; libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linux-manual = callPackage ../data/documentation/linux-manual { }; @@ -23717,8 +23866,15 @@ with pkgs; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; + nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; + inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + noto-fonts-emoji-blob-bin + noto-fonts-extra; nuclear = callPackage ../applications/audio/nuclear { }; @@ -23802,6 +23958,8 @@ with pkgs; penna = callPackage ../data/fonts/penna { }; + pitch-black = callPackage ../data/themes/pitch-black {}; + plano-theme = callPackage ../data/themes/plano { }; plata-theme = callPackage ../data/themes/plata { @@ -23837,6 +23995,8 @@ with pkgs; publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + phinger-cursors = callPackage ../data/icons/phinger-cursors { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; qogir-theme = callPackage ../data/themes/qogir { }; @@ -23877,8 +24037,6 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; - mime-types = callPackage ../data/misc/mime-types { }; - shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -23904,7 +24062,7 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; starship = callPackage ../tools/misc/starship { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security Foundation; }; stig = callPackage ../applications/networking/p2p/stig { }; @@ -23920,9 +24078,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qgo = libsForQt5.callPackage ../games/qgo { }; - - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -24010,6 +24166,8 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { }; + tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; template-glib = callPackage ../development/libraries/template-glib { }; @@ -24027,7 +24185,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -24189,7 +24347,15 @@ with pkgs; foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { }; - pdfstudio = callPackage ../applications/misc/pdfstudio { }; + pdfstudio = import ../applications/misc/pdfstudio { + program = "pdfstudio"; + inherit callPackage fetchurl libgccjit; + }; + + pdfstudioviewer = import ../applications/misc/pdfstudio { + program = "pdfstudioviewer"; + inherit callPackage fetchurl libgccjit; + }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -24218,7 +24384,7 @@ with pkgs; alock = callPackage ../misc/screensavers/alock { }; - inherit (python3Packages) alot; + alot = callPackage ../applications/networking/mailreaders/alot { }; alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; @@ -24354,6 +24520,8 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + blocky = callPackage ../applications/networking/blocky { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -24411,8 +24579,6 @@ with pkgs; backintime = backintime-qt; - ballerburg = callPackage ../games/ballerburg { } ; - balsa = callPackage ../applications/networking/mailreaders/balsa { }; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -24437,7 +24603,13 @@ with pkgs; berry = callPackage ../applications/window-managers/berry { }; - bespokesynth = callPackage ../applications/audio/bespokesynth { }; + bespokesynth = callPackage ../applications/audio/bespokesynth { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit CoreServices CoreAudioKit; + }; + + bespokesynth-with-vst2 = bespokesynth.override { + enableVST2 = true; + }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; @@ -24493,6 +24665,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix {}; + blflash = callPackage ../tools/misc/blflash { }; blogc = callPackage ../applications/misc/blogc { }; @@ -24555,7 +24729,9 @@ with pkgs; cardboard = callPackage ../applications/window-managers/cardboard { }; - cage = callPackage ../applications/window-managers/cage { }; + cage = callPackage ../applications/window-managers/cage { + wlroots = wlroots_0_14; + }; calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; @@ -24635,6 +24811,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; @@ -24687,6 +24865,8 @@ with pkgs; cmatrix = callPackage ../applications/misc/cmatrix { }; + cmctl = callPackage ../applications/networking/cluster/cmctl { }; + cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; @@ -24756,9 +24936,7 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim { - buildGoPackage = buildGo115Package; - }; + coyim = callPackage ../applications/networking/instant-messengers/coyim { }; cozy-drive = callPackage ../applications/networking/cozy-drive {}; @@ -24807,7 +24985,7 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; darktable = callPackage ../applications/graphics/darktable { - lua = lua5_3; + lua = lua5_4; pugixml = pugixml.override { shared = true; }; }; @@ -24960,7 +25138,7 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff {}; + dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { }; @@ -24974,7 +25152,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -25014,7 +25192,7 @@ with pkgs; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; - electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; + electrum-grs = libsForQt5.callPackage ../applications/misc/electrum-grs { }; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; @@ -25030,6 +25208,8 @@ with pkgs; elvis = callPackage ../applications/editors/elvis { }; + em = callPackage ../applications/editors/em { }; + emacs = emacs27; emacs-nox = emacs27-nox; @@ -25307,8 +25487,6 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; - gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -25343,19 +25521,20 @@ with pkgs; }; }; }; - gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { + gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; }; }; - gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; - # A build without gui components and other utilites not needed if gnuradio is - # used as a c++ library. - gnuradio3_8Minimal = gnuradio3_8.override { + gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio.pkgs; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradio3_9Minimal = gnuradio.override { doWrap = false; - unwrapped = gnuradio3_8.unwrapped.override { + unwrapped = gnuradio.unwrapped.override { volk = volk.override { + # So it will not reference python enableModTool = false; }; features = { @@ -25365,6 +25544,7 @@ with pkgs; gr-qtgui = false; gr-utils = false; gr-modtool = false; + gr-blocktool = false; sphinx = false; doxygen = false; # Doesn't make it reference python eventually, but makes reverse @@ -25373,31 +25553,33 @@ with pkgs; }; }; }; - gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python2; - # Incompatible with uhd4+ - uhd = uhd3_5; + python = python3; }; }; - gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs; + gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. - gnuradio3_7Minimal = gnuradio3_7.override { + gnuradio3_8Minimal = gnuradio3_8.override { doWrap = false; - unwrapped = gnuradio3_7.unwrapped.override { + unwrapped = gnuradio3_8.unwrapped.override { volk = volk.override { enableModTool = false; }; features = { gnuradio-companion = false; python-support = false; + examples = false; gr-qtgui = false; gr-utils = false; + gr-modtool = false; sphinx = false; doxygen = false; - gr-wxgui = false; + # Doesn't make it reference python eventually, but makes reverse + # depdendencies require python to use cmake files of GR. + gr-ctrlport = false; }; }; }; @@ -25458,9 +25640,7 @@ with pkgs; grip-search = callPackage ../tools/text/grip-search { }; - grip = callPackage ../applications/misc/grip { - inherit (gnome2) libgnome libgnomeui vte; - }; + grip = callPackage ../applications/misc/grip { }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -25474,6 +25654,8 @@ with pkgs; fftw = fftwSinglePrec; }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gjay = callPackage ../applications/audio/gjay { }; photivo = callPackage ../applications/graphics/photivo { }; @@ -25550,9 +25732,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25562,7 +25742,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25574,12 +25753,24 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; }; + librewolf-unwrapped = firefoxPackages.librewolf; + + librewolf = wrapFirefox librewolf-unwrapped { + inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; + libName = "librewolf"; + }; + + librewolf-wayland = librewolf.override { + forceWayland = true; + }; + + firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; + flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -25592,10 +25783,6 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; - fme = callPackage ../applications/misc/fme { - inherit (gnome2) libglademm; - }; - fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -25787,6 +25974,8 @@ with pkgs; jmusicbot = callPackage ../applications/audio/jmusicbot { }; + lemonade = callPackage ../applications/misc/lemonade { }; + libquvi = callPackage ../applications/video/quvi/library.nix { }; librespot = callPackage ../applications/audio/librespot { @@ -25915,11 +26104,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; }; - googleearth = callPackage ../applications/misc/googleearth { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -26003,13 +26190,11 @@ with pkgs; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; - heme = callPackage ../applications/editors/heme { }; - herbe = callPackage ../applications/misc/herbe { }; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26117,6 +26302,12 @@ with pkgs; musikcube = callPackage ../applications/audio/musikcube {}; + libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; + + mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; + + mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { }; + p2pool = callPackage ../applications/misc/p2pool { }; pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; @@ -26131,6 +26322,8 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -26151,8 +26344,6 @@ with pkgs; smooth = callPackage ../development/libraries/smooth { }; - smos = callPackage ../applications/misc/smos { }; - spectrwm = callPackage ../applications/window-managers/spectrwm { }; spot = callPackage ../applications/audio/spot { }; @@ -26168,14 +26359,16 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; super-productivity = callPackage ../applications/office/super-productivity { - electron = electron_13; + electron = electron_17; }; - wlroots = callPackage ../development/libraries/wlroots { + wlroots = wlroots_0_15; + wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { + inherit (xorg) xcbutilrenderutil; + }; + wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { inherit (xorg) xcbutilrenderutil; }; - - wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; @@ -26189,6 +26382,8 @@ with pkgs; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; @@ -26197,7 +26392,9 @@ with pkgs; wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { }; + hikari = callPackage ../applications/window-managers/hikari { + wlroots = wlroots_0_14; + }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; @@ -26261,7 +26458,9 @@ with pkgs; i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { }; + waybox = callPackage ../applications/window-managers/waybox { + wlroots = wlroots_0_14; + }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -26275,8 +26474,6 @@ with pkgs; icewm = callPackage ../applications/window-managers/icewm {}; - icecat-bin = callPackage ../applications/networking/browsers/icecat-bin { }; - icon-library = callPackage ../applications/graphics/icon-library { }; id3v2 = callPackage ../applications/audio/id3v2 { }; @@ -26389,9 +26586,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { }; - index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -26461,6 +26655,8 @@ with pkgs; jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; + jaeles = callPackage ../tools/security/jaeles { }; + jalv = callPackage ../applications/audio/jalv { }; jameica = callPackage ../applications/office/jameica { @@ -26495,20 +26691,9 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3d = callPackage ../applications/graphics/k3d { - inherit (gnome2) gtkglext; - stdenv = gcc6Stdenv; - boost = boost155.override { - enablePython = true; - python = python2; - stdenv = gcc6Stdenv; - buildPackages = buildPackages // { - stdenv = gcc6Stdenv; - }; - }; - }; + k3s = callPackage ../applications/networking/cluster/k3s { }; - k3s = callPackage ../applications/networking/cluster/k3s {}; + k3sup = callPackage ../applications/networking/cluster/k3sup {}; kconf = callPackage ../applications/networking/cluster/kconf { }; @@ -26549,9 +26734,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - keepnote = callPackage ../applications/office/keepnote { }; - - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26585,6 +26768,8 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; + klee = callPackage ../applications/science/logic/klee { }; + kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { }; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; @@ -26630,6 +26815,7 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; @@ -26639,13 +26825,9 @@ with pkgs; kubecolor = callPackage ../applications/networking/cluster/kubecolor { }; - kubectl = callPackage ../applications/networking/cluster/kubectl { }; - kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo115Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -26718,15 +26900,19 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; + kup = libsForQt5.callPackage ../applications/misc/kup { }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; - labwc = callPackage ../applications/window-managers/labwc { }; + labwc = callPackage ../applications/window-managers/labwc { + wlroots = wlroots_0_15; + }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -26744,8 +26930,6 @@ with pkgs; caps = callPackage ../applications/audio/caps { }; - lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; - lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; lbry = callPackage ../applications/video/lbry { }; @@ -26772,8 +26956,10 @@ with pkgs; boost = boost175; }; - libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped = libreoffice.libreoffice; + libreoffice = if stdenv.isDarwin + then callPackage ../applications/office/libreoffice/darwin.nix {} + else hiPrio libreoffice-still; + libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -26853,7 +27039,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -26902,6 +27088,8 @@ with pkgs; inherit (luajitPackages) luafilesystem; }; + lookatme = callPackage ../tools/misc/lookatme {}; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; @@ -27036,7 +27224,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27062,6 +27250,10 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + mepo = callPackage ../applications/misc/mepo { + zig = zig_0_8_1; + }; + meshcentral = callPackage ../tools/admin/meshcentral { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -27087,6 +27279,8 @@ with pkgs; minicom = callPackage ../tools/misc/minicom { }; + minigalaxy = callPackage ../applications/misc/minigalaxy { }; + minimodem = callPackage ../applications/radio/minimodem { }; minidjvu = callPackage ../applications/graphics/minidjvu { }; @@ -27101,8 +27295,6 @@ with pkgs; mimic = callPackage ../applications/audio/mimic { }; - mimms = callPackage ../applications/audio/mimms {}; - meh = callPackage ../applications/graphics/meh {}; mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; @@ -27152,8 +27344,6 @@ with pkgs; monkeysphere = callPackage ../tools/security/monkeysphere { }; - monodevelop = callPackage ../applications/editors/monodevelop {}; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; @@ -27163,7 +27353,9 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; }; - monitor = callPackage ../applications/system/monitor { }; + monitor = callPackage ../applications/system/monitor { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; @@ -27188,6 +27380,7 @@ with pkgs; mopidy-mopify mopidy-mpd mopidy-mpris + mopidy-muse mopidy-musicbox-webclient mopidy-podcast mopidy-scrobbler @@ -27206,6 +27399,8 @@ with pkgs; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -27225,7 +27420,7 @@ with pkgs; mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc_cli = callPackage ../applications/audio/mpc { + mpc-cli = callPackage ../applications/audio/mpc { inherit (python3Packages) sphinx; }; @@ -27356,8 +27551,6 @@ with pkgs; n8n = callPackage ../applications/networking/n8n {}; - neap = callPackage ../applications/misc/neap { }; - neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -27389,6 +27582,8 @@ with pkgs; nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + novnc = callPackage ../applications/networking/novnc { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; @@ -27439,6 +27634,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul { }; + pijuice = with python3Packages; toPythonApplication pijuice; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; @@ -27533,8 +27730,6 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; - synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; @@ -27673,11 +27868,9 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { - inherit (gnome2) libglade; - }; + obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -27729,9 +27922,12 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentoonz = (qt514.overrideScope' (_: _: { - libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; - })).callPackage ../applications/graphics/opentoonz { }; + opentoonz = let + opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; + in qt5.callPackage ../applications/graphics/opentoonz { + libtiff = opentoonz-libtiff; + opencv = opencv.override { libtiff = opentoonz-libtiff; }; + }; opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; @@ -27753,8 +27949,6 @@ with pkgs; osmium-tool = callPackage ../applications/misc/osmium-tool { }; - osu-lazer = callPackage ../games/osu-lazer { }; - owamp = callPackage ../applications/networking/owamp { }; vieb = callPackage ../applications/networking/browsers/vieb { }; @@ -27827,9 +28021,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -27839,7 +28033,11 @@ with pkgs; pdfslicer = callPackage ../applications/misc/pdfslicer { }; - pekwm = callPackage ../applications/window-managers/pekwm { }; + pekwm = callPackage ../applications/window-managers/pekwm { + awk = gawk; + grep = gnugrep; + sed = gnused; + }; pencil = callPackage ../applications/graphics/pencil { }; @@ -27889,6 +28087,8 @@ with pkgs; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phrase-cli = callPackage ../tools/misc/phrase-cli { }; + phraseapp-client = callPackage ../tools/misc/phraseapp-client { }; phwmon = callPackage ../applications/misc/phwmon { }; @@ -27971,6 +28171,8 @@ with pkgs; purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; + purpur = callPackage ../games/purpur { }; + pikopixel = callPackage ../applications/graphics/pikopixel { }; pithos = callPackage ../applications/audio/pithos { @@ -27981,9 +28183,7 @@ with pkgs; pinpoint = callPackage ../applications/office/pinpoint { }; - pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtk-sharp-2_0; - }; + pinta = callPackage ../applications/graphics/pinta { }; pistol = callPackage ../tools/misc/pistol { }; @@ -27993,8 +28193,7 @@ with pkgs; plexamp = callPackage ../applications/audio/plexamp { }; - # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails - plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -28014,6 +28213,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomotroid = callPackage ../applications/misc/pomotroid { + electron = electron_9; + }; + pond = callPackage ../applications/networking/instant-messengers/pond { }; ponymix = callPackage ../applications/audio/ponymix { }; @@ -28082,8 +28285,6 @@ with pkgs; pwdsafety = callPackage ../tools/security/pwdsafety { }; - pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false; @@ -28101,14 +28302,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; - python = python3; }; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { - withGrass = false; - }; + wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; + + qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; qgis = callPackage ../applications/gis/qgis { }; @@ -28214,7 +28414,7 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -28257,6 +28457,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + redux = callPackage ../applications/audio/redux { }; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; radiotray-ng = callPackage ../applications/audio/radiotray-ng { @@ -28321,7 +28523,10 @@ with pkgs; ries = callPackage ../applications/science/math/ries { }; - ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { }; + ripcord = if stdenv.isLinux then + qt5.callPackage ../applications/networking/instant-messengers/ripcord { } + else + callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -28331,6 +28536,10 @@ with pkgs; rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; + rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { }; + rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix { + rofi-unwrapped = rofi-wayland-unwrapped; + }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -28344,7 +28553,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28352,6 +28561,8 @@ with pkgs; jdk = jdk8; }; + rstudio-server = rstudio.override { server = true; }; + rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; @@ -28365,6 +28576,10 @@ with pkgs; rubyripper = callPackage ../applications/audio/rubyripper {}; + rucredstash = callPackage ../tools/security/rucredstash { + inherit (darwin.apple_sdk.frameworks) Security; + }; + runc = callPackage ../applications/virtualization/runc {}; rymcast = callPackage ../applications/audio/rymcast { @@ -28375,11 +28590,11 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; + udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28403,6 +28618,8 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seahub = callPackage ../applications/networking/seahub { }; + seatd = callPackage ../applications/misc/seatd { }; secretscanner = callPackage ../tools/security/secretscanner { }; @@ -28475,7 +28692,9 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { }; + split2flac = callPackage ../applications/audio/split2flac { + inherit (python3.pkgs) mutagen; + }; spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; @@ -28485,6 +28704,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + sptlrx = callPackage ../applications/audio/sptlrx { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; @@ -28503,7 +28724,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -28558,7 +28779,9 @@ with pkgs; ly = callPackage ../applications/display-managers/ly { }; - slic3r = callPackage ../applications/misc/slic3r { }; + slic3r = callPackage ../applications/misc/slic3r { + boost = boost172; # Building fails with Boost >1.72 due to boost/detail/endian.hpp missing + }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { @@ -28571,8 +28794,6 @@ with pkgs; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaByDagoma = callPackage ../applications/misc/curabydagoma { }; - peru = callPackage ../applications/version-management/peru {}; petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; @@ -28660,6 +28881,7 @@ with pkgs; src = callPackage ../applications/version-management/src { git = gitMinimal; + python = python3; }; sslyze = with python3Packages; toPythonApplication sslyze; @@ -28749,6 +28971,8 @@ with pkgs; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; + syncterm = callPackage ../applications/terminal-emulators/syncterm { }; + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-discovery @@ -28793,6 +29017,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talentedhack = callPackage ../applications/audio/talentedhack { }; tambura = callPackage ../applications/audio/tambura { }; @@ -28983,9 +29209,7 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { - inherit (pythonPackages) wrapPython wxPython; - }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -29149,7 +29373,7 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; vengi-tools = callPackage ../applications/graphics/vengi-tools { - inherit (darwin.apple_sdk.frameworks) Carbon OpenCL; + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices OpenCL; }; verbiste = callPackage ../applications/misc/verbiste { @@ -29197,9 +29421,7 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; - qtile = callPackage ../applications/window-managers/qtile { - inherit (xorg) libxcb; - }; + qtile = callPackage ../applications/window-managers/qtile { }; vimpc = callPackage ../applications/audio/vimpc { }; @@ -29308,9 +29530,12 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.callPackage ../applications/video/vlc {}; - - vlc_qt5 = vlc; + vlc = libsForQt5.callPackage ../applications/video/vlc { + # Newest libcaca changed the API, and libvlc didn't catch it. Until next + # version arrives, it is safer to disable it. + # Upstream thread: https://code.videolan.org/videolan/vlc/-/issues/26389 + libcaca = null; + }; libvlc = vlc.override { withQt5 = false; @@ -29359,8 +29584,9 @@ with pkgs; }; code-server = callPackage ../servers/code-server { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; inherit (darwin) cctools; + inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; @@ -29378,7 +29604,7 @@ with pkgs; wad = callPackage ../tools/security/wad { }; - wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + wafw00f = callPackage ../tools/security/wafw00f { }; whispers = callPackage ../tools/security/whispers { }; @@ -29416,7 +29642,8 @@ with pkgs; wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( - callPackage ../applications/window-managers/wayfire/applications.nix { } + (callPackage ../applications/window-managers/wayfire/applications.nix { }). + extend (_: _: { wlroots = wlroots_0_14; }) ); wayfirePlugins = recurseIntoAttrs ( callPackage ../applications/window-managers/wayfire/plugins.nix { @@ -29464,13 +29691,15 @@ with pkgs; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + weston = callPackage ../applications/window-managers/weston { }; whalebird = callPackage ../applications/misc/whalebird { electron = electron_14; }; - wio = callPackage ../applications/window-managers/wio { }; + wio = callPackage ../applications/window-managers/wio { + wlroots = wlroots_0_14; + }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -29507,6 +29736,8 @@ with pkgs; wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + cl-wordle = callPackage ../games/cl-wordle { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -29590,6 +29821,8 @@ with pkgs; gtk = gtk2; }; + xxh = with python3Packages; toPythonApplication xxh; + kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { @@ -29609,7 +29842,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -29700,11 +29933,7 @@ with pkgs; }; xiphos = callPackage ../applications/misc/xiphos { - gconf = gnome2.GConf; - inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; - python = python27; - enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { @@ -29826,8 +30055,6 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; - yarssr = callPackage ../applications/misc/yarssr { }; - yate = callPackage ../applications/misc/yate { }; ydiff = with python3.pkgs; toPythonApplication ydiff; @@ -29870,7 +30097,8 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; - zathura = callPackage ../applications/misc/zathura { }; + zathuraPkgs = callPackage ../applications/misc/zathura { }; + zathura = zathuraPkgs.zathuraWrapper; zdns = callPackage ../tools/security/zdns { }; @@ -29986,6 +30214,8 @@ with pkgs; clightning = callPackage ../applications/blockchains/clightning { }; + besu = callPackage ../applications/blockchains/besu { }; + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; withGui = true; @@ -30077,11 +30307,24 @@ with pkgs; faraday = callPackage ../applications/blockchains/faraday { }; + fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; + groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { + boost = boost17x; + withGui = true; + inherit (darwin) autoSignDarwinBinariesHook; + }; + + groestlcoind = callPackage ../applications/blockchains/groestlcoin { + boost = boost17x; + inherit (darwin) autoSignDarwinBinariesHook; + }; + ledger_agent = with python3Packages; toPythonApplication ledger_agent; ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; @@ -30117,6 +30360,8 @@ with pkgs; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; + napari = with python3Packages; toPythonApplication napari; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { boost = boost172; }; @@ -30143,6 +30388,14 @@ with pkgs; sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; }; + solana-testnet = callPackage ../applications/blockchains/solana { + inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit; + }; + + snarkos = callPackage ../applications/blockchains/snarkos { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tessera = callPackage ../applications/blockchains/tessera { }; vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { @@ -30156,27 +30409,64 @@ with pkgs; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; + wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; wownero = callPackage ../applications/blockchains/wownero { boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; openethereum = callPackage ../applications/blockchains/openethereum { }; - parity-ui = callPackage ../applications/blockchains/parity-ui { }; - polkadot = callPackage ../applications/blockchains/polkadot { }; particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; quorum = callPackage ../applications/blockchains/quorum { }; - whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; + saga = libsForQt5.callPackage ../applications/gis/saga { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + + samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; + + scaleft = callPackage ../applications/networking/scaleft { }; + + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + + beancount = with python3.pkgs; toPythonApplication beancount; + + bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; + + bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; + + cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; + + confd = callPackage ../tools/system/confd { }; + + conmon = callPackage ../applications/virtualization/conmon { }; + + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; + + drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; + + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + + eureka-editor = callPackage ../applications/misc/eureka-editor { }; + + eureka-ideas = callPackage ../applications/misc/eureka-ideas { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + fava = callPackage ../applications/office/fava {}; + + nux = callPackage ../tools/misc/nux { }; + + tts = callPackage ../tools/audio/tts { }; ### GAMES @@ -30188,6 +30478,86 @@ with pkgs; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; + ace-of-penguins = callPackage ../games/ace-of-penguins { }; + + among-sus = callPackage ../games/among-sus { }; + + antsimulator = callPackage ../games/antsimulator { }; + + augustus = callPackage ../games/augustus { }; + + ballerburg = callPackage ../games/ballerburg { } ; + + blockattack = callPackage ../games/blockattack { } ; + + colobot = callPackage ../games/colobot { }; + + doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + + enigma = callPackage ../games/enigma { }; + + ezquake = callPackage ../games/ezquake { }; + + fmodex = callPackage ../games/zandronum/fmod.nix { }; + + freedroid = callPackage ../games/freedroid { }; + + freedroidrpg = callPackage ../games/freedroidrpg { }; + + freenukum = callPackage ../games/freenukum { }; + + gnome-hexgl = callPackage ../games/gnome-hexgl { }; + + gotypist = callPackage ../games/gotypist { }; + + heroic = callPackage ../games/heroic { }; + + julius = callPackage ../games/julius { }; + + jumpnbump = callPackage ../games/jumpnbump { }; + + keeperrl = callPackage ../games/keeperrl { }; + + lbreakout2 = callPackage ../games/lbreakout2 { }; + + ltris = callPackage ../games/ltris { }; + + lunar-client = callPackage ../games/lunar-client { }; + + maelstrom = callPackage ../games/maelstrom { }; + + mar1d = callPackage ../games/mar1d { } ; + + meritous = callPackage ../games/meritous { }; + + oh-my-git = callPackage ../games/oh-my-git { }; + + opendune = callPackage ../games/opendune { }; + + openrct2 = callPackage ../games/openrct2 { }; + + osu-lazer = callPackage ../games/osu-lazer { }; + + pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; + + qgo = libsForQt5.callPackage ../games/qgo { }; + + rpg-cli = callPackage ../games/rpg-cli { }; + + runelite = callPackage ../games/runelite { }; + + runescape = callPackage ../games/runescape-launcher { }; + + sm64ex = callPackage ../games/sm64ex { }; + + snipes = callPackage ../games/snipes { }; + + unvanquished = callPackage ../games/unvanquished { }; + + xbill = callPackage ../games/xbill { }; + + xmage = callPackage ../games/xmage { }; + abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; abuse = callPackage ../games/abuse { }; @@ -30215,7 +30585,7 @@ with pkgs; amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; - andyetitmoves = callPackage ../games/andyetitmoves {}; + andyetitmoves = callPackage ../games/andyetitmoves { }; angband = callPackage ../games/angband { }; @@ -30228,7 +30598,7 @@ with pkgs; armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; - arena = callPackage ../games/arena {}; + arena = callPackage ../games/arena { }; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; @@ -30242,23 +30612,17 @@ with pkgs; astromenace = callPackage ../games/astromenace { }; - atanks = callPackage ../games/atanks {}; + atanks = callPackage ../games/atanks { }; - azimuth = callPackage ../games/azimuth {}; + azimuth = callPackage ../games/azimuth { }; ballAndPaddle = callPackage ../games/ball-and-paddle { guile = guile_1_8; }; - banner = callPackage ../games/banner {}; - - bastet = callPackage ../games/bastet {}; - - beancount = with python3.pkgs; toPythonApplication beancount; - - bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; + banner = callPackage ../games/banner { }; - bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; + bastet = callPackage ../games/bastet { }; black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; @@ -30316,19 +30680,12 @@ with pkgs; vintagestory = callPackage ../games/vintagestory { }; - cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; - cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; - ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { }; commandergenius = callPackage ../games/commandergenius { }; - confd = callPackage ../tools/system/confd { }; - - conmon = callPackage ../applications/virtualization/conmon { }; - construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; @@ -30341,8 +30698,6 @@ with pkgs; crack_attack = callPackage ../games/crack-attack { }; - crafty = callPackage ../games/crafty { }; - crawlTiles = callPackage ../games/crawl { tileMode = true; }; @@ -30352,12 +30707,12 @@ with pkgs; inherit (import ../games/crossfire pkgs) crossfire-server crossfire-arch crossfire-maps crossfire-client; - crrcsim = callPackage ../games/crrcsim {}; + crrcsim = callPackage ../games/crrcsim { }; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; - cutemaze = libsForQt5.callPackage ../games/cutemaze {}; + cutemaze = libsForQt5.callPackage ../games/cutemaze { }; cuyo = callPackage ../games/cuyo { }; @@ -30372,16 +30727,10 @@ with pkgs; }; }; - dhewm3 = callPackage ../games/dhewm3 {}; - - digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; - - displaycal = callPackage ../applications/graphics/displaycal {}; + dhewm3 = callPackage ../games/dhewm3 { }; domination = callPackage ../games/domination { }; - drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); @@ -30426,18 +30775,16 @@ with pkgs; eternity = callPackage ../games/eternity-engine { }; - eureka-editor = callPackage ../applications/misc/eureka-editor { }; - - eureka-ideas = callPackage ../applications/misc/eureka-ideas { - inherit (darwin.apple_sdk.frameworks) Security; - }; - extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; exult = callPackage ../games/exult { }; + flare = callPackage ../games/flare { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + fltrator = callPackage ../games/fltrator { fltk = fltk-minimal; }; @@ -30456,13 +30803,11 @@ with pkgs; factorio-utils = callPackage ../games/factorio/utils.nix { }; - fairymax = callPackage ../games/fairymax {}; - - fava = callPackage ../applications/office/fava {}; + fairymax = callPackage ../games/fairymax { }; - fheroes2 = callPackage ../games/fheroes2 {}; + fheroes2 = callPackage ../games/fheroes2 { }; - fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; fishfight = callPackage ../games/fishfight { inherit (xorg) libX11 libXi; @@ -30508,8 +30853,6 @@ with pkgs; }; }; - fslint = callPackage ../applications/misc/fslint {}; - galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -30528,9 +30871,9 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - gimx = callPackage ../games/gimx {}; + gimx = callPackage ../games/gimx { }; - gl117 = callPackage ../games/gl-117 {}; + gl117 = callPackage ../games/gl-117 { }; globulation2 = callPackage ../games/globulation { boost = boost155; @@ -30556,30 +30899,30 @@ with pkgs; gnushogi = callPackage ../games/gnushogi { }; - gogui = callPackage ../games/gogui {}; + gogui = callPackage ../games/gogui { }; - gscrabble = python3Packages.callPackage ../games/gscrabble {}; + gscrabble = python3Packages.callPackage ../games/gscrabble { }; - gshogi = python3Packages.callPackage ../games/gshogi {}; - - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + gshogi = python3Packages.callPackage ../games/gshogi { }; qtads = qt5.callPackage ../games/qtads { }; + grapejuice = callPackage ../games/grapejuice { + wine = wineWowPackages.unstable; + }; + gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled {}; + gweled = callPackage ../games/gweled { }; gzdoom = callPackage ../games/gzdoom { }; harmonist = callPackage ../games/harmonist { }; - hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -30620,7 +30963,7 @@ with pkgs; enableGPU = false; }; - klavaro = callPackage ../games/klavaro {}; + klavaro = callPackage ../games/klavaro { }; kobodeluxe = callPackage ../games/kobodeluxe { }; @@ -30642,7 +30985,7 @@ with pkgs; liberation-circuit = callPackage ../games/liberation-circuit { }; - lincity = callPackage ../games/lincity {}; + lincity = callPackage ../games/lincity { }; lincity_ng = callPackage ../games/lincity/ng.nix { # https://github.com/lincity-ng/lincity-ng/issues/25 @@ -30656,7 +30999,7 @@ with pkgs; liquidwar5 = callPackage ../games/liquidwar/5.nix { }; - lugaru = callPackage ../games/lugaru {}; + lugaru = callPackage ../games/lugaru { }; macopix = callPackage ../games/macopix { gtk = gtk2; @@ -30668,7 +31011,7 @@ with pkgs; mars = callPackage ../games/mars { }; - megaglest = callPackage ../games/megaglest {}; + megaglest = callPackage ../games/megaglest { }; methane = callPackage ../games/methane { }; @@ -30688,20 +31031,20 @@ with pkgs; minecraft = callPackage ../games/minecraft { }; - minecraft-server = callPackage ../games/minecraft-server { }; - - moon-buggy = callPackage ../games/moon-buggy {}; + minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; + minecraft-server = minecraftServers.vanilla; # backwards compatibility - multimc = libsForQt5.callPackage ../games/multimc { }; + moon-buggy = callPackage ../games/moon-buggy { }; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) - minetestclient_4 minetestserver_4 minetestclient_5 minetestserver_5; - minetest = minetestclient_5; + minetest = minetestclient; + minetestclient = minetestclient_5; + minetestserver = minetestserver_5; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -30713,6 +31056,10 @@ with pkgs; lua = lua5_1; }; + blightmud = callPackage ../games/blightmud { }; + + blightmud-tts = callPackage ../games/blightmud { withTTS = true; }; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -30734,15 +31081,14 @@ with pkgs; nexuiz = callPackage ../games/nexuiz { }; - nux = callPackage ../tools/misc/nux { }; - ninvaders = callPackage ../games/ninvaders { }; njam = callPackage ../games/njam { }; - newtonwars = callPackage ../games/newtonwars { }; + npush = callPackage ../games/npush { }; + run-npush = callPackage ../games/npush/run.nix { }; - nottetris2 = callPackage ../games/nottetris2 { }; + newtonwars = callPackage ../games/newtonwars { }; nudoku = callPackage ../games/nudoku { }; @@ -30772,10 +31118,14 @@ with pkgs; portmod = callPackage ../games/portmod { }; + tetrio-desktop = callPackage ../games/tetrio-desktop { }; + tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { }; + otto-matic = callPackage ../games/otto-matic { }; + openraPackages = import ../games/openra pkgs; openra = openraPackages.engines.release; @@ -30798,8 +31148,8 @@ with pkgs; static = true; }; }; - openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; - openttd-nml = callPackage ../games/openttd/nml.nix {}; + openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; + openttd-nml = callPackage ../games/openttd/nml.nix { }; opentyrian = callPackage ../games/opentyrian { }; @@ -30821,7 +31171,7 @@ with pkgs; pinball = callPackage ../games/pinball { }; - pingus = callPackage ../games/pingus {}; + pingus = callPackage ../games/pingus { }; pioneer = callPackage ../games/pioneer { }; @@ -30829,11 +31179,18 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; + polymc = libsForQt5.callPackage ../games/polymc { }; + pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + }; - pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + pokerth-server = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + target = "server"; + }; powermanga = callPackage ../games/powermanga { }; @@ -30865,7 +31222,7 @@ with pkgs; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; - quantumminigolf = callPackage ../games/quantumminigolf {}; + quantumminigolf = callPackage ../games/quantumminigolf { }; r2mod_cli = callPackage ../games/r2mod_cli { }; @@ -30892,8 +31249,6 @@ with pkgs; rili = callPackage ../games/rili { }; - rimshot = callPackage ../games/rimshot { love = love_0_7; }; - rogue = callPackage ../games/rogue { ncurses = ncurses5; }; @@ -30910,17 +31265,13 @@ with pkgs; rrootage = callPackage ../games/rrootage { }; - saga = libsForQt5.callPackage ../applications/gis/saga { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; - - sauerbraten = callPackage ../games/sauerbraten {}; + space-cadet-pinball = callPackage ../games/space-cadet-pinball { }; - scaleft = callPackage ../applications/networking/scaleft { }; + starsector = callPackage ../games/starsector { + openjdk = openjdk8; + }; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + sauerbraten = callPackage ../games/sauerbraten { }; scid = callPackage ../games/scid { tcl = tcl-8_5; @@ -30993,7 +31344,7 @@ with pkgs; ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; - stardust = callPackage ../games/stardust {}; + stardust = callPackage ../games/stardust { }; starspace = callPackage ../applications/science/machine-learning/starspace { }; @@ -31045,6 +31396,8 @@ with pkgs; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; + snis = callPackage ../games/snis { }; + system-syzygy = callPackage ../games/system-syzygy { }; t4kcommon = callPackage ../games/t4kcommon { }; @@ -31053,6 +31406,8 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; + the-legend-of-edgar = callPackage ../games/the-legend-of-edgar { }; + the-powder-toy = callPackage ../games/the-powder-toy { lua = lua5_1; }; @@ -31079,8 +31434,6 @@ with pkgs; tinyfugue = callPackage ../games/tinyfugue { }; - tockloader = callPackage ../development/tools/misc/tockloader { }; - tome2 = callPackage ../games/tome2 { }; tome4 = callPackage ../games/tome4 { }; @@ -31093,14 +31446,14 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; - tts = callPackage ../tools/audio/tts { }; - tumiki-fighters = callPackage ../games/tumiki-fighters { }; tuxpaint = callPackage ../games/tuxpaint { }; tuxtype = callPackage ../games/tuxtype { }; + tworld2 = callPackage ../games/tworld2 { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC @@ -31113,9 +31466,7 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; - uchess = callPackage ../games/uchess { - buildGoModule = buildGo116Module; - }; + uchess = callPackage ../games/uchess { }; udig = callPackage ../applications/gis/udig { }; @@ -31147,16 +31498,6 @@ with pkgs; ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; - vapor = callPackage ../games/vapor { love = love_0_8; }; - - vapoursynth = callPackage ../development/libraries/vapoursynth { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - - vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; - - vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; - vassal = callPackage ../games/vassal { }; vdrift = callPackage ../games/vdrift { }; @@ -31235,8 +31576,8 @@ with pkgs; xpilot-ng = callPackage ../games/xpilot { }; - bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {}; - bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {}; + bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; + bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; xskat = callPackage ../games/xskat { }; @@ -31285,6 +31626,12 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + _7kaa = callPackage ../games/7kaa { }; + + hhexen = callPackage ../games/hhexen { }; + + wyvern = callPackage ../games/wyvern { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -31314,8 +31661,6 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - hhexen = callPackage ../games/hhexen { }; - hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; @@ -31336,6 +31681,8 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; inherit (callPackages ../applications/misc/redshift { @@ -31535,8 +31882,6 @@ with pkgs; last = callPackage ../applications/science/biology/last { }; - lumpy = callPackage ../applications/science/biology/lumpy { }; - macse = callPackage ../applications/science/biology/macse { }; MACS2 = callPackage ../applications/science/biology/MACS2 { }; @@ -31561,7 +31906,7 @@ with pkgs; useMpi = true; }); - neuron-full = neuron-mpi.override { inherit python; }; + neuron-full = neuron-mpi.override { python = python2; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -31657,6 +32002,8 @@ with pkgs; whisper = callPackage ../applications/science/biology/whisper { }; + xenomapper = callPackage ../applications/science/biology/xenomapper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; @@ -31797,6 +32144,8 @@ with pkgs; sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; }; + sagetex = callPackage ../misc/sagetex { }; + subread = callPackage ../applications/science/biology/subread { }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; @@ -31812,6 +32161,10 @@ with pkgs; sympow = callPackage ../development/libraries/science/math/sympow { }; + trilinos = callPackage ../development/libraries/science/math/trilinos {}; + + trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; @@ -31882,6 +32235,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + shtns = callPackage ../applications/science/physics/shtns { }; + xfitter = callPackage ../applications/science/physics/xfitter {}; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -31935,7 +32290,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -31957,6 +32312,10 @@ with pkgs; eprover = callPackage ../applications/science/logic/eprover { }; + eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; }; + + formula = callPackage ../applications/science/logic/formula { }; + gappa = callPackage ../applications/science/logic/gappa { }; gfan = callPackage ../applications/science/math/gfan {}; @@ -31990,7 +32349,7 @@ with pkgs; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = openjdk11; + java = openjdk17; z3 = z3_4_4_0; }; @@ -32178,6 +32537,12 @@ with pkgs; xoscope = callPackage ../applications/science/electronics/xoscope { }; + xyce = callPackage ../applications/science/electronics/xyce { }; + + xyce-parallel = callPackage ../applications/science/electronics/xyce { + withMPI = true; + trilinos = trilinos-mpi; + }; ### SCIENCE / MATH @@ -32355,9 +32720,7 @@ with pkgs; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; - tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake_2_8; - }; + tulip = libsForQt5.callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; @@ -32440,11 +32803,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32458,7 +32821,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32480,7 +32843,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32521,6 +32884,8 @@ with pkgs; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; + epson-201401w = callPackage ../misc/drivers/epson-201401w { }; + epson-201106w = callPackage ../misc/drivers/epson-201106w { }; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; @@ -32556,13 +32921,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32578,13 +32943,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - demjson = with python3Packages; toPythonApplication demjson; - - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32596,7 +32959,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32606,7 +32969,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32640,7 +33003,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32656,7 +33019,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -32665,7 +33028,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -32691,9 +33054,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -32707,14 +33070,12 @@ with pkgs; velero = callPackage ../applications/networking/cluster/velero { }; + HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; + hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; - hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - - hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; - hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -32741,9 +33102,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima {}; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima {}; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -32806,7 +33167,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -32814,7 +33175,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -32834,7 +33195,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -32842,21 +33203,19 @@ with pkgs; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mysides = callPackage ../os-specific/darwin/mysides { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; neo = callPackage ../applications/misc/neo { }; - inherit (callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; - }) - nix - nixStable - nix_2_3 - nix_2_4 - nix_2_5 - nixUnstable; + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + }); + + nix = nixVersions.stable; nixStatic = pkgsStatic.nix; @@ -32938,6 +33297,20 @@ with pkgs; in c.config.system.build // c; + /* + A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. + */ + pkgsModule = { lib, options, ... }: { + config = + if options?nixpkgs.pkgs then { + # legacy / nixpkgs.nix style + nixpkgs.pkgs = pkgs; + } + else { + # minimal + _module.args.pkgs = pkgs; + }; + }; /* * Run a NixOS VM network test using this evaluation of Nixpkgs. @@ -33029,7 +33402,7 @@ with pkgs; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); - nixos-option = callPackage ../tools/nix/nixos-option { nix = nix_2_3; }; + nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -33054,7 +33427,7 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; nix-top = callPackage ../tools/package-management/nix-top { }; @@ -33074,6 +33447,8 @@ with pkgs; nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + alejandra = callPackage ../tools/nix/alejandra { }; + nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -33105,7 +33480,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; + inherit (python2Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; @@ -33157,7 +33532,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33187,13 +33562,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33203,13 +33578,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher { - inherit (python3Packages) pyqt5 setuptools requests; - }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33235,26 +33608,29 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; retroarch = wrapRetroArch { retroarch = retroarchBare; }; retroarchFull = retroarch.override { - cores = builtins.filter (c: c ? libretroCore) (builtins.attrValues libretro); + cores = builtins.filter + # Remove cores not supported on platform + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) + (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33266,6 +33642,8 @@ with pkgs; ricty = callPackage ../data/fonts/ricty { }; + rmfakecloud = callPackage ../servers/rmfakecloud { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; rmount = callPackage ../tools/filesystems/rmount {}; @@ -33436,7 +33814,6 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_12 terraform_0_13 terraform_0_14 terraform_0_15 @@ -33449,7 +33826,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers {} + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -33470,7 +33847,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt {}; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -33489,8 +33866,12 @@ with pkgs; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; + vcluster = callPackage ../applications/networking/cluster/vcluster {}; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; + sshportal = callPackage ../servers/sshportal { }; + ssh-audit = callPackage ../tools/security/ssh-audit { }; ssh-tools = callPackage ../applications/misc/ssh-tools { }; @@ -33558,11 +33939,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -33644,7 +34025,7 @@ with pkgs; inherit wineBuild; inherit (callPackage ./wine-packages.nix {}) - minimal base full stable stableFull unstable unstableFull staging stagingFull fonts; + minimal base full stable stableFull unstable unstableFull staging stagingFull wayland waylandFull fonts; }); winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); @@ -33658,7 +34039,11 @@ with pkgs; wineRelease = "staging"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + wine-wayland = lowPrio (winePackages.full.override { + wineRelease = "wayland"; + }); + + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -33676,11 +34061,7 @@ with pkgs; wprecon = callPackage ../tools/security/wprecon { }; - wraith = callPackage ../applications/networking/irc/wraith { - openssl = openssl_1_0_2; - }; - - wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; @@ -33692,8 +34073,6 @@ with pkgs; wxGTK = wxGTK30; }; - wyvern = callPackage ../games/wyvern { }; - x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -33754,7 +34133,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -33777,11 +34156,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -33804,36 +34183,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; - }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; }; @@ -33863,17 +34240,17 @@ with pkgs; discord = import ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-ptb = import ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs; + inherit pkgs lib stdenv; }; discord-canary = import ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs; + inherit pkgs lib stdenv; }; golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; @@ -33882,8 +34259,6 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { }; - imatix_gsl = callPackage ../development/tools/imatix_gsl {}; sccache = callPackage ../development/tools/misc/sccache { @@ -33914,6 +34289,8 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; + pynitrokey = callPackage ../tools/security/pynitrokey { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; @@ -34104,7 +34481,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf {}; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34122,7 +34499,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; @@ -34132,6 +34509,8 @@ with pkgs; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; @@ -34150,7 +34529,7 @@ with pkgs; jami-daemon jami-libclient jami-client-gnome jami-client-qt; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { - electron = electron_13; + electron = electron_16; }; zenstates = callPackage ../os-specific/linux/zenstates {}; @@ -34179,7 +34558,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; - cagebreak = callPackage ../applications/window-managers/cagebreak { }; + cagebreak = callPackage ../applications/window-managers/cagebreak { + wlroots = wlroots_0_14; + }; psftools = callPackage ../os-specific/linux/psftools {}; @@ -34191,7 +34572,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; @@ -34202,4 +34583,10 @@ with pkgs; }; zthrottle = callPackage ../tools/misc/zthrottle { }; + + honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { }; + + honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; + + honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 704457453779f..c1a29b60306f0 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -96,9 +96,7 @@ let topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST { - compcert = self.compcert.override { version = "3.9"; }; - }; + VST = callPackage ../development/coq-modules/VST {}; zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2e031e27307a8..d6ee88bc4f5e0 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -148,14 +148,14 @@ impure-cmds // appleSourcePackages // chooseLibs // { lsusb = callPackage ../os-specific/darwin/lsusb { }; + moltenvk = callPackage ../os-specific/darwin/moltenvk { }; + opencflite = callPackage ../os-specific/darwin/opencflite { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; trash = callPackage ../os-specific/darwin/trash { }; - usr-include = callPackage ../os-specific/darwin/usr-include { }; - xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { }; inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 10cf36d4d13e5..e95a0db78c3cc 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,6 +49,15 @@ let # Rename the function arguments in let lib = import ../../lib; + inherit (lib) throwIfNot; + + checked = + throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." + lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays + throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list." + lib.foldr (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") (r: r) crossOverlays + ; + localSystem = lib.systems.elaborate args.localSystem; # Condition preserves sharing which in turn affects equality. @@ -121,4 +130,4 @@ in let pkgs = boot stages; -in pkgs +in checked pkgs diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d291c1e830cda..1cd2c93da773d 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -14,16 +14,20 @@ let }; mkDerivation = mkDerivationWith stdenv.mkDerivation; - callPackage = self.newScope { + callPackage = self.newScope ({ inherit (gnuradio) # Packages that are potentially overriden and used as deps here. boost - uhd volk ; inherit mkDerivationWith mkDerivation; - }; - + } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { + inherit (gnuradio) uhd; + } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { + inherit (gnuradio) spdlog; + } else { + inherit (gnuradio) log4cpp; + })); in { inherit callPackage mkDerivation mkDerivationWith; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 089450ef97d5b..378c2c4385bd3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -12,14 +12,18 @@ let "ghcjs810" "integer-simple" "native-bignum" + "ghc902" + "ghc921" "ghcHEAD" ]; nativeBignumIncludes = [ + "ghc902" + "ghc921" "ghcHEAD" ]; - haskellLibUncomposable = import ../development/haskell-modules/lib.nix { + haskellLibUncomposable = import ../development/haskell-modules/lib { inherit (pkgs) lib; inherit pkgs; }; @@ -101,7 +105,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra # the oldest ghc with aarch64-darwin support is 8.10.5 @@ -110,9 +114,9 @@ in { else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; - inherit (buildPackages.darwin) autoSignDarwinBinariesHook; - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; + inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; }; ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { bootPkgs = @@ -215,9 +219,9 @@ in { ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; - ghc901 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc901; - ghc = bh.compiler.ghc901; + ghc902 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc902; + ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; ghc921 = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index cf6474f0da5b9..c8d9e85fbd77b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,9 +8,10 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; in { - inherit mavenbuild fetchMaven openjfx11 openjfx15; + inherit mavenbuild fetchMaven openjfx11 openjfx15 openjfx17; compiler = let @@ -170,7 +171,7 @@ in { ../development/compilers/openjdk/darwin/17.nix { inherit openjdk17-bootstrap; - openjfx = openjfx15; + openjfx = openjfx17; }; }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index ed5799eab4f70..6771ffe65b1d5 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -1,4 +1,4 @@ -{ lib, newScope, kodi, libretro }: +{ config, lib, newScope, kodi, libretro }: with lib; @@ -52,25 +52,9 @@ let self = rec { a4ksubtitles = callPackage ../applications/video/kodi/addons/a4ksubtitles { }; - controllers = { - default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; }; + arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { }; - dreamcast = callPackage ../applications/video/kodi/addons/controllers { controller = "dreamcast"; }; - - gba = callPackage ../applications/video/kodi/addons/controllers { controller = "gba"; }; - - genesis = callPackage ../applications/video/kodi/addons/controllers { controller = "genesis"; }; - - mouse = callPackage ../applications/video/kodi/addons/controllers { controller = "mouse"; }; - - n64 = callPackage ../applications/video/kodi/addons/controllers { controller = "n64"; }; - - nes = callPackage ../applications/video/kodi/addons/controllers { controller = "nes"; }; - - ps = callPackage ../applications/video/kodi/addons/controllers { controller = "ps"; }; - - snes = callPackage ../applications/video/kodi/addons/controllers { controller = "snes"; }; - }; + controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; iagl = callPackage ../applications/video/kodi/addons/iagl { }; @@ -90,6 +74,8 @@ let self = rec { netflix = callPackage ../applications/video/kodi/addons/netflix { }; + orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; @@ -126,6 +112,8 @@ let self = rec { defusedxml = callPackage ../applications/video/kodi/addons/defusedxml { }; + future = callPackage ../applications/video/kodi/addons/future { }; + idna = callPackage ../applications/video/kodi/addons/idna { }; inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; @@ -148,10 +136,25 @@ let self = rec { signals = callPackage ../applications/video/kodi/addons/signals { }; + simplejson = callPackage ../applications/video/kodi/addons/simplejson { }; + six = callPackage ../applications/video/kodi/addons/six { }; urllib3 = callPackage ../applications/video/kodi/addons/urllib3 { }; websocket = callPackage ../applications/video/kodi/addons/websocket { }; -}; in self + xbmcswift2 = callPackage ../applications/video/kodi/addons/xbmcswift2 { }; + + typing_extensions = callPackage ../applications/video/kodi/addons/typing_extensions { }; + + arrow = callPackage ../applications/video/kodi/addons/arrow { }; + + trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { }; + + trakt = callPackage ../applications/video/kodi/addons/trakt { }; +}; in self // lib.optionalAttrs (config.allowAliases or true) { + # deprecated or renamed packages + + controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5adb2cc17364d..d9a96164c6aa3 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,6 +166,13 @@ in { ]; }; + linux_5_16 = callPackage ../os-specific/linux/kernel/linux-5.16.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -248,7 +255,15 @@ in { akvcam = callPackage ../os-specific/linux/akvcam { }; - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { + libffi = pkgs.libffi.overrideAttrs (orig: rec { + version = "3.3"; + src = fetchurl { + url = "https://github.com/libffi/libffi/releases/download/v${version}/${orig.pname}-${version}.tar.gz"; + sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"; + }; + }); + }; anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; @@ -273,6 +288,8 @@ in { dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; + dpdk = pkgs.dpdk.override { inherit kernel; }; + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; @@ -333,6 +350,8 @@ in { rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; + rtl8189es = callPackage ../os-specific/linux/rtl8189es { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; @@ -352,7 +371,7 @@ in { rtw88 = callPackage ../os-specific/linux/rtw88 { }; rtlwifi_new = rtw88; - rtw89 = callPackage ../os-specific/linux/rtw89 { }; + rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; @@ -419,7 +438,9 @@ in { veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + vhba = callPackage ../applications/emulators/cdemu/vhba.nix { }; + + virtio_vmmci = callPackage ../os-specific/linux/virtio_vmmci { }; virtualbox = callPackage ../os-specific/linux/virtualbox { virtualbox = pkgs.virtualboxHardened; @@ -431,6 +452,8 @@ in { vm-tools = callPackage ../os-specific/linux/vm-tools { }; + vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; @@ -464,6 +487,7 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); + linux_5_16 = recurseIntoAttrs (packagesFor kernels.linux_5_16); }; rtPackages = { @@ -508,7 +532,7 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_15; + linux_latest = packages.linux_5_16; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c5a5a43769998..a634322364714 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { header "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index fa78e6ed9aa93..e808ebef8540d 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -30,6 +30,8 @@ lib.makeScope newScope (self: jsonschema = callPackage ../development/nim-packages/jsonschema { }; + jsony = callPackage ../development/nim-packages/jsony { }; + karax = callPackage ../development/nim-packages/karax { }; lscolors = callPackage ../development/nim-packages/lscolors { }; @@ -77,8 +79,6 @@ lib.makeScope newScope (self: tempfile = callPackage ../development/nim-packages/tempfile { }; - typography = callPackage ../development/nim-packages/typography { }; - ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; unicodedb = callPackage ../development/nim-packages/unicodedb { }; diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 758c8bf06c367..28f8cf3329774 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -19,27 +19,53 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } exit 1 fi - # Make sure that derivation paths do not depend on the Nixpkgs path. - mkdir $TMPDIR/foo - ln -s $(readlink -f $src) $TMPDIR/foo/bar - p1=$(nix-instantiate $src --dry-run -A firefox --show-trace) - p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) - if [ "$p1" != "$p2" ]; then - echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" - exit 1 - fi + src2=$TMPDIR/foo + cp -rd $src $src2 # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do header "checking Nixpkgs on $platform" - nix-env -f $src \ + # To get a call trace; see https://nixos.org/manual/nixpkgs/stable/#function-library-lib.trivial.warn + # Relies on impure eval + export NIX_ABORT_ON_WARN=true + + set +e + ( + set -x + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ + --option experimental-features 'no-url-literals' \ + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2> eval-warnings.log > packages1 + ) + rc=$? + set -e + if [ "$rc" != "0" ]; then + cat eval-warnings.log + exit $rc + fi + + s1=$(sha1sum packages1 | cut -c1-40) + echo $s1 + + nix-env -f $src2 \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; }' \ --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system \ - "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log + "''${opts[@]}" > packages2 + + s2=$(sha1sum packages2 | cut -c1-40) + + if [[ $s1 != $s2 ]]; then + echo "Nixpkgs evaluation depends on Nixpkgs path" + diff packages1 packages2 + exit 1 + fi + # Catch any trace calls not caught by NIX_ABORT_ON_WARN (lib.warn) if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" exit 1 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aed6268686514..fe7fd7d856ae5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -81,6 +81,7 @@ let bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { }; + bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { }; bolt = callPackage ../development/ocaml-modules/bolt { }; @@ -139,7 +140,9 @@ let ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; callipyge = callPackage ../development/ocaml-modules/callipyge { }; @@ -254,6 +257,8 @@ let data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; + dbf = callPackage ../development/ocaml-modules/dbf { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; diet = callPackage ../development/ocaml-modules/diet { }; @@ -305,6 +310,8 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; @@ -511,8 +518,6 @@ let graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; - gtktop = callPackage ../development/ocaml-modules/gtktop { }; - hex = callPackage ../development/ocaml-modules/hex { }; httpaf = callPackage ../development/ocaml-modules/httpaf { }; @@ -598,10 +603,10 @@ let lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; + inherit (pkgs.gnome2) libgnomecanvas gtksourceview; }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { - inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; + inherit (pkgs.gnome2) libgnomecanvas gtksourceview; }; lablgtk-extras = @@ -908,6 +913,8 @@ let ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { }; + ocaml-recovery-parser = callPackage ../development/tools/ocaml/ocaml-recovery-parser { }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; @@ -1052,8 +1059,6 @@ let ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; - ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; - ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; @@ -1176,6 +1181,8 @@ let printbox = callPackage ../development/ocaml-modules/printbox { }; + printbox-text = callPackage ../development/ocaml-modules/printbox/text.nix { }; + process = callPackage ../development/ocaml-modules/process { }; prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; @@ -1279,18 +1286,25 @@ let tcslib = callPackage ../development/ocaml-modules/tcslib { }; + terminal = callPackage ../development/ocaml-modules/terminal { }; + terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { }; + tezos-011-PtHangz2-test-helpers = callPackage ../development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix { }; tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; + tezos-base-test-helpers = callPackage ../development/ocaml-modules/tezos/base-test-helpers.nix { }; tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; tezos-client-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/client-010-PtGRANAD.nix { }; + tezos-client-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/client-011-PtHangz2.nix { }; tezos-client-base = callPackage ../development/ocaml-modules/tezos/client-base.nix { }; tezos-context = callPackage ../development/ocaml-modules/tezos/context.nix { }; tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; tezos-embedded-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix { }; + tezos-embedded-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix { }; tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; + tezos-event-logging-test-helpers = callPackage ../development/ocaml-modules/tezos/event-logging-test-helpers.nix { }; tezos-legacy-store = callPackage ../development/ocaml-modules/tezos/legacy-store.nix { }; tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; tezos-hacl-glue = callPackage ../development/ocaml-modules/tezos/hacl-glue.nix { }; @@ -1301,14 +1315,20 @@ let tezos-mockup-registration = callPackage ../development/ocaml-modules/tezos/mockup-registration.nix { }; tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; - tezos-protocol-010-PtGRANAD-parameters = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix { }; tezos-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix { }; + tezos-protocol-010-PtGRANAD-parameters = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix { }; + tezos-protocol-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/protocol-011-PtHangz2.nix { }; + tezos-protocol-011-PtHangz2-parameters = callPackage ../development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix { }; + tezos-protocol-alpha = callPackage ../development/ocaml-modules/tezos/protocol-alpha.nix { }; tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; + tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; tezos-protocol-plugin-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix { }; + tezos-protocol-plugin-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix { }; + tezos-protocol-plugin-alpha = callPackage ../development/ocaml-modules/tezos/protocol-plugin-alpha.nix { }; tezos-protocol-updater = callPackage ../development/ocaml-modules/tezos/protocol-updater.nix { }; tezos-proxy = callPackage ../development/ocaml-modules/tezos/proxy.nix { }; tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; @@ -1319,6 +1339,7 @@ let tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; tezos-shell-context = callPackage ../development/ocaml-modules/tezos/shell-context.nix { }; tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; + tezos-shell-services-test-helpers = callPackage ../development/ocaml-modules/tezos/shell-services-test-helpers.nix { }; tezos-shell = callPackage ../development/ocaml-modules/tezos/shell.nix { }; tezos-signer-backends = callPackage ../development/ocaml-modules/tezos/signer-backends.nix { }; tezos-signer-services = callPackage ../development/ocaml-modules/tezos/signer-services.nix { }; @@ -1326,7 +1347,6 @@ let tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; tezos-test-helpers = callPackage ../development/ocaml-modules/tezos/test-helpers.nix { }; tezos-store = callPackage ../development/ocaml-modules/tezos/store.nix { }; - tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; tezos-validation = callPackage ../development/ocaml-modules/tezos/validation.nix { }; tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; @@ -1370,6 +1390,8 @@ let vchan = callPackage ../development/ocaml-modules/vchan { }; + vector = callPackage ../development/ocaml-modules/vector { }; + vg = callPackage ../development/ocaml-modules/vg { }; vlq = callPackage ../development/ocaml-modules/vlq { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 1602eaf9f45f2..c33f8b2dc2aab 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -13,7 +13,6 @@ fdbPackages fusePackages gns3Packages - haskellPackages idrisPackages nodePackages nodePackages_latest @@ -31,6 +30,15 @@ zeroadPackages ; + haskellPackages = super.haskellPackages // { + # mesos, which this depends on, has been removed from nixpkgs. We are keeping + # the error message for now, so users will get an error message they can make + # sense of, but need to work around it here. + # TODO(@sternenseemann): remove this after branch-off of 22.05, along with the + # override in configuration-nix.nix + hs-mesos = null; + }; + # Make sure haskell.compiler is included, so alternative GHC versions show up, # but don't add haskell.packages.* since they contain the same packages (at # least by name) as haskellPackages. diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f24f8defb9545..2212d4b5da0ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -729,11 +729,20 @@ let Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; - version = "1.7044"; + version = "1.7045"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz"; - sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz"; + sha256 = "1779w07zxlgfk35s24ksr7k9azd5yl8sbb48y1aaph7y4gf4lkmc"; }; + # Use TLS endpoints for downloads and metadata by default + preConfigure = '' + substituteInPlace bin/cpanm \ + --replace http://www.cpan.org https://www.cpan.org \ + --replace http://backpan.perl.org https://backpan.perl.org \ + --replace http://fastapi.metacpan.org https://fastapi.metacpan.org \ + --replace http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org + ''; + propagatedBuildInputs = [ IOSocketSSL ]; meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; @@ -793,7 +802,7 @@ let rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { - homepage = "http://www.chordpro.org"; + homepage = "https://www.chordpro.org"; description = "A lyrics and chords formatting program"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3674,7 +3683,7 @@ let }; }; - ConfigIniFiles = buildPerlModule { + ConfigIniFiles = buildPerlPackage { pname = "Config-IniFiles"; version = "3.000003"; src = fetchurl { @@ -4043,12 +4052,12 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.28"; + version = "2.29"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz"; - sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz"; + sha256 = "1f55672efd505a9baacfa1924d115362120aa6bf8efab7a17c7cb090b17ccc41"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -4121,10 +4130,10 @@ let CPANChecksums = buildPerlPackage { pname = "CPAN-Checksums"; - version = "2.12"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz"; - sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.14.tar.gz"; + sha256 = "4080716c5da7e03b504e3cc0ea1fd5ef9ed6915f6fb737564e9e13d355a89e39"; }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; meta = { @@ -9676,21 +9685,6 @@ let propagatedBuildInputs = [ Pango ]; }; - Gtk2GladeXML = buildPerlPackage { - pname = "Gtk2-GladeXML"; - version = "1.007"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz"; - sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; - }; - propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; - meta = { - description = "Create user interfaces directly from Glade XML files"; - license = lib.licenses.lgpl2Plus; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin - }; - }; - Gtk2TrayIcon = buildPerlPackage { pname = "Gtk2-TrayIcon"; version = "0.06"; @@ -9950,6 +9944,21 @@ let }; }; + HashStoredIterator = buildPerlModule { + pname = "Hash-StoredIterator"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Hash-StoredIterator-0.008.tar.gz"; + sha256 = "b9cbc4dcd8233e8d1d7f1481ddb79a4a5f9db7180cb3ef02b4bcbee05e65ea0c"; + }; + buildInputs = [ Test2Suite ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "Functions for accessing a hashes internal iterator"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HashUtilFieldHashCompat = buildPerlPackage { pname = "Hash-Util-FieldHash-Compat"; version = "0.11"; @@ -11417,11 +11426,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.29"; + version = "12.39"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; + sha256 = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -11863,8 +11872,8 @@ let pname = "libnet"; version = "3.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.12.tar.gz"; - sha256 = "1px35q9qchzd7rxqldj87vbrall8v31blidhmh0d25d5hyq9lw25"; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.13.tar.gz"; + sha256 = "sha256-WjX7Hy1KopFoDrGvOImfq0U8IsKOcffHvTdHtaPbNIw="; }; patches = [ (fetchpatch { @@ -16706,12 +16715,12 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.88"; + version = "1.92"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; - sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz"; + sha256 = "sha256-R8LyswDy5xYtcdaZ9jPdajWwYloAy9qMUKwBFEqTlqk="; }; - buildInputs = [ pkgs.openssl ]; + buildInputs = [ pkgs.openssl pkgs.zlib ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl @@ -17024,6 +17033,20 @@ let doCheck = false; }; + OpenOfficeOODoc = buildPerlPackage { + pname = "OpenOffice-OODoc"; + version = "2.125"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMGDOC/OpenOffice-OODoc-2.125.tar.gz"; + sha256 = "1dnsj63svxq0hi3aci4x7binql8kr754inlkks5jmi4k0sblh561"; + }; + propagatedBuildInputs = [ ArchiveZip XMLTwig ]; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ maintainers.wentasah ]; + }; + }; + NetOpenIDCommon = buildPerlPackage { pname = "Net-OpenID-Common"; version = "1.20"; @@ -20744,12 +20767,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.9.0"; + version = "7.10.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.9.0"; - sha256 = "sha256-QxY6TRVQWrN689CD76CQZeyXsDVWxk24N1v67DCvmDo="; + rev = "v7.10.0"; + sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -24853,14 +24876,14 @@ let XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0206"; + version = "2.0207"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0206.tar.gz"; - sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0207.tar.gz"; + sha256 = "sha256-kDQ2yYWYdb71WTJDquhc7TKa0PtLV7v0WXXjJUfFDBU="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] - ++ lib.optional stdenv.isDarwin pkgs.libiconv; + ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); propagatedBuildInputs = [ XMLSAX ]; }; @@ -25433,4 +25456,5 @@ let SubExporterUtil = self.SubExporter; version = self.Version; + Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 }; in self diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 25dda00172023..cea65edb41fc8 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -175,6 +175,8 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; + ds = callPackage ../development/php-packages/ds { }; + event = callPackage ../development/php-packages/event { }; gnupg = callPackage ../development/php-packages/gnupg { }; @@ -540,7 +542,15 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; doCheck = false; } - { name = "sockets"; doCheck = false; } + { + name = "sockets"; + doCheck = false; + patches = lib.optional (php.version == "8.1.2") + (fetchpatch { + url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch"; + sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM="; + }); + } { name = "sodium"; buildInputs = [ libsodium ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sysvmsg"; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3438d68a2b1f5..44c5c11ceb92d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,23 +33,32 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 + asyncio-nats-client = nats-py; # added 2022-02-08 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 + carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 + cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 dateutil = python-dateutil; # added 2021-07-03 + demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_environ = django-environ; # added 2021-12-25 + django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 + eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + garminconnect-ha = garminconnect; # added 2022-02-05 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 @@ -57,10 +66,12 @@ mapAliases ({ grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 + hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 IMAPClient = imapclient; # added 2021-10-28 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 @@ -69,6 +80,8 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 + pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 @@ -84,8 +97,11 @@ mapAliases ({ pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 + repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 requests_toolbelt = requests-toolbelt; # added 2017-09-26 + roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 @@ -106,6 +122,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 websocket_client = websocket-client; # added 2021-06-15 + xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbcb8f33be74c..ff8c2055e0fd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22,10 +22,7 @@ let namePrefix = python.libPrefix + "-"; - bootstrapped-pip = if isPy3k then - callPackage ../development/python-modules/bootstrapped-pip { } - else - callPackage ../development/python-modules/bootstrapped-pip/2.nix { }; + bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. @@ -143,11 +140,6 @@ in { # it should not override the version of pytest that is used for say # Python 2. This is an ugly hack that is needed now because the hook # propagates the package. - pytestCheckHook_5 = if isPy3k then - self.pytestCheckHook.override { pytest = self.pytest_5; } - else - self.pytestCheckHook; - pytestCheckHook_6_1 = if isPy3k then self.pytestCheckHook.override { pytest = self.pytest_6_1; } else @@ -202,6 +194,8 @@ in { adax = callPackage ../development/python-modules/adax { }; + adax-local = callPackage ../development/python-modules/adax-local { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; @@ -266,6 +260,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + aioaseko = callPackage ../development/python-modules/aioaseko { }; + aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; aioazuredevops = callPackage ../development/python-modules/aioazuredevops { }; @@ -312,12 +308,16 @@ in { aiohttp = callPackage ../development/python-modules/aiohttp { }; + aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { }; + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; @@ -368,6 +368,8 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiooncue = callPackage ../development/python-modules/aiooncue { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; @@ -378,6 +380,8 @@ in { aiopvpc = callPackage ../development/python-modules/aiopvpc { }; + aiopyarr = callPackage ../development/python-modules/aiopyarr { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; aiorecollect = callPackage ../development/python-modules/aiorecollect { }; @@ -392,6 +396,8 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aiosenseme = callPackage ../development/python-modules/aiosenseme { }; + aiosenz = callPackage ../development/python-modules/aiosenz { }; aioserial = callPackage ../development/python-modules/aioserial { }; @@ -406,6 +412,8 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiosteamist = callPackage ../development/python-modules/aiosteamist { }; + aiostream = callPackage ../development/python-modules/aiostream { }; aioswitcher = callPackage ../development/python-modules/aioswitcher { }; @@ -422,6 +430,8 @@ in { aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aiowebostv = callPackage ../development/python-modules/aiowebostv { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; aioymaps = callPackage ../development/python-modules/aioymaps { }; @@ -458,8 +468,6 @@ in { allure-pytest = callPackage ../development/python-modules/allure-pytest { }; - alot = callPackage ../development/python-modules/alot { }; - alpha-vantage = callPackage ../development/python-modules/alpha-vantage { }; altair = callPackage ../development/python-modules/altair { }; @@ -528,6 +536,8 @@ in { ansiconv = callPackage ../development/python-modules/ansiconv { }; + ansimarkup = callPackage ../development/python-modules/ansimarkup { }; + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { @@ -540,8 +550,6 @@ in { anyio = callPackage ../development/python-modules/anyio { }; - anyjson = callPackage ../development/python-modules/anyjson { }; - anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; @@ -550,6 +558,8 @@ in { apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + apache-beam = callPackage ../development/python-modules/apache-beam { }; + apcaccess = callPackage ../development/python-modules/apcaccess { }; apipkg = callPackage ../development/python-modules/apipkg { }; @@ -572,6 +582,8 @@ in { apptools = callPackage ../development/python-modules/apptools { }; + appthreat-vulnerability-db = callPackage ../development/python-modules/appthreat-vulnerability-db { }; + aprslib = callPackage ../development/python-modules/aprslib { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; @@ -606,6 +618,8 @@ in { argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; + args = callPackage ../development/python-modules/args { }; aria2p = callPackage ../development/python-modules/aria2p { }; @@ -632,6 +646,8 @@ in { asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; + asgineer = callPackage ../development/python-modules/asgineer { }; + asgiref = callPackage ../development/python-modules/asgiref { }; asmog = callPackage ../development/python-modules/asmog { }; @@ -648,6 +664,8 @@ in { assertpy = callPackage ../development/python-modules/assertpy { }; + asterisk-mbox = callPackage ../development/python-modules/asterisk-mbox { }; + asteval = callPackage ../development/python-modules/asteval { }; astor = callPackage ../development/python-modules/astor { }; @@ -684,8 +702,6 @@ in { asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; - asyncio-nats-client = callPackage ../development/python-modules/asyncio-nats-client { }; - asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { }; asyncmy = callPackage ../development/python-modules/asyncmy { }; @@ -746,6 +762,10 @@ in { auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + aurorapy = callPackage ../development/python-modules/aurorapy { }; + + autarco = callPackage ../development/python-modules/autarco { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { }; @@ -1106,6 +1126,8 @@ in { base58 = callPackage ../development/python-modules/base58 { }; + base58check = callPackage ../development/python-modules/base58check { }; + baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -1128,6 +1150,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bbox = callPackage ../development/python-modules/bbox { }; + bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { }; bcdoc = callPackage ../development/python-modules/bcdoc { }; @@ -1198,6 +1222,10 @@ in { bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; + + bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { }; + bitlist = callPackage ../development/python-modules/bitlist { }; bitmath = callPackage ../development/python-modules/bitmath { }; @@ -1236,8 +1264,6 @@ in { blis = callPackage ../development/python-modules/blis { }; - blist = callPackage ../development/python-modules/blist { }; - blockchain = callPackage ../development/python-modules/blockchain { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -1254,6 +1280,8 @@ in { blurhash = callPackage ../development/python-modules/blurhash { }; + bme280spi = callPackage ../development/python-modules/bme280spi { }; + bme680 = callPackage ../development/python-modules/bme680 { }; bokeh = callPackage ../development/python-modules/bokeh { }; @@ -1296,6 +1324,10 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; + boxx = callPackage ../development/python-modules/boxx { }; + + bpycv = callPackage ../development/python-modules/bpycv {}; + bpython = callPackage ../development/python-modules/bpython { }; braceexpand = callPackage ../development/python-modules/braceexpand { }; @@ -1396,6 +1428,8 @@ in { cachetools = callPackage ../development/python-modules/cachetools { }; + cachey = callPackage ../development/python-modules/cachey { }; + cachy = callPackage ../development/python-modules/cachy { }; cadquery = callPackage ../development/python-modules/cadquery { @@ -1431,8 +1465,6 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - carrot = callPackage ../development/python-modules/carrot { }; - cart = callPackage ../development/python-modules/cart { }; cartopy = callPackage ../development/python-modules/cartopy { }; @@ -1479,6 +1511,8 @@ in { coqpit = callPackage ../development/python-modules/coqpit { }; + cepa = callPackage ../development/python-modules/cepa { }; + cerberus = callPackage ../development/python-modules/cerberus { }; cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; @@ -1503,6 +1537,8 @@ in { cffi = callPackage ../development/python-modules/cffi { }; + cffsubr = callPackage ../development/python-modules/cffsubr { }; + cfgv = callPackage ../development/python-modules/cfgv { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; @@ -1551,6 +1587,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chex = callPackage ../development/python-modules/chex { }; + chiabip158 = callPackage ../development/python-modules/chiabip158 { }; chiapos = callPackage ../development/python-modules/chiapos { }; @@ -1559,10 +1597,14 @@ in { chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; + chispa = callPackage ../development/python-modules/chispa { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; + circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; cirq = callPackage ../development/python-modules/cirq { }; @@ -1589,8 +1631,6 @@ in { cjkwrap = callPackage ../development/python-modules/cjkwrap { }; - cjson = callPackage ../development/python-modules/cjson { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; claripy = callPackage ../development/python-modules/claripy { }; @@ -1697,6 +1737,8 @@ in { cnvkit = callPackage ../development/python-modules/cnvkit { }; + co2signal = callPackage ../development/python-modules/co2signal { }; + coapthon3 = callPackage ../development/python-modules/coapthon3 { }; coconut = callPackage ../development/python-modules/coconut { }; @@ -1755,6 +1797,8 @@ in { compiledb = callPackage ../development/python-modules/compiledb { }; + compreffor = callPackage ../development/python-modules/compreffor { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; conda = callPackage ../development/python-modules/conda { }; @@ -1815,8 +1859,6 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; - cozy = callPackage ../development/python-modules/cozy { }; - cppe = callPackage ../development/python-modules/cppe { cppe = pkgs.cppe; }; @@ -1982,8 +2024,12 @@ in { datadog = callPackage ../development/python-modules/datadog { }; + datafusion = callPackage ../development/python-modules/datafusion { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + dataset = callPackage ../development/python-modules/dataset { }; + datasets = callPackage ../development/python-modules/datasets { }; datasette = callPackage ../development/python-modules/datasette { }; @@ -2034,6 +2080,8 @@ in { debugpy = callPackage ../development/python-modules/debugpy { }; + decli = callPackage ../development/python-modules/decli { }; + decorator = callPackage ../development/python-modules/decorator { }; decopatch = callPackage ../development/python-modules/decopatch { }; @@ -2070,8 +2118,6 @@ in { deluge-client = callPackage ../development/python-modules/deluge-client { }; - demjson = callPackage ../development/python-modules/demjson { }; - demjson3 = callPackage ../development/python-modules/demjson3 { }; dendropy = callPackage ../development/python-modules/dendropy { }; @@ -2108,6 +2154,8 @@ in { dict2xml = callPackage ../development/python-modules/dict2xml { }; + dictdiffer = callPackage ../development/python-modules/dictdiffer { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; dictpath = callPackage ../development/python-modules/dictpath { }; @@ -2138,6 +2186,8 @@ in { discordpy = callPackage ../development/python-modules/discordpy { }; + discovery30303 = callPackage ../development/python-modules/discovery30303 { }; + diskcache = callPackage ../development/python-modules/diskcache { }; dissononce = callPackage ../development/python-modules/dissononce { }; @@ -2156,9 +2206,10 @@ in { # Current LTS django_2 = callPackage ../development/python-modules/django/2.nix { }; + django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest - django_3 = callPackage ../development/python-modules/django/3.nix { }; + django_4 = callPackage ../development/python-modules/django/4.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -2196,9 +2247,9 @@ in { django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; - django_environ = callPackage ../development/python-modules/django_environ { }; + django-environ = callPackage ../development/python-modules/django_environ { }; - django_extensions = callPackage ../development/python-modules/django-extensions { }; + django-extensions = callPackage ../development/python-modules/django-extensions { }; django-filter = callPackage ../development/python-modules/django-filter { }; @@ -2321,6 +2372,8 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dm-haiku = callPackage ../development/python-modules/dm-haiku { }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; dm-tree = callPackage ../development/python-modules/dm-tree { }; @@ -2351,6 +2404,8 @@ in { docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { }; + docstring-parser = callPackage ../development/python-modules/docstring-parser { }; + docopt = callPackage ../development/python-modules/docopt { }; docopt-ng = callPackage ../development/python-modules/docopt-ng { }; @@ -2437,6 +2492,8 @@ in { dyn = callPackage ../development/python-modules/dyn { }; + dynalite-devices = callPackage ../development/python-modules/dynalite-devices { }; + dynd = callPackage ../development/python-modules/dynd { }; easydict = callPackage ../development/python-modules/easydict { }; @@ -2482,14 +2539,14 @@ in { edward = callPackage ../development/python-modules/edward { }; - eebrightbox = callPackage ../development/python-modules/eebrightbox { }; - effect = callPackage ../development/python-modules/effect { }; eggdeps = callPackage ../development/python-modules/eggdeps { }; einops = callPackage ../development/python-modules/einops { }; + eiswarnung = callPackage ../development/python-modules/eiswarnung { }; + elgato = callPackage ../development/python-modules/elgato { }; elkm1-lib = callPackage ../development/python-modules/elkm1-lib { }; @@ -2502,6 +2559,8 @@ in { elasticsearchdsl = self.elasticsearch-dsl; + elegy = callPackage ../development/python-modules/elegy { }; + elementpath = callPackage ../development/python-modules/elementpath { }; elevate = callPackage ../development/python-modules/elevate { }; @@ -2526,6 +2585,8 @@ in { emoji = callPackage ../development/python-modules/emoji { }; + empty-files = callPackage ../development/python-modules/empty-files { }; + empy = callPackage ../development/python-modules/empy { }; emulated-roku = callPackage ../development/python-modules/emulated-roku { }; @@ -2726,14 +2787,14 @@ in { fastjet = toPythonModule (pkgs.fastjet.override { withPython = true; - inherit python; + inherit (self) python; }); fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { withPython = true; - inherit python; + inherit (self) python; }); fastnumbers = callPackage ../development/python-modules/fastnumbers { }; @@ -2765,7 +2826,6 @@ in { feedparser = callPackage ../development/python-modules/feedparser { }; fenics = callPackage ../development/libraries/science/math/fenics { - pytest = self.pytest_4; hdf5 = pkgs.hdf5_1_10; }; @@ -2777,6 +2837,8 @@ in { fields = callPackage ../development/python-modules/fields { }; + file-read-backwards = callPackage ../development/python-modules/file-read-backwards { }; + filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; filebytes = callPackage ../development/python-modules/filebytes { }; @@ -2791,15 +2853,15 @@ in { finalfusion = callPackage ../development/python-modules/finalfusion { }; + findimports = callPackage ../development/python-modules/findimports { }; + fingerprints = callPackage ../development/python-modules/fingerprints { }; finitude = callPackage ../development/python-modules/finitude { }; fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { - gdal = pkgs.gdal_2; - }; + fiona = callPackage ../development/python-modules/fiona { }; fipy = callPackage ../development/python-modules/fipy { }; @@ -2819,12 +2881,16 @@ in { flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-length = callPackage ../development/python-modules/flake8-length { }; flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; + flake8-docstrings = callPackage ../development/python-modules/flake8-docstrings { }; + flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; @@ -2871,6 +2937,8 @@ in { flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + flask-gravatar = callPackage ../development/python-modules/flask-gravatar { }; + flask-httpauth = callPackage ../development/python-modules/flask-httpauth { }; flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; @@ -2891,6 +2959,8 @@ in { flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + flask-paranoid = callPackage ../development/python-modules/flask-paranoid { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -2909,6 +2979,8 @@ in { flask-session = callPackage ../development/python-modules/flask-session { }; + flask-security-too = callPackage ../development/python-modules/flask-security-too { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; flask-socketio = callPackage ../development/python-modules/flask-socketio { }; @@ -2935,6 +3007,10 @@ in { inherit (pkgs) flatbuffers; }; + flatten-dict = callPackage ../development/python-modules/flatten-dict { }; + + flax = callPackage ../development/python-modules/flax { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -3074,11 +3150,13 @@ in { pythonPackages = self; }); + gamble = callPackage ../development/python-modules/gamble { }; + gaphas = callPackage ../development/python-modules/gaphas { }; garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; - garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { }; + garminconnect = callPackage ../development/python-modules/garminconnect { }; gast = callPackage ../development/python-modules/gast { }; @@ -3101,6 +3179,8 @@ in { gdown = callPackage ../development/python-modules/gdown { }; + gdtoolkit = callPackage ../development/python-modules/gdtoolkit { }; + ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule (pkgs.geant4.override { @@ -3120,6 +3200,8 @@ in { generic = callPackage ../development/python-modules/generic { }; + geniushub-client = callPackage ../development/python-modules/geniushub-client { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; genpy = callPackage ../development/python-modules/genpy { }; @@ -3148,6 +3230,8 @@ in { geomet = callPackage ../development/python-modules/geomet { }; + geometric = callPackage ../development/python-modules/geometric { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = callPackage ../development/python-modules/geopy { }; @@ -3411,6 +3495,8 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; + gql = callPackage ../development/python-modules/gql { }; + gradient = callPackage ../development/python-modules/gradient { }; gradient-utils = callPackage ../development/python-modules/gradient-utils { }; @@ -3421,6 +3507,8 @@ in { grandalf = callPackage ../development/python-modules/grandalf { }; + grapheme = callPackage ../development/python-modules/grapheme { }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; @@ -3443,7 +3531,7 @@ in { graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; + graph-tool = callPackage ../development/python-modules/graph-tool { }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -3471,6 +3559,8 @@ in { grip = callPackage ../development/python-modules/grip { }; + groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; + grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { }; grpcio = callPackage ../development/python-modules/grpcio { }; @@ -3598,8 +3688,6 @@ in { hdfs = callPackage ../development/python-modules/hdfs { }; - hdlparse = callPackage ../development/python-modules/hdlparse { }; - hdmedians = callPackage ../development/python-modules/hdmedians { }; headerparser = callPackage ../development/python-modules/headerparser { }; @@ -3708,6 +3796,8 @@ in { httmock = callPackage ../development/python-modules/httmock { }; + httpagentparser = callPackage ../development/python-modules/httpagentparser { }; + httpauth = callPackage ../development/python-modules/httpauth { }; httpbin = callPackage ../development/python-modules/httpbin { }; @@ -3792,6 +3882,8 @@ in { inherit (pkgs) i2c-tools; }; + i2csense = callPackage ../development/python-modules/i2csense { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; @@ -3840,6 +3932,8 @@ in { ijson = callPackage ../development/python-modules/ijson { }; + ilua = callPackage ../development/python-modules/ilua { }; + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; @@ -3880,6 +3974,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + importlab = callPackage ../development/python-modules/importlab { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; importlib-resources = callPackage ../development/python-modules/importlib-resources { }; @@ -3930,6 +4026,8 @@ in { insegel = callPackage ../development/python-modules/insegel { }; + installer = callPackage ../development/python-modules/installer { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; @@ -3938,6 +4036,8 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + intellifire4py = callPackage ../development/python-modules/intellifire4py { }; + intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; internetarchive = callPackage ../development/python-modules/internetarchive { }; @@ -3968,6 +4068,8 @@ in { iptools = callPackage ../development/python-modules/iptools { }; + ipwhl = callPackage ../development/python-modules/ipwhl { }; + ipy = callPackage ../development/python-modules/IPy { }; ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; @@ -3980,10 +4082,7 @@ in { ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - ipython = if isPy36 then - callPackage ../development/python-modules/ipython/7.16.nix { } - else - callPackage ../development/python-modules/ipython { }; + ipython = callPackage ../development/python-modules/ipython { }; ipyvue = callPackage ../development/python-modules/ipyvue { }; @@ -4025,6 +4124,8 @@ in { itemadapter = callPackage ../development/python-modules/itemadapter { }; + itemdb = callPackage ../development/python-modules/itemdb { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; iterm2 = callPackage ../development/python-modules/iterm2 { }; @@ -4065,7 +4166,11 @@ in { jax = callPackage ../development/python-modules/jax { }; - jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; + jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + cudatoolkit_11 = tensorflow_compat_cudatoolkit; + cudnn = tensorflow_compat_cudnn; + }; jaxlib-build = callPackage ../development/python-modules/jaxlib { # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. @@ -4077,6 +4182,14 @@ in { jaxlib = self.jaxlib-build; + jaxlibWithCuda = self.jaxlib-build.override { + cudaSupport = true; + }; + + jaxlibWithoutCuda = self.jaxlib-build.override { + cudaSupport = false; + }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -4113,6 +4226,8 @@ in { jmespath = callPackage ../development/python-modules/jmespath { }; + jmp = callPackage ../development/python-modules/jmp { }; + joblib = callPackage ../development/python-modules/joblib { }; johnnycanencrypt = callPackage ../development/python-modules/johnnycanencrypt { @@ -4189,6 +4304,8 @@ in { jsonstreams = callPackage ../development/python-modules/jsonstreams { }; + json-tricks = callPackage ../development/python-modules/json-tricks { }; + jug = callPackage ../development/python-modules/jug { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -4372,7 +4489,7 @@ in { language-data = callPackage ../development/python-modules/language-data { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; @@ -4570,8 +4687,7 @@ in { libxslt = (toPythonModule (pkgs.libxslt.override { pythonSupport = true; - python3 = python; - inherit (self) libxml2; + inherit (self) python libxml2; })).py; license-expression = callPackage ../development/python-modules/license-expression { }; @@ -4588,6 +4704,8 @@ in { lightparam = callPackage ../development/python-modules/lightparam { }; + lightwave = callPackage ../development/python-modules/lightwave { }; + lightwave2 = callPackage ../development/python-modules/lightwave2 { }; lima = callPackage ../development/python-modules/lima { }; @@ -4731,6 +4849,8 @@ in { magic = callPackage ../development/python-modules/magic { }; + magicgui = callPackage ../development/python-modules/magicgui { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; @@ -4741,6 +4861,8 @@ in { mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + mailchecker = callPackage ../development/python-modules/mailchecker { }; + mailchimp = callPackage ../development/python-modules/mailchimp { }; mailman = callPackage ../servers/mail/mailman { }; @@ -4801,7 +4923,7 @@ in { markupsafe = callPackage ../development/python-modules/markupsafe { }; - Markups = callPackage ../development/python-modules/Markups { }; + markups = callPackage ../development/python-modules/markups { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; @@ -4838,6 +4960,8 @@ in { matrix-client = callPackage ../development/python-modules/matrix-client { }; + matrix-common = callPackage ../development/python-modules/matrix-common { }; + matrix-nio = callPackage ../development/python-modules/matrix-nio { }; mattermostdriver = callPackage ../development/python-modules/mattermostdriver { }; @@ -4946,6 +5070,8 @@ in { millheater = callPackage ../development/python-modules/millheater { }; + minexr = callPackage ../development/python-modules/minexr { }; + miniaudio = callPackage ../development/python-modules/miniaudio { }; minidb = callPackage ../development/python-modules/minidb { }; @@ -4982,6 +5108,8 @@ in { mizani = callPackage ../development/python-modules/mizani { }; + mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; @@ -5029,6 +5157,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; + mongomock = callPackage ../development/python-modules/mongomock { }; + mongodict = callPackage ../development/python-modules/mongodict { }; mongoengine = callPackage ../development/python-modules/mongoengine { }; @@ -5150,6 +5280,8 @@ in { mutf8 = callPackage ../development/python-modules/mutf8 { }; + mutmut = callPackage ../development/python-modules/mutmut { }; + mujson = callPackage ../development/python-modules/mujson { }; mwclient = callPackage ../development/python-modules/mwclient { }; @@ -5204,8 +5336,20 @@ in { nanotime = callPackage ../development/python-modules/nanotime { }; + napari = callPackage ../development/python-modules/napari { + inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; + }; + + napari-console = callPackage ../development/python-modules/napari-console { }; + + napari-plugin-engine = callPackage ../development/python-modules/napari-plugin-engine { }; + + napari-svg = callPackage ../development/python-modules/napari-svg { }; + nassl = callPackage ../development/python-modules/nassl { }; + nats-py = callPackage ../development/python-modules/nats-py { }; + nats-python = callPackage ../development/python-modules/nats-python { }; natsort = callPackage ../development/python-modules/natsort { }; @@ -5260,6 +5404,8 @@ in { nestedtext = callPackage ../development/python-modules/nestedtext { }; + net2grid = callPackage ../development/python-modules/net2grid { }; + netaddr = callPackage ../development/python-modules/netaddr { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; @@ -5270,6 +5416,8 @@ in { netifaces = callPackage ../development/python-modules/netifaces { }; + netio = callPackage ../development/python-modules/netio { }; + nettigo-air-monitor = callPackage ../development/python-modules/nettigo-air-monitor { }; networkx = callPackage ../development/python-modules/networkx { }; @@ -5330,15 +5478,17 @@ in { nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + nkdfu = callPackage ../development/python-modules/nkdfu { }; + nltk = callPackage ../development/python-modules/nltk { }; nmapthon2 = callPackage ../development/python-modules/nmapthon2 { }; - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + amaranth-boards = callPackage ../development/python-modules/amaranth-boards { }; - nmigen = callPackage ../development/python-modules/nmigen { }; + amaranth = callPackage ../development/python-modules/amaranth { }; - nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + amaranth-soc = callPackage ../development/python-modules/amaranth-soc { }; nocasedict = callPackage ../development/python-modules/nocasedict { }; @@ -5396,10 +5546,6 @@ in { inherit (pkgs) notmuch; }; - notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { - inherit (pkgs) notmuch; - }; - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; @@ -5505,10 +5651,16 @@ in { onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + online-judge-api-client = callPackage ../development/python-modules/online-judge-api-client { }; + + online-judge-tools = callPackage ../development/python-modules/online-judge-tools { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { }; + onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; + oocsi = callPackage ../development/python-modules/oocsi { }; open-garage = callPackage ../development/python-modules/open-garage { }; @@ -5537,6 +5689,8 @@ in { openerz-api = callPackage ../development/python-modules/openerz-api { }; + openevsewifi = callPackage ../development/python-modules/openevsewifi { }; + openhomedevice = callPackage ../development/python-modules/openhomedevice { }; openidc-client = callPackage ../development/python-modules/openidc-client { }; @@ -5555,6 +5709,8 @@ in { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { }; + openstacksdk = callPackage ../development/python-modules/openstacksdk { }; opentimestamps = callPackage ../development/python-modules/opentimestamps { }; @@ -5576,6 +5732,8 @@ in { opt-einsum = callPackage ../development/python-modules/opt-einsum { }; + optax = callPackage ../development/python-modules/optax { }; + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; @@ -5592,6 +5750,8 @@ in { orm = callPackage ../development/python-modules/orm { }; + ormar = callPackage ../development/python-modules/ormar { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; orvibo = callPackage ../development/python-modules/orvibo { }; @@ -5800,6 +5960,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; pebble = callPackage ../development/python-modules/pebble { }; @@ -5890,6 +6052,8 @@ in { phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; + pi1wire = callPackage ../development/python-modules/pi1wire { }; + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; @@ -5902,6 +6066,8 @@ in { piexif = callPackage ../development/python-modules/piexif { }; + pijuice = callPackage ../development/python-modules/pijuice { }; + pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; @@ -5932,6 +6098,8 @@ in { pipdate = callPackage ../development/python-modules/pipdate { }; + pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pipx = callPackage ../development/python-modules/pipx { }; @@ -5981,6 +6149,8 @@ in { pyhiveapi = callPackage ../development/python-modules/pyhiveapi { }; + pyhumps = callPackage ../development/python-modules/pyhumps { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; @@ -5991,10 +6161,16 @@ in { pynuki = callPackage ../development/python-modules/pynuki { }; + pynut2 = callPackage ../development/python-modules/pynut2 { }; + pynws = callPackage ../development/python-modules/pynws { }; pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; + + pyownet = callPackage ../development/python-modules/pyownet { }; + pypoint = callPackage ../development/python-modules/pypoint { }; pypoolstation = callPackage ../development/python-modules/pypoolstation { }; @@ -6041,6 +6217,8 @@ in { python-kasa = callPackage ../development/python-modules/python-kasa { }; + python-keycloak = callPackage ../development/python-modules/python-keycloak { }; + python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { }; python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; @@ -6057,6 +6235,8 @@ in { python-tado = callPackage ../development/python-modules/python-tado { }; + pythonfinder = callPackage ../development/python-modules/pythonfinder { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pkutils = callPackage ../development/python-modules/pkutils { }; @@ -6218,6 +6398,8 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; + primecountpy = callPackage ../development/python-modules/primecountpy { }; + primer3 = callPackage ../development/python-modules/primer3 { }; priority = callPackage ../development/python-modules/priority { }; @@ -6279,6 +6461,8 @@ in { psautohint = callPackage ../development/python-modules/psautohint { }; + pscript = callPackage ../development/python-modules/pscript { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; @@ -6287,6 +6471,8 @@ in { psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; + psygnal = callPackage ../development/python-modules/psygnal { }; + ptable = callPackage ../development/python-modules/ptable { }; ptest = callPackage ../development/python-modules/ptest { }; @@ -6353,6 +6539,8 @@ in { py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; + py-tes = callPackage ../development/python-modules/py-tes { }; + py-ubjson = callPackage ../development/python-modules/py-ubjson { }; py-zabbix = callPackage ../development/python-modules/py-zabbix { }; @@ -6401,6 +6589,8 @@ in { inherit (pkgs) arrow-cpp cmake; }; + pyasn = callPackage ../development/python-modules/pyasn { }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; @@ -6415,6 +6605,8 @@ in { pyaudio = callPackage ../development/python-modules/pyaudio { }; + pyaussiebb = callPackage ../development/python-modules/pyaussiebb { }; + pyautogui = callPackage ../development/python-modules/pyautogui { }; pyavm = callPackage ../development/python-modules/pyavm { }; @@ -6455,8 +6647,6 @@ in { inherit (pkgs.buildPackages) meson; }; - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - py = callPackage ../development/python-modules/py { }; pycangjie = callPackage ../development/python-modules/pycangjie { }; @@ -6481,6 +6671,8 @@ in { inherit (pkgs) graphviz; }; + pycfmodel = callPackage ../development/python-modules/pycfmodel { }; + pychannels = callPackage ../development/python-modules/pychannels { }; pychart = callPackage ../development/python-modules/pychart { }; @@ -6535,6 +6727,8 @@ in { pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + pycryptodome-test-vectors = callPackage ../development/python-modules/pycryptodome-test-vectors { }; + pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; pyct = callPackage ../development/python-modules/pyct { }; @@ -6574,6 +6768,8 @@ in { py-desmume = callPackage ../development/python-modules/py-desmume { }; + pydevccu = callPackage ../development/python-modules/pydevccu { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; pydicom = callPackage ../development/python-modules/pydicom { }; @@ -6596,6 +6792,8 @@ in { pydrive = callPackage ../development/python-modules/pydrive { }; + pydrive2 = callPackage ../development/python-modules/pydrive2 { }; + pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { }; pydsdl = callPackage ../development/python-modules/pydsdl { }; @@ -6728,9 +6926,13 @@ in { pygeoip = callPackage ../development/python-modules/pygeoip { }; + pygeos = callPackage ../development/python-modules/pygeos { }; + pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { }; + pygit2 = callPackage ../development/python-modules/pygit2 { + libgit2 = pkgs.libgit2_1_3_0; + }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -6954,12 +7156,16 @@ in { pymdstat = callPackage ../development/python-modules/pymdstat { }; + pymdown-extensions = callPackage ../development/python-modules/pymdown-extensions { }; + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; pymediaroom = callPackage ../development/python-modules/pymediaroom { }; pymeeus = callPackage ../development/python-modules/pymeeus { }; + pymelcloud = callPackage ../development/python-modules/pymelcloud { }; + pymemcache = callPackage ../development/python-modules/pymemcache { }; pymemoize = callPackage ../development/python-modules/pymemoize { }; @@ -7042,6 +7248,8 @@ in { pynetdicom = callPackage ../development/python-modules/pynetdicom { }; + pynetgear = callPackage ../development/python-modules/pynetgear { }; + pynina = callPackage ../development/python-modules/pynina { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -7173,6 +7381,8 @@ in { pypykatz = callPackage ../development/python-modules/pypykatz { }; + pypytools = callPackage ../development/python-modules/pypytools { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; @@ -7181,6 +7391,8 @@ in { pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { }; + pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -7202,8 +7414,12 @@ in { pyquery = callPackage ../development/python-modules/pyquery { }; + pyquaternion = callPackage ../development/python-modules/pyquaternion { }; + pyquil = callPackage ../development/python-modules/pyquil { }; + pyqvrpro = callPackage ../development/python-modules/pyqvrpro { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; pyrad = callPackage ../development/python-modules/pyrad { }; @@ -7329,7 +7545,9 @@ in { pysdl2 = callPackage ../development/python-modules/pysdl2 { }; - pysearpc = toPythonModule pkgs.libsearpc; + pysearpc = toPythonModule (pkgs.libsearpc.override { + python3 = self.python; + }); pysecuritas = callPackage ../development/python-modules/pysecuritas { }; @@ -7479,6 +7697,8 @@ in { pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { }; + pytap2 = callPackage ../development/python-modules/pytap2 { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; pyte = callPackage ../development/python-modules/pyte { }; @@ -7491,22 +7711,6 @@ in { pytest = self.pytest_6; - pytest_4 = callPackage - ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - - pytest_5 = callPackage - ../development/python-modules/pytest/5.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - pytest_6 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle @@ -7625,6 +7829,8 @@ in { pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + pytest-logdog = callPackage ../development/python-modules/pytest-logdog{ }; + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; pytest-mock = callPackage ../development/python-modules/pytest-mock { }; @@ -7635,6 +7841,8 @@ in { pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-mypy-plugins = callPackage ../development/python-modules/pytest-mypy-plugins { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; pytest-order = callPackage ../development/python-modules/pytest-order { }; @@ -7745,6 +7953,8 @@ in { python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + python-benedict = callPackage ../development/python-modules/python-benedict { }; + python-bidi = callPackage ../development/python-modules/python-bidi { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -7779,6 +7989,8 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; + python-fsutil = callPackage ../development/python-modules/python-fsutil { }; + pythonefl = callPackage ../development/python-modules/python-efl { }; pythonegardia = callPackage ../development/python-modules/pythonegardia { }; @@ -7813,8 +8025,10 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; + python-i18n = callPackage ../development/python-modules/python-i18n { }; + pythonix = callPackage ../development/python-modules/pythonix { - nix = pkgs.nix_2_3; + nix = pkgs.nixVersions.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; }; @@ -7900,7 +8114,8 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; + inherit (pkgs) fontconfig rapidjson; + inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }); @@ -8227,8 +8442,6 @@ in { qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; @@ -8249,13 +8462,15 @@ in { qreactor = callPackage ../development/python-modules/qreactor { }; - qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; + qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; - qscintilla = self.qscintilla-qt4; + qscintilla = self.qscintilla-qt5; + + qt5reactor = callPackage ../development/python-modules/qt5reactor { }; qtawesome = callPackage ../development/python-modules/qtawesome { }; @@ -8300,6 +8515,8 @@ in { radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { }; + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; ramlfications = callPackage ../development/python-modules/ramlfications { }; @@ -8314,9 +8531,7 @@ in { inherit (pkgs) libarchive; }; - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; - }; + rasterio = callPackage ../development/python-modules/rasterio { }; ratelim = callPackage ../development/python-modules/ratelim { }; @@ -8390,8 +8605,6 @@ in { reparser = callPackage ../development/python-modules/reparser { }; - repeated_test = callPackage ../development/python-modules/repeated_test { }; - repocheck = callPackage ../development/python-modules/repocheck { }; reportlab = callPackage ../development/python-modules/reportlab { }; @@ -8514,10 +8727,6 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs.qt5) qtbase; - }; - robot-detection = callPackage ../development/python-modules/robot-detection { }; robotframework = callPackage ../development/python-modules/robotframework { }; @@ -8566,6 +8775,8 @@ in { rpdb = callPackage ../development/python-modules/rpdb { }; + rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { }; + rply = callPackage ../development/python-modules/rply { }; rpm = toPythonModule (pkgs.rpm.override { @@ -8598,6 +8809,8 @@ in { rtslib = callPackage ../development/python-modules/rtslib { }; + rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; + ruamel-base = callPackage ../development/python-modules/ruamel-base { }; ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { }; @@ -8714,6 +8927,8 @@ in { scipy = callPackage ../development/python-modules/scipy { }; + scmrepo = callPackage ../development/python-modules/scmrepo { }; + scour = callPackage ../development/python-modules/scour { }; scp = callPackage ../development/python-modules/scp { }; @@ -8744,9 +8959,9 @@ in { seabreeze = callPackage ../development/python-modules/seabreeze { }; - seahub = callPackage ../development/python-modules/seahub { }; - - seaserv = toPythonModule pkgs.seafile-server; + seaserv = toPythonModule (pkgs.seafile-server.override { + python3 = self.python; + }); seatconnect = callPackage ../development/python-modules/seatconnect { }; @@ -8784,6 +8999,8 @@ in { sentinel = callPackage ../development/python-modules/sentinel { }; + sentinels = callPackage ../development/python-modules/sentinels { }; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; sepaxml = callPackage ../development/python-modules/sepaxml { }; @@ -8861,12 +9078,16 @@ in { showit = callPackage ../development/python-modules/showit { }; + shtab = callPackage ../development/python-modules/shtab { }; + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; sievelib = callPackage ../development/python-modules/sievelib { }; signedjson = callPackage ../development/python-modules/signedjson { }; + sigrok = callPackage ../development/python-modules/sigrok { }; + sigtools = callPackage ../development/python-modules/sigtools { }; simanneal = callPackage ../development/python-modules/simanneal { }; @@ -9025,6 +9246,8 @@ in { usePython = true; }); + socketio-client = callPackage ../development/python-modules/socketio-client { }; + socialscan = callPackage ../development/python-modules/socialscan { }; socid-extractor = callPackage ../development/python-modules/socid-extractor { }; @@ -9075,6 +9298,8 @@ in { spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; @@ -9095,6 +9320,8 @@ in { speaklater = callPackage ../development/python-modules/speaklater { }; + speaklater3 = callPackage ../development/python-modules/speaklater3 { }; + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; @@ -9109,6 +9336,8 @@ in { sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; + sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; @@ -9143,6 +9372,8 @@ in { inherit (pkgs) plantuml; }; + sphinxcontrib-programoutput = callPackage ../development/python-modules/sphinxcontrib-programoutput { }; + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; @@ -9277,6 +9508,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + statmake = callPackage ../development/python-modules/statmake { }; + statsd = callPackage ../development/python-modules/statsd { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -9309,6 +9542,8 @@ in { streamz = callPackage ../development/python-modules/streamz { }; + strenum = callPackage ../development/python-modules/strenum { }; + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; strictyaml = callPackage ../development/python-modules/strictyaml { }; @@ -9365,6 +9600,8 @@ in { supervisor = callPackage ../development/python-modules/supervisor { }; + superqt = callPackage ../development/python-modules/superqt { }; + sure = callPackage ../development/python-modules/sure { }; surepy = callPackage ../development/python-modules/surepy { }; @@ -9409,6 +9646,8 @@ in { synologydsm-api = callPackage ../development/python-modules/synologydsm-api { }; + syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { }; + systembridge = callPackage ../development/python-modules/systembridge { }; systemd = callPackage ../development/python-modules/systemd { @@ -9453,6 +9692,8 @@ in { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + teamcity-messages = callPackage ../development/python-modules/teamcity-messages { }; + telegram = callPackage ../development/python-modules/telegram { }; telethon = callPackage ../development/python-modules/telethon { @@ -9465,6 +9706,8 @@ in { telfhash = callPackage ../development/python-modules/telfhash { }; + temescal = callPackage ../development/python-modules/temescal { }; + tempest = callPackage ../development/python-modules/tempest { }; tempita = callPackage ../development/python-modules/tempita { }; @@ -9501,8 +9744,12 @@ in { lmdb-core = pkgs.lmdb; }; + tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; + tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; tensorflow = self.tensorflow-build; @@ -9545,6 +9792,8 @@ in { textfsm = callPackage ../development/python-modules/textfsm { }; + textile = callPackage ../development/python-modules/textile { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; @@ -9638,6 +9887,8 @@ in { timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; + timetagger = callPackage ../development/python-modules/timetagger { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; tinycss2 = callPackage ../development/python-modules/tinycss2 { }; @@ -9682,6 +9933,8 @@ in { tomli = callPackage ../development/python-modules/tomli { }; + tomli-w = callPackage ../development/python-modules/tomli-w { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; toolz = callPackage ../development/python-modules/toolz { }; @@ -9694,6 +9947,8 @@ in { torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + torchinfo = callPackage ../development/python-modules/torchinfo { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; @@ -9752,6 +10007,10 @@ in { transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + treeo = callPackage ../development/python-modules/treeo { }; + + treex = callPackage ../development/python-modules/treex { }; + treq = callPackage ../development/python-modules/treq { }; trezor_agent = callPackage ../development/python-modules/trezor_agent { }; @@ -9770,6 +10029,8 @@ in { trytond = callPackage ../development/python-modules/trytond { }; + ttls = callPackage ../development/python-modules/ttls { }; + ttp = callPackage ../development/python-modules/ttp { }; tubes = callPackage ../development/python-modules/tubes { }; @@ -9840,6 +10101,8 @@ in { txtorcon = callPackage ../development/python-modules/txtorcon { }; + txzmq = callPackage ../development/python-modules/txzmq { }; + typecode = callPackage ../development/python-modules/typecode { }; typecode-libmagic = callPackage ../development/python-modules/typecode/libmagic.nix { @@ -9854,8 +10117,12 @@ in { typer = callPackage ../development/python-modules/typer { }; + types-dateutil = callPackage ../development/python-modules/types-dateutil { }; + types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-freezegun = callPackage ../development/python-modules/types-freezegun { }; + types-futures = callPackage ../development/python-modules/types-futures { }; types-protobuf = callPackage ../development/python-modules/types-protobuf { }; @@ -9866,10 +10133,14 @@ in { types-setuptools = callPackage ../development/python-modules/types-setuptools { }; + types-tabulate = callPackage ../development/python-modules/types-tabulate { }; + types-toml = callPackage ../development/python-modules/types-toml { }; types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; + types-urllib3 = callPackage ../development/python-modules/types-urllib3 { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; @@ -9904,6 +10175,10 @@ in { inherit (pkgs.xorg) libX11 libXext; }; + ufo2ft = callPackage ../development/python-modules/ufo2ft { }; + + ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; @@ -10167,10 +10442,16 @@ in { Wand = callPackage ../development/python-modules/Wand { }; + wandb = callPackage ../development/python-modules/wandb { }; + + warcio = callPackage ../development/python-modules/warcio { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; + warrant-lite = callPackage ../development/python-modules/warrant-lite { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; wasabi = callPackage ../development/python-modules/wasabi { }; @@ -10250,8 +10531,6 @@ in { werkzeug = callPackage ../development/python-modules/werkzeug { }; - werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { }; - west = callPackage ../development/python-modules/west { }; wfuzz = callPackage ../development/python-modules/wfuzz { }; @@ -10310,6 +10589,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsdiscovery = callPackage ../development/python-modules/wsdiscovery { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; wsgiprox = callPackage ../development/python-modules/wsgiprox { }; @@ -10322,10 +10603,7 @@ in { wsnsimpy = callPackage ../development/python-modules/wsnsimpy { }; - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; + wsproto = callPackage ../development/python-modules/wsproto { }; wtforms = callPackage ../development/python-modules/wtforms { }; @@ -10379,8 +10657,6 @@ in { inherit (pkgs) graphviz; }; - xenomapper = callPackage ../applications/science/biology/xenomapper { }; - xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; }; @@ -10449,6 +10725,8 @@ in { inherit (pkgs.xorg) xorgserver; }; + xxh = callPackage ../tools/networking/xxh { }; + xxhash = callPackage ../development/python-modules/xxhash { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; @@ -10483,10 +10761,14 @@ in { yarl = callPackage ../development/python-modules/yarl { }; + yaspin = callPackage ../development/python-modules/yaspin { }; + yaswfp = callPackage ../development/python-modules/yaswfp { }; yattag = callPackage ../development/python-modules/yattag { }; + yacs = callPackage ../development/python-modules/yacs { }; + ydiff = callPackage ../development/python-modules/ydiff { }; yeelight = callPackage ../development/python-modules/yeelight { }; @@ -10543,6 +10825,8 @@ in { zconfig = callPackage ../development/python-modules/zconfig { }; + zcs = callPackage ../development/python-modules/zcs { }; + zdaemon = callPackage ../development/python-modules/zdaemon { }; zeek = toPythonModule (pkgs.zeek.override { diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 1f894f3a14b63..b98357a2cb0ec 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -6,679 +6,176 @@ self: super: with self; with super; { - affinity = callPackage ../development/python-modules/affinity { }; + bootstrapped-pip = callPackage ../development/python2-modules/bootstrapped-pip { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { - inherit (pkgs) antlr4; - }; - - appleseed = disabled super.appleseed; - - application = callPackage ../development/python-modules/application { }; - - arrow = callPackage ../development/python-modules/arrow/2.nix { }; - - ase = callPackage ../development/python-modules/ase/3.17.nix { }; - - astroid = callPackage ../development/python-modules/astroid/1.6.nix { }; - - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; - - backports_os = callPackage ../development/python-modules/backports_os { }; - - bcrypt = callPackage ../development/python-modules/bcrypt/3_1.nix { }; - - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - - blivet = callPackage ../development/python-modules/blivet { }; - - box2d = callPackage ../development/python-modules/box2d { }; - - boto3 = callPackage ../development/python-modules/boto3/1_17.nix {}; - - botocore = callPackage ../development/python-modules/botocore/1_20.nix {}; - - browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; - - cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; - - cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { }; - - CDDB = callPackage ../development/python-modules/cddb { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - - certifi = callPackage ../development/python-modules/certifi/python2.nix { }; - - chardet = callPackage ../development/python-modules/chardet/2.nix { }; - - cheetah = callPackage ../development/python-modules/cheetah { }; - - cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { }; - - cjson = callPackage ../development/python-modules/cjson { }; - - cliapp = callPackage ../development/python-modules/cliapp { }; - - click = callPackage ../development/python-modules/click/7.nix { }; - - closure-linter = callPackage ../development/python-modules/closure-linter { }; - - cmdtest = callPackage ../development/python-modules/cmdtest { }; - - coilmq = callPackage ../development/python-modules/coilmq { }; + boto3 = callPackage ../development/python2-modules/boto3 {}; - configparser = callPackage ../development/python-modules/configparser/4.nix { }; + botocore = callPackage ../development/python2-modules/botocore {}; - construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + certifi = callPackage ../development/python2-modules/certifi { }; - contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; + chardet = callPackage ../development/python2-modules/chardet { }; - convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; + cheetah = callPackage ../development/python2-modules/cheetah { }; - cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; - - cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }; - - darcsver = callPackage ../development/python-modules/darcsver { }; - - dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; - - decorator = callPackage ../development/python-modules/decorator/4.nix { }; - - deskcon = callPackage ../development/python-modules/deskcon { }; - - django_evolution = callPackage ../development/python-modules/django_evolution { }; - - dnspython = callPackage ../development/python-modules/dnspython/1.nix { }; - - docker-py = disabled super.docker-py; - - dtopt = callPackage ../development/python-modules/dtopt { }; - - dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { }; - - enum = callPackage ../development/python-modules/enum { }; - - eventlib = callPackage ../development/python-modules/eventlib { }; - - faulthandler = callPackage ../development/python-modules/faulthandler { }; - - fdint = callPackage ../development/python-modules/fdint { }; - - feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; - - filelock = callPackage ../development/python-modules/filelock/3.2.nix { }; - - flask = callPackage ../development/python-modules/flask/1.nix { }; - - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - - flit = disabled super.flit; - - flit-core = disabled super.flit-core; - - flup = callPackage ../development/python-modules/flup { }; - - fontforge = disabled super.fontforge; - - freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { }; - - fudge = callPackage ../development/python-modules/fudge { }; - - futures = callPackage ../development/python-modules/futures { }; - - gdcm = disabled super.gdcm; - - geant4 = disabled super.geant4; - - geopy = callPackage ../development/python-modules/geopy/2.nix { }; - - # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google-api-python-client = super.google-api-python-client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + click = callPackage ../development/python2-modules/click { }; - gateone = callPackage ../development/python-modules/gateone { }; + configparser = callPackage ../development/python2-modules/configparser { }; - gdrivefs = callPackage ../development/python-modules/gdrivefs { }; + construct = callPackage ../development/python2-modules/construct { }; - gsd = callPackage ../development/python-modules/gsd/1.7.nix { }; + contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; - gnutls = callPackage ../development/python-modules/gnutls { }; + coverage = callPackage ../development/python2-modules/coverage { }; - google-apputils = callPackage ../development/python-modules/google-apputils { }; + cryptography = callPackage ../development/python2-modules/cryptography { }; - grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); + cryptography_vectors = callPackage ../development/python2-modules/cryptography-vectors { }; - gunicorn = callPackage ../development/python-modules/gunicorn/19.nix { }; + decorator = callPackage ../development/python2-modules/decorator { }; - gwyddion = toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - }); + enum = callPackage ../development/python2-modules/enum { }; - hg-git = callPackage ../development/python-modules/hg-git/0.8.nix { }; + filelock = callPackage ../development/python2-modules/filelock { }; - hgsvn = callPackage ../development/python-modules/hgsvn { }; + flask = callPackage ../development/python2-modules/flask { }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + freezegun = callPackage ../development/python2-modules/freezegun { }; - html2text = callPackage ../development/python-modules/html2text/2018.nix { }; + futures = callPackage ../development/python2-modules/futures { }; - httpretty = callPackage ../development/python-modules/httpretty/0.nix { }; + google-apputils = callPackage ../development/python2-modules/google-apputils { }; - http_signature = callPackage ../development/python-modules/http_signature { }; + httpretty = callPackage ../development/python2-modules/httpretty { }; - hypothesis = callPackage ../development/python-modules/hypothesis/2.nix { }; + hypothesis = callPackage ../development/python2-modules/hypothesis { }; - idna = callPackage ../development/python-modules/idna/2.nix { }; + idna = callPackage ../development/python2-modules/idna { }; - imagecodecs-lite = disabled super.imagecodecs-lite; + importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; - imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn/0.4.nix { }; + ipaddr = callPackage ../development/python2-modules/ipaddr { }; - importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + itsdangerous = callPackage ../development/python2-modules/itsdangerous { }; - importlib-resources = callPackage ../development/python-modules/importlib-resources/2.nix { }; + jinja2 = callPackage ../development/python2-modules/jinja2 { }; - ipaddr = callPackage ../development/python-modules/ipaddr { }; + libcloud = callPackage ../development/python2-modules/libcloud { }; - ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { }; + lpod = callPackage ../development/python2-modules/lpod { }; - ipython = callPackage ../development/python-modules/ipython/5.nix { }; - - isort = callPackage ../development/python-modules/isort/4.nix { }; - - itsdangerous = callPackage ../development/python-modules/itsdangerous/1.nix { }; - - jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { }; - - jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { }; - - jinja2 = callPackage ../development/python-modules/jinja2/2.nix { }; - - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - - jupyter-client = callPackage ../development/python-modules/jupyter-client/5.nix { }; - - jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { }; - - koji = callPackage ../development/python-modules/koji { }; - - konfig = callPackage ../development/python-modules/konfig { }; - - kicad = disabled super.kicad; - - kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { }; - - larch = callPackage ../development/python-modules/larch { }; - - Lasagne = callPackage ../development/python-modules/lasagne { }; - - le = callPackage ../development/python-modules/le { }; - - libcloud = callPackage ../development/python-modules/libcloud/2.nix { }; - - libgpiod = disabled super.libgpiod; - - libnl-python = toPythonModule (pkgs.libnl.override { - pythonSupport = true; - inherit python; - }).py; - - libplist = toPythonModule (pkgs.libplist.override { - enablePython = true; - inherit python; - }).py; - - libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python; - - libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix { - libvirt = pkgs.libvirt_5_9_0; - }; - - lightblue = callPackage ../development/python-modules/lightblue { }; - - lirc = disabled super.lirc; - - lpod = callPackage ../development/python-modules/lpod { }; - - lsi = callPackage ../development/python-modules/lsi { }; - - lxc = callPackage ../development/python-modules/lxc { }; - - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; - - marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - - marisa = callPackage ../development/python-modules/marisa { + marisa = callPackage ../development/python2-modules/marisa { inherit (pkgs) marisa; }; - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; - - markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; - - markupsafe = callPackage ../development/python-modules/markupsafe/1.nix { }; - - matplotlib = callPackage ../development/python-modules/matplotlib/2.nix { - stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - }; - - meliae = callPackage ../development/python-modules/meliae { }; - - mercurial = disabled super.mercurial; - - meson = disabled super.meson; - - metaphone = callPackage ../development/python-modules/metaphone { }; - - mlt = disabled super.mlt; - - mock = callPackage ../development/python-modules/mock/2.nix { }; - - monosat = disabled super.monosat; - - more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; - - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; - - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; - - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; - - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; - - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; - - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; - - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; - - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; - - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; - - mozterm = callPackage ../development/python-modules/mozterm { }; - - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; - - mozsvc = callPackage ../development/python-modules/mozsvc { }; - - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; - - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; - - mpd = callPackage ../development/python-modules/mpd { }; - - mrbob = callPackage ../development/python-modules/mrbob { }; - - msrplib = callPackage ../development/python-modules/msrplib { }; + markdown = callPackage ../development/python2-modules/markdown { }; - mwlib = callPackage ../development/python-modules/mwlib { }; + markupsafe = callPackage ../development/python2-modules/markupsafe { }; - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + mock = callPackage ../development/python2-modules/mock { }; - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + more-itertools = callPackage ../development/python2-modules/more-itertools { }; - mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { }; + mutagen = callPackage ../development/python2-modules/mutagen { }; - muttils = callPackage ../development/python-modules/muttils { }; + numpy = callPackage ../development/python2-modules/numpy { }; - namebench = callPackage ../development/python-modules/namebench { }; + packaging = callPackage ../development/python2-modules/packaging { }; - nbformat = callPackage ../development/python-modules/nbformat/2.nix { }; - - networkx = callPackage ../development/python-modules/networkx/2.2.nix { }; - - nevow = callPackage ../development/python-modules/nevow { }; - - # This is used for NixOps to make sure we won't break it with the next major version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - - nose-focus = callPackage ../development/python-modules/nose-focus { }; - - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; - - notebook = callPackage ../development/python-modules/notebook/2.nix { }; - - notify = callPackage ../development/python-modules/notify { }; - - numpy = callPackage ../development/python-modules/numpy/1.16.nix { }; - - nxt-python = callPackage ../development/python-modules/nxt-python { }; - - oauthlib = callPackage ../development/python-modules/oauthlib/3.1.nix { }; - - opencv = toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - }); - - openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { }; - - openvino = disabled super.openvino; - - openwrt-luci-rpc = disabled super.openwrt-luci-rpc; - - opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { }; - - packaging = callPackage ../development/python-modules/packaging/2.nix { }; - - pagerduty = callPackage ../development/python-modules/pagerduty { }; - - pandas = callPackage ../development/python-modules/pandas/2.nix { }; - - pathpy = callPackage ../development/python-modules/path.py/2.nix { }; - - pg8000 = callPackage ../development/python-modules/pg8000/1_12.nix { }; - - pillow = callPackage ../development/python-modules/pillow/6.nix { + pillow = callPackage ../development/python2-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; }; - pip = callPackage ../development/python-modules/pip/20.nix { }; - - platformdirs = callPackage ../development/python-modules/platformdirs/2.nix { }; + pip = callPackage ../development/python2-modules/pip { }; - pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; + pluggy = callPackage ../development/python2-modules/pluggy { }; - postorius = disabled super.postorius; + prettytable = callPackage ../development/python2-modules/prettytable { }; - praw = callPackage ../development/python-modules/praw/6.3.nix { }; - - prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; - - ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { }; - - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - - prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { }; - - protobuf = callPackage ../development/python-modules/protobuf { + protobuf = callPackage ../development/python2-modules/protobuf { disabled = isPyPy; protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 }; - pyamf = callPackage ../development/python-modules/pyamf { }; - - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; - - pycairo = callPackage ../development/python-modules/pycairo/1.18.nix { + pycairo = callPackage ../development/python2-modules/pycairo { inherit (pkgs.buildPackages) meson; }; - pycangjie = disabled pycangjie; + pygments = callPackage ../development/python2-modules/Pygments { }; - pycarddav = callPackage ../development/python-modules/pycarddav { }; - - pycassa = callPackage ../development/python-modules/pycassa { }; - - pycryptopp = callPackage ../development/python-modules/pycryptopp { }; - - pycurl2 = callPackage ../development/python-modules/pycurl2 { }; - - pydns = callPackage ../development/python-modules/pydns { }; - - pyechonest = callPackage ../development/python-modules/pyechonest { }; - - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; - - pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { }); - - pygments = callPackage ../development/python-modules/Pygments/2_5.nix { }; - - pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix { + pygobject3 = callPackage ../development/python2-modules/pygobject { inherit (pkgs) meson; }; - pygtk = callPackage ../development/python-modules/pygtk { }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; - - pyGtkGlade = self.pygtk.override { - inherit (pkgs.gnome2) libglade; - }; - - pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; - - pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; - - pykickstart = callPackage ../development/python-modules/pykickstart { }; + pygtk = callPackage ../development/python2-modules/pygtk { }; - pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; + pyjwt = callPackage ../development/python2-modules/pyjwt { }; - pylint = callPackage ../development/python-modules/pylint/1.9.nix { }; + pyparsing = callPackage ../development/python2-modules/pyparsing { }; - pyobjc = if stdenv.isDarwin then - callPackage ../development/python-modules/pyobjc { } - else - throw "pyobjc can only be built on Mac OS"; + pyroma = callPackage ../development/python2-modules/pyroma { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; - - pypoppler = callPackage ../development/python-modules/pypoppler { }; - - pyreport = callPackage ../development/python-modules/pyreport { }; - - pyroma = callPackage ../development/python-modules/pyroma/2.nix { }; - - pysqlite = callPackage ../development/python-modules/pysqlite { }; - - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pysqlite = callPackage ../development/python2-modules/pysqlite { }; pytest = pytest_4; - pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; - - pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; - - pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; - - python-otr = callPackage ../development/python-modules/python-otr { }; - - python_statsd = callPackage ../development/python-modules/python_statsd { }; - - python-sybase = callPackage ../development/python-modules/sybase { }; - - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - - pyutil = callPackage ../development/python-modules/pyutil { }; - - pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec { - version = "0.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + pytest_4 = callPackage + ../development/python2-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; - }); - - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - pyxml = callPackage ../development/python-modules/pyxml { }; + pytest-runner = callPackage ../development/python2-modules/pytest-runner { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; - qserve = callPackage ../development/python-modules/qserve { }; + pyyaml = callPackage ../development/python2-modules/pyyaml { }; - remotecv = callPackage ../development/python-modules/remotecv { }; + qpid-python = callPackage ../development/python2-modules/qpid-python { }; recoll = disabled super.recoll; - rhpl = callPackage ../development/python-modules/rhpl { }; - rivet = disabled super.rivet; - robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - - ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { }; - - ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { }; - - runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - rpm = disabled super.rpm; - rpkg = callPackage ../development/python-modules/rpkg { }; - - rpy2 = callPackage ../development/python-modules/rpy2/2.nix { }; - - rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; - - s3transfer = callPackage ../development/python-modules/s3transfer/0_4.nix { }; - - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - - scandir = callPackage ../development/python-modules/scandir { }; - - scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix { - inherit (pkgs) gfortran glibcLocales; - }; - - scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - - seaborn = callPackage ../development/python-modules/seaborn/0.9.1.nix { }; - - secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { }; - - semantic = callPackage ../development/python-modules/semantic { }; + s3transfer = callPackage ../development/python2-modules/s3transfer { }; - serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + scandir = callPackage ../development/python2-modules/scandir { }; sequoia = disabled super.sequoia; - setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; - - setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { }; - - setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; - - simpleai = callPackage ../development/python-modules/simpleai { }; - - simpleparse = callPackage ../development/python-modules/simpleparse { }; - - singledispatch = callPackage ../development/python-modules/singledispatch { }; - - sipsimple = callPackage ../development/python-modules/sipsimple { }; - - slowaes = callPackage ../development/python-modules/slowaes { }; - - smartdc = callPackage ../development/python-modules/smartdc { }; - - snug = callPackage ../development/python-modules/snug { }; - - soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { }; - - spambayes = callPackage ../development/python-modules/spambayes { }; + setuptools = callPackage ../development/python2-modules/setuptools { }; - sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; - sphinx = callPackage ../development/python-modules/sphinx/2.nix { }; + sphinxcontrib-websupport = callPackage ../development/python2-modules/sphinxcontrib-websupport { }; - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + sphinx = callPackage ../development/python2-modules/sphinx { }; - squaremap = callPackage ../development/python-modules/squaremap { }; + TurboCheetah = callPackage ../development/python2-modules/TurboCheetah { }; - stompclient = callPackage ../development/python-modules/stompclient { }; + typing = callPackage ../development/python2-modules/typing { }; - subliminal = callPackage ../development/python-modules/subliminal { }; + urllib3 = callPackage ../development/python2-modules/urllib3 { }; - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; + werkzeug = callPackage ../development/python2-modules/werkzeug { }; - suds = callPackage ../development/python-modules/suds { }; + wsproto = callPackage ../development/python2-modules/wsproto { }; - sympy = callPackage ../development/python-modules/sympy/1_5.nix { }; - - tables = callPackage ../development/python-modules/tables/3.5.nix { - hdf5 = pkgs.hdf5_1_10; - }; - - tarman = callPackage ../development/python-modules/tarman { }; - - tensorflow-bin = disabled super.tensorflow-bin; - - thumbor = callPackage ../development/python-modules/thumbor { }; - - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - - tokenizers = disabled super.tokenizers; - - tokenize-rt = disabled super.tokenize-rt; - - tokenserver = callPackage ../development/python-modules/tokenserver { }; - - toolz = callPackage ../development/python-modules/toolz/2.nix { }; - - tornado = callPackage ../development/python-modules/tornado/5.nix { }; - - traitlets = callPackage ../development/python-modules/traitlets/4.nix { }; - - ttystatus = callPackage ../development/python-modules/ttystatus { }; - - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - - typing = callPackage ../development/python-modules/typing { }; - - tzlocal = callPackage ../development/python-modules/tzlocal/2.nix { }; - - ujson = callPackage ../development/python-modules/ujson/2.nix { }; - - umemcache = callPackage ../development/python-modules/umemcache { }; - - urllib3 = callPackage ../development/python-modules/urllib3/2.nix { }; - - wptserve = callPackage ../development/python-modules/wptserve { }; - - werkzeug = callPackage ../development/python-modules/werkzeug/1.nix { }; - - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxPython30 = callPackage ../development/python2-modules/wxPython { wxGTK = pkgs.wxGTK30; }; wxPython = self.wxPython30; - vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { }; - - xcaplib = callPackage ../development/python-modules/xcaplib { }; - - xenomapper = disabled super.xenomapper; - - yenc = callPackage ../development/python-modules/yenc { }; - - yt = callPackage ../development/python-modules/yt { }; + vcrpy = callPackage ../development/python2-modules/vcrpy { }; zeek = disabled super.zeek; - zbase32 = callPackage ../development/python-modules/zbase32 { }; - - zfec = callPackage ../development/python-modules/zfec { }; - - zipp = callPackage ../development/python-modules/zipp/1.nix { }; + zipp = callPackage ../development/python2-modules/zipp { }; } diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a2bd8dc6a547f..d9cc05afe7132 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -190,9 +190,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = callPackage ../development/libraries/qscintilla { - withQt5 = true; - }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qt5ct = callPackage ../tools/misc/qt5ct { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a9e4ea32ccdc6..82828a3d611e8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -51,7 +51,7 @@ let released = with compilerNames; [ ghc884 ghc8107 - ghc901 + ghc902 ghc921 ]; @@ -188,6 +188,7 @@ let icepeak idris ihaskell + jacinda jl koka krank @@ -310,11 +311,7 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - haskell-language-server = [ - compilerNames.ghc884 - compilerNames.ghc8107 - compilerNames.ghc901 - ]; + haskell-language-server = released; hoogle = released; hlint = released; hsdns = released; @@ -325,7 +322,7 @@ let ghc-api-compat = [ compilerNames.ghc884 compilerNames.ghc8107 - compilerNames.ghc901 + compilerNames.ghc902 ]; }) { @@ -393,12 +390,12 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 - jobs.pkgsMusl.haskell.compiler.ghc901 + jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc921 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc901 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc921 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index af492cc4b987f..d90be7f3bb4c9 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -26,4 +26,22 @@ let []); in if res.success then res.value else [] ); -in (mapTestOn (packagePython pkgs)) + + jobs = { + lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; + pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; + + tested = pkgs.releaseTools.aggregate { + name = "python-tested"; + meta.description = "Release-critical packages from the python package sets"; + constituents = [ + jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages + ]; + }; + + } // (mapTestOn (packagePython pkgs)); +in jobs diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 66c6bb3734842..a267b20d66759 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -30,7 +30,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; bind = linux; bsdiff = all; bzip2 = all; - classpath = linux; cmake = all; coreutils = all; cpio = all; @@ -41,12 +40,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; diffutils = all; e2fsprogs = linux; emacs = linux; - enscript = all; file = all; findutils = all; flex = all; gcc = all; - gcj = linux; glibc = linux; glibcLocales = linux; gnugrep = all; @@ -58,10 +55,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; gnused = all; gnutar = all; gnutls = linux; - gogoclient = linux; grub = linux; grub2 = linux; - gsl = linux; guile = linux; # tests fail on Cygwin gzip = all; hddtemp = linux; @@ -73,10 +68,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; idutils = all; inetutils = linux; iputils = linux; - jnettop = linux; - jwhois = linux; - kbd = linux; - keen4 = ["i686-linux"]; kvm = linux; qemu = linux; qemu_kvm = linux; @@ -97,17 +88,11 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; man = linux; man-pages = linux; mc = all; - mcabber = linux; - mcron = linux; mdadm = linux; mesa = mesaPlatforms; - midori = linux; mingetty = linux; - mk = linux; mktemp = all; - mono = linux; monotone = linux; - mpg321 = linux; mutt = linux; mysql = linux; # netcat broken on darwin @@ -122,24 +107,20 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; openssh = linux; openssl = all; pan = linux; - par2cmdline = all; pciutils = linux; pdf2xml = all; perl = all; pkg-config = all; pmccabe = linux; procps = linux; - python = unix; # Cygwin builds fail + python3 = unix; # Cygwin builds fail readline = all; rlwrap = all; - rpm = linux; rpcbind = linux; rsync = linux; screen = linux ++ darwin; scrot = linux; sdparm = linux; - sharutils = all; - sloccount = unix; # Cygwin builds fail smartmontools = all; sqlite = unix; # Cygwin builds fail squid = linux; @@ -150,8 +131,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; sudo = linux; sysklogd = linux; syslinux = ["i686-linux"]; - sysvinit = linux; - sysvtools = linux; tcl = linux; tcpdump = linux; texinfo = all; @@ -166,12 +145,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; webkitgtk = linux; wget = all; which = all; - wireshark = linux; wirelesstools = linux; wpa_supplicant = linux; xfsprogs = linux; xkeyboard_config = linux; - zile = linux; zip = all; } )) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 13526349dfc59..0c759095f56d7 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,7 +25,10 @@ let systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; - supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; + supportDarwin = lib.genAttrs [ + "x86_64" + "aarch64" + ] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport); jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; }; @@ -36,7 +39,7 @@ let lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; - darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate + darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = @@ -54,7 +57,7 @@ let jobs.openssl.x86_64-darwin jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin @@ -99,7 +102,7 @@ let jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux - jobs.python.x86_64-linux + jobs.python2.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) jobs.nixpkgs-review.x86_64-linux @@ -130,11 +133,12 @@ let */ ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools - ++ lib.optionals supportDarwin [ + ++ lib.optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin + jobs.cachix.x86_64-darwin jobs.go.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin @@ -171,7 +175,7 @@ let dist test; }) # darwin is special in this - // optionalAttrs supportDarwin { + // optionalAttrs supportDarwin.x86_64 { x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; @@ -181,7 +185,7 @@ let # Test a full stdenv bootstrap from the bootstrap tools definition inherit (bootstrap.test-pkgs) stdenv; }; - + } // optionalAttrs supportDarwin.aarch64 { # Cross compiled bootstrap tools aarch64-darwin = let diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 3a7c16c087142..9e64afe31f3b1 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,32 +5,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilq5mniarm0zlvnkagqj9n9p73ljrhphciz02aymrpfxxxclz2x"; + sha256 = "121zl6435dwz1d14xviyynxj4njbawbv1ljxj5p0cxlhql1n3jsm"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16azdnjws215clb056b9mabglx4b8f61hr82hv7hm80dmn89zqq6"; + sha256 = "1jkxqdp9ha8pm2cd61ajs2pgn41adz3x1f8yqvdca3fvfrlgirjg"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592"; + sha256 = "0r27a5g0r7b27mzcl150hdc7ljgl5iyrxw1z4wn3n1jfb7xs5rkq"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,21 +38,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; + sha256 = "0q27kqcl369g9y7sxxcfigrm1yyj3q22kd135l7ahx977vcy5hjm"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m4fy4qqh09vnzbhx383vjdfid6fzbs49bzzg415x05nmmjkx582"; + sha256 = "0yya6xda23q8p3knvg5c8zfqk7xwnkjplf2bxnvmipn88918cz6w"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; + sha256 = "0nc0v74mdlag3kxcby0rrcz2ivvc94sfdrw3zm5ng2qrchh56w1b"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn"; + sha256 = "1yshbsy4k8702x9jv90yr6cjjpn5vxlw42pb878g70cgp2wq45r3"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; + sha256 = "0vr3ayykc1s7n12ajddcyff751v9j48yfimgxrys6qsxj89gmnmh"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; + sha256 = "1dpn1r1v2165bx9wj07rh1g27jl49yr6kyd34xhkd48hxfadq3jb"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,31 +104,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17knzz9fvqg4x582vy0xmlgjkxfb13xyzl2rgw19qfma86hxsvvi"; + sha256 = "0pxjxyjgh4al11k7z1lbnsc5wx5dnraz95p2wx00dkrvpgw8gm8b"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; + sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; addressable = { + dependencies = ["idn-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + sha256 = "sha256-920p0tH1S2xqSa7Fj5WDsI2X4IjCJ6P8upL2xlMdWQg="; type = "gem"; }; - version = "2.4.0"; + version = "2.8.0"; }; ansi = { groups = ["default"]; @@ -290,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; clamp = { groups = ["default"]; @@ -396,10 +397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04bzk1x67pqrmnmz3pdw107j5p9ncwfm7gdv8n4bk4r9nqxdv3wn"; + sha256 = "1zaid3awk470igr5yilx1wvj1jnh88fbjl11hp93a4qic7j3i6ca"; type = "gem"; }; - version = "0.2.0"; + version = "0.0.6"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -551,10 +552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f7w4gxr45m42ca6fpbq38jfzii00xysz12vcc68myvi8x0krr5l"; + sha256 = "03dqcz9pks7mbzq3zkfm2rzbjwkcwp8z3rip60d4pqs8b2bb61bg"; type = "gem"; }; - version = "0.2.0"; + version = "0.0.6"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -704,20 +705,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7kqswm780vx1fannnrprbfbsp166smgyszgip5q7b859mk89wp"; + sha256 = "06k7iybv6shvf8ypw28q9pbks129v2k34sn4f293650000ybdman"; type = "gem"; }; - version = "0.9.11"; + version = "1.0.0"; }; curses = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j00s12wn9ai2qinbmzak6v0173cldqllnzs2s2id7gl45py2s75"; + sha256 = "0py4n868h0whr5n8a4943nyagkpf0vnldk9nyizgf1q1lmrj1pkx"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; daemons = { groups = ["default"]; @@ -755,10 +756,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; + }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; }; digest-sha3 = { groups = ["default"]; @@ -868,10 +879,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih"; + sha256 = "1bkh80zzjpfglm14rhz116qgz0nb5gvk3ydfjpg14av5407srgh1"; type = "gem"; }; - version = "0.89.0"; + version = "0.90.0"; }; execjs = { groups = ["default"]; @@ -884,15 +895,15 @@ version = "2.8.1"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; + sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.3"; }; faraday-em_http = { groups = ["default"]; @@ -934,6 +945,17 @@ }; version = "1.0.1"; }; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + type = "gem"; + }; + version = "1.0.3"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -974,15 +996,25 @@ }; version = "1.0.0"; }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1311,6 +1343,16 @@ }; version = "0.1.4"; }; + io-wait = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10jj6xz15qaw8gkck5wv3a3xg1zdfsarrandkglfbf75x4xmkrfz"; + type = "gem"; + }; + version = "0.2.1"; + }; jaro_winkler = { groups = ["default"]; platforms = []; @@ -1322,15 +1364,15 @@ version = "1.5.4"; }; jbuilder = { - dependencies = ["activesupport"]; + dependencies = ["actionview" "activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a8fhj01wqsjyr3cm6fzrv54p879v83xpm2vrh7if9q5zwvkqmfn"; + sha256 = "1h58xgmp0fqpnd6mvw0zl0f76119v8lnf4xabqhckbzl6jrk8qpa"; type = "gem"; }; - version = "2.11.3"; + version = "2.11.5"; }; jekyll = { dependencies = ["colorator" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "rouge" "safe_yaml"]; @@ -1477,10 +1519,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; json = { groups = ["default"]; @@ -1538,10 +1580,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w2pw08b6pc9pm51ix7413jcllaisc06dvwzq0191ag1jsysv220"; + sha256 = "0kr51hg192mfn5ixngs41f1z8iyik5r6b52chcy8ilfs006fdkgi"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; liquid = { groups = ["default"]; @@ -1684,10 +1726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.1115"; + version = "3.2022.0105"; }; mini_magick = { groups = ["default"]; @@ -1714,20 +1756,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; type = "gem"; }; - version = "5.14.4"; + version = "5.15.0"; }; molinillo = { groups = ["default"]; @@ -1815,10 +1857,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8"; + sha256 = "1pcpqw8vjxf2cs97bzzxcz5bh72x6bkayj0vzsilidw90kvrv2ds"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; ncursesw = { groups = ["default"]; @@ -1840,6 +1882,39 @@ }; version = "0.9.0"; }; + net-imap = { + dependencies = ["digest" "net-protocol" "strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + type = "gem"; + }; + version = "0.2.3"; + }; + net-pop = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + type = "gem"; + }; + version = "0.1.1"; + }; + net-protocol = { + dependencies = ["io-wait" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rrzdar609d8c96ikpw2yif44pp5k3n3cpjld31ia0rgmz9z59gv"; + type = "gem"; + }; + version = "0.1.2"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -1851,6 +1926,17 @@ }; version = "3.0.0"; }; + net-smtp = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + type = "gem"; + }; + version = "0.3.1"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -1887,10 +1973,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -1898,10 +1984,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; type = "gem"; }; - version = "4.21.0"; + version = "4.22.0"; }; opus-ruby = { dependencies = ["ffi"]; @@ -2003,10 +2089,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl"; + sha256 = "1rkxhps7fxzjhld68bpdaq8sss2k6fp14jz5kcqgrxp8x3yd15mk"; type = "gem"; }; - version = "1.4.6"; + version = "1.4.7"; }; polyglot = { groups = ["default"]; @@ -2056,10 +2142,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gczh6fggly245r774yl2phcnh33iv6xpqw7p9dggqrmcyaslq3"; + sha256 = "0wyvql6pb6m8jl8bsamabxhxhd86bnqblspaxzz05sl0fm2ynj0r"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; public_suffix = { groups = ["default"]; @@ -2125,15 +2211,15 @@ version = "1.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y59m2x8rdc581bjgyyr9dabi3vk3frqhhpbb5ldpbj622kxfpbz"; + sha256 = "1yfqhxa89331mk0z33l12pvzdm4y35fx41kjb2p9jzl06jhz00rz"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2158,35 +2244,35 @@ version = "1.4.2"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; + sha256 = "0gi4q1j3n7vb79ijsqjgy1fnqqxypk4zdj61kic4py19pn6xqaxw"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; rainbow = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "10.5.0"; + version = "13.0.6"; }; rb-fsevent = { groups = ["default"]; @@ -2340,10 +2426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z1qk9i18zma000cqd758av9ca0622ykwp2cwm1x4dv9c0vw03yg"; + sha256 = "0zxljscsg2sp49s2f80n2rdpbazkf97v3jd2fydm3kgaplcyrh96"; type = "gem"; }; - version = "4.2.3"; + version = "4.2.4"; }; rouge = { groups = ["default"]; @@ -2393,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; + sha256 = "1qrj2j9jcd3m4aksk4kbv439882yl3z1harv2jrybrgjgdzdz7zs"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2550,10 +2636,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v846qs2pa3wnzgz95jzbcdrgl9vyjl65qiscw4q4dvm5sb7j68i"; + sha256 = "0x00xqq666wfi53w2bb7lgqrr3diyakncbr4sxpbvkd2yvvra913"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; safe_yaml = { groups = ["default"]; @@ -2625,20 +2711,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hiifw2zm2w00h3c7hfqy9n23q270aq18wwd5fs8wh9f6ap0vjvz"; + sha256 = "0k7iz98xfv84dkdjk2d90vxnzrjqx20gg6k3fdm45q5rnp2lb9j7"; type = "gem"; }; - version = "0.11.6"; + version = "0.11.8"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kx1vvld5n51jamvgv4xj14fq9jqw93vjwkalx4809z8jh08znbz"; + sha256 = "0z0s3xq6dmak96296dchi8j61m0cih7j9pzdpxxsh786vrpznwlj"; type = "gem"; }; - version = "5.51.0"; + version = "5.52.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2745,37 +2831,25 @@ }; version = "0.39.17"; }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38"; - type = "gem"; - }; - version = "4.0.2"; - }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; + sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "3.4.2"; + version = "1.4.2"; }; - sqlite3 = { + strscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "05bzfzfwvs5ngl14yf303nvrg5wjx3srgbjqkki7x65cm66w948p"; type = "gem"; }; - version = "1.4.2"; + version = "3.0.1"; }; taglib-ruby = { groups = ["default"]; @@ -2803,10 +2877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thrift = { groups = ["default"]; @@ -2828,6 +2902,16 @@ }; version = "2.0.10"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10bx1hcyrjqgq6a848fc1i0cgrvx42gcy8hk4vp90y6zc7k8xzbk"; + type = "gem"; + }; + version = "0.2.0"; + }; tiny_tds = { groups = ["default"]; platforms = []; @@ -2965,15 +3049,14 @@ version = "1.21.0"; }; xctasks = { - dependencies = ["nokogiri" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m01vnmdy9m4hn85ajji5v595faqsy8d3a0r646q79vphw1fikj1"; + sha256 = "1jmxq0dv2q4qs628cykrhsm9piysjsacbq5blsf35a0fj015bw7l"; type = "gem"; }; - version = "0.6.0"; + version = "0.2.2"; }; yard = { dependencies = ["webrick"]; @@ -2991,20 +3074,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; + sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; ZenTest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vkqgajgwmmf2dxfj9h4zs94v3rlvmvb1hcm4wid57dj79y7a0ak"; + sha256 = "1vss0ldskqprnlvl5pczcl8p346p2ib1sc6hyprbprh6gjq4v16y"; type = "gem"; }; - version = "4.12.0"; + version = "4.12.1"; }; zookeeper = { groups = ["default"]; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index fff2d73110c38..62a2278bd4f13 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,16 +1,13 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; }; base = minimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; gettextSupport = true; fontconfigSupport = true; alsaSupport = true; @@ -25,7 +22,6 @@ rec { pulseaudioSupport = config.pulseaudio or stdenv.isLinux; udevSupport = true; xineramaSupport = true; - xmlSupport = true; sdlSupport = true; mingwSupport = true; }; @@ -33,8 +29,6 @@ rec { full = base.override { gtkSupport = true; gstreamerSupport = true; - colorManagementSupport = true; - mpg123Support = true; openalSupport = true; openclSupport = true; odbcSupport = true; @@ -42,10 +36,8 @@ rec { vaSupport = true; pcapSupport = true; v4lSupport = true; - gsmSupport = true; gphoto2Support = true; ldapSupport = true; - faudioSupport = true; vkd3dSupport = true; embedInstallers = true; }; @@ -58,4 +50,7 @@ rec { staging = base.override { wineRelease = "staging"; }; stagingFull = full.override { wineRelease = "staging"; }; + + wayland = base.override { wineRelease = "wayland"; }; + waylandFull = full.override { wineRelease = "wayland"; }; } |