diff options
Diffstat (limited to 'pkgs/top-level')
23 files changed, 2307 insertions, 1699 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f892c5de4af0d..a2a6d988296d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -83,6 +83,10 @@ mapAliases ({ antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 + appleseed = throw "appleseed has been removed, because it was unmaintained"; # Added 2022-05-26 + arangodb_3_3 = throw "arangodb_3_3 went end of life and has been removed"; # Added 2022-10-08 + arangodb_3_4 = throw "arangodb_3_4 went end of life and has been removed"; # Added 2022-10-08 + arangodb_3_5 = throw "arangodb_3_5 went end of life and has been removed"; # Added 2022-10-08 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed"; # Added 2020-09-09 @@ -128,6 +132,12 @@ mapAliases ({ bird2 = bird; # Added 2022-02-21 bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 + bitcoin-classic = throw "bitcoin-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24 + bitcoind-classic = throw "bitcoind-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24 + bitcoin-gold = throw "bitcoin-gold has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24 + bitcoind-gold = throw "bitcoin-gold has been removed since it's unnmaintained: https://github.com/BTCGPU/BTCGPU/graphs/code-frequency"; # Added 2022-11-24 + digibyte = throw "digibyte has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24 + digibyted = throw "digibyted has been removed since it's unnmaintained: https://github.com/digibyte/digibyte/graphs/code-frequency"; # Added 2022-11-24 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 @@ -170,9 +180,13 @@ mapAliases ({ 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 callPackage_i686 = pkgsi686Linux.callPackage; cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 + cask = emacs.pkgs.cask; # Added 2022-11-12 cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 + carnix = throw "carnix has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; + cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 + cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 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 @@ -188,6 +202,7 @@ mapAliases ({ clickshare-csc1 = throw "'clickshare-csc1' has been removed as it requires qt4 which is being removed"; # Added 2022-06-16 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 + cratesIO = throw "cratesIO has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22 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 @@ -295,6 +310,7 @@ mapAliases ({ cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; 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"; + cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 @@ -430,7 +446,9 @@ mapAliases ({ finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; 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-wayland = firefox-esr; # Added 2022-11-15 firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 + firefox-wayland = firefox; # Added 2022-11-15 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 @@ -567,12 +585,14 @@ mapAliases ({ grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 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 + gringo = clingo; # added 2022-11-27 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 grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 + gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15 @@ -596,6 +616,7 @@ mapAliases ({ hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 @@ -621,6 +642,7 @@ mapAliases ({ icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 + ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 @@ -652,6 +674,7 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 + jami-client-qt = jami-client; # Added 2022-11-06 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 @@ -664,8 +687,10 @@ mapAliases ({ # 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_10 = throw "julia_10 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 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_15 = throw "julia_15 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 @@ -704,6 +729,7 @@ mapAliases ({ kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + krb5Full = krb5; krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05 @@ -724,6 +750,7 @@ mapAliases ({ libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 + libbpf_1 = libbpf; # Added 2022-12-06 libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 @@ -745,6 +772,7 @@ mapAliases ({ 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 = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 + libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 @@ -766,7 +794,11 @@ mapAliases ({ libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 + libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 + libsForQt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 + libsForQt515 = libsForQt5; # Added 2022-11-24 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 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 = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 @@ -796,11 +828,9 @@ mapAliases ({ 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_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; @@ -817,11 +847,9 @@ mapAliases ({ 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_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; @@ -836,6 +864,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 + linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; @@ -912,6 +942,7 @@ mapAliases ({ minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01 minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 + miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30 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 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 @@ -1022,6 +1053,7 @@ mapAliases ({ odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 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 + openafs_1_8 = openafs; # Added 2022-08-22 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 = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 @@ -1064,6 +1096,8 @@ mapAliases ({ pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 + percona-server = percona-server56; # Added 2022-11-01 + percona-server56 = throw "'percona-server56' has been dropped due to lack of maintenance, no upstream support and security issues"; # Added 2022-11-01 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 pgadmin = pgadmin4; @@ -1200,6 +1234,7 @@ mapAliases ({ prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 protobuf3_7 = throw "protobuf3_7 does not receive updates anymore and has been removed"; # Added 2022-10-03 protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 + protonup = protonup-ng; # Added 2022-11-06 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 @@ -1212,10 +1247,12 @@ mapAliases ({ 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 + pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21 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; + pypolicyd-spf = spf-engine; # Added 2022-10-09 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 @@ -1237,6 +1274,9 @@ mapAliases ({ qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 + qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 + qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 + qt515 = qt5; # Added 2022-11-24 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 @@ -1261,14 +1301,9 @@ mapAliases ({ readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 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 redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 + redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 - - # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30? - resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; - resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; - resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; - 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; @@ -1293,6 +1328,7 @@ mapAliases ({ 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 + rustracer = throw "rustracer has been removed as it has been deprecated"; # Added 2022-11-28 rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 @@ -1321,6 +1357,7 @@ mapAliases ({ scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 + scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08 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 @@ -1337,6 +1374,7 @@ mapAliases ({ 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 + sleepyhead = throw "'sleepyhead' has been renamed to/replaced by 'OSCAR'"; # Added 2022-11-20 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 @@ -1386,6 +1424,7 @@ mapAliases ({ # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 + spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 @@ -1449,6 +1488,7 @@ mapAliases ({ tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 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; + thunderbird-wayland = thunderbird; # Added 2022-11-15 timescale-prometheus = promscale; # Added 2020-09-29 timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 @@ -1489,6 +1529,7 @@ mapAliases ({ 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 = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 + unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 untrunc = untrunc-anthwlock; # Added 2021-02-01 @@ -1514,6 +1555,7 @@ mapAliases ({ 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 varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 + varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08 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 vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 @@ -1549,7 +1591,15 @@ mapAliases ({ wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wmii_hg = wmii; + wmc-mpris = throw "wmc-mpris has been abandoned by upstream due to its redundancy"; # Added 2022-11-13 ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 + wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 + wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 + wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 + wxGTK30-gtk2 = throw "'wxGTK30-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-12-03 + wxGTK30-gtk3 = throw "'wxGTK30-gtk3' has been renamed to/replaced by 'wxGTK30'"; # Added 2022-12-03 + wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27 + wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 @@ -1585,6 +1635,7 @@ mapAliases ({ ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 + xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### @@ -1595,6 +1646,7 @@ mapAliases ({ youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 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 + yubioath-desktop = throw "yubioath-desktop has been deprecated by upstream in favor of yubioath-flutter"; # Added 2022-11-22 yuzu-ea = yuzu-early-access; # Added 2022-08-18 yuzu = yuzu-mainline; # Added 2021-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4699f660443d5..9b7c317492e8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13,23 +13,22 @@ with pkgs; { # A module system style type tag # - # Allows the nixpkgs fixpoint, usually known as `pkgs` - # to be distinguished nominally. + # Allows the nixpkgs fixpoint, usually known as `pkgs` to be distinguished + # nominally. # # pkgs._type == "pkgs" # pkgs.pkgsStatic._type == "pkgs" # # Design note: - # While earlier stages of nixpkgs fixpoint construction - # are supertypes of this stage, they're generally not - # usable in places where a `pkgs` is expected. - # (earlier stages being the various `super` variables - # that precede all-packages.nix) + # While earlier stages of nixpkgs fixpoint construction are supertypes of this + # stage, they're generally not usable in places where a `pkgs` is expected. + # (earlier stages being the various `super` variables that precede + # all-packages.nix) _type = "pkgs"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, - # it uses GCC compiled with multilib support; on i686-linux, it's - # just the plain stdenv. + # A stdenv capable of building 32-bit binaries. + # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux, + # it's just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); stdenvNoCC = stdenv.override ( @@ -39,8 +38,8 @@ with pkgs; # TODO: This is a hack to use stdenvNoCC to produce a CF when cross # compiling. It's not very sound. The cross stdenv has: # extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ] - # and uses stdenvNoCC. In order to make this not infinitely recursive, we need to exclude - # this extraBuildInput. + # and uses stdenvNoCC. In order to make this not infinitely recursive, we + # need to exclude this extraBuildInput. extraBuildInputs = []; } ); @@ -84,7 +83,6 @@ with pkgs; # For convenience, allow callers to get the path to Nixpkgs. path = ../..; - ### Helper functions. inherit lib config overlays; @@ -264,6 +262,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + automatic-timezoned = callPackage ../tools/system/automatic-timezoned { }; + cve = with python3Packages; toPythonApplication cvelib; fiche = callPackage ../servers/fiche { }; @@ -450,9 +450,7 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - datalad = callPackage ../applications/version-management/datalad { - python3 = python39; # `boto` currently broken with Python3.10 - }; + datalad = callPackage ../applications/version-management/datalad { }; dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; @@ -460,6 +458,8 @@ with pkgs; dhallToNix = callPackage ../build-support/dhall/to-nix.nix { }; + dinghy = with python3Packages; toPythonApplication dinghy; + deadcode = callPackage ../development/tools/deadcode { }; deadnix = callPackage ../development/tools/deadnix { }; @@ -480,10 +480,14 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + enumer = callPackage ../tools/misc/enumer { }; + evans = callPackage ../development/tools/evans { }; expressvpn = callPackage ../applications/networking/expressvpn { }; + figma-linux = callPackage ../applications/graphics/figma-linux {}; + firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; frece = callPackage ../development/tools/frece { }; @@ -504,6 +508,8 @@ with pkgs; hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; + honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { }; + html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; @@ -562,6 +568,8 @@ with pkgs; riot-redis = callPackage ../development/tools/riot-redis { }; + r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; + ptouch-print = callPackage ../misc/ptouch-print { }; demoit = callPackage ../servers/demoit { }; @@ -600,8 +608,7 @@ with pkgs; archiver = callPackage ../applications/misc/archiver { }; - # It segfaults if it uses qt5.15 - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -627,6 +634,8 @@ with pkgs; docker-sync = callPackage ../tools/misc/docker-sync { }; + undocker = callPackage ../tools/misc/undocker { }; + dockle = callPackage ../development/tools/dockle { }; docui = callPackage ../tools/misc/docui { }; @@ -678,6 +687,8 @@ with pkgs; dispad = callPackage ../tools/X11/dispad { }; + diswall = callPackage ../applications/networking/diswall { }; + dupeguru = callPackage ../applications/misc/dupeguru { }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -769,6 +780,8 @@ with pkgs; pet = callPackage ../development/tools/pet { }; + pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear {}; + pkger = callPackage ../development/libraries/pkger { }; tapview = callPackage ../development/tools/tapview { }; @@ -786,6 +799,7 @@ with pkgs; mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; + antlr = antlr4_10; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; icu = icu69; @@ -794,10 +808,20 @@ with pkgs; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; - fetchpatch = callPackage ../build-support/fetchpatch { } - // { - tests = pkgs.tests.fetchpatch; - }; + fetchpatch = callPackage ../build-support/fetchpatch { + # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 + patchutils = buildPackages.patchutils_0_3_3; + } // { + tests = pkgs.tests.fetchpatch; + version = 1; + }; + + fetchpatch2 = callPackage ../build-support/fetchpatch { + patchutils = buildPackages.patchutils_0_4_2; + } // { + tests = pkgs.tests.fetchpatch2; + version = 2; + }; fetchs3 = callPackage ../build-support/fetchs3 { }; @@ -941,6 +965,8 @@ with pkgs; makeAutostartItem = callPackage ../build-support/make-startupitem { }; + makeImpureTest = callPackage ../build-support/make-impure-test.nix; + makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out makeInitrdNG = callPackage ../build-support/kernel/make-initrd-ng.nix; @@ -985,6 +1011,10 @@ with pkgs; octant-desktop = callPackage ../applications/networking/cluster/octant/desktop.nix { }; starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { }; + inherit ( + callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } + ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } @@ -1002,6 +1032,8 @@ with pkgs; sirula = callPackage ../tools/wayland/sirula { }; + sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen {}; + srcOnly = callPackage ../build-support/src-only { }; subnetcalc = callPackage ../tools/networking/subnetcalc { }; @@ -1078,6 +1110,8 @@ with pkgs; { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; + patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files {}; + #package writers writers = callPackage ../build-support/writers {}; @@ -1104,6 +1138,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + aaa = callPackage ../tools/misc/aaa {}; + aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -1228,6 +1264,8 @@ with pkgs; agi = callPackage ../tools/graphics/agi { }; + agola = callPackage ../development/tools/continuous-integration/agola { }; + agrep = callPackage ../tools/text/agrep { }; aha = callPackage ../tools/text/aha { }; @@ -1283,7 +1321,9 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; - butler = callPackage ../games/itch/butler.nix { }; + butler = callPackage ../games/itch/butler.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; cf-vault = callPackage ../tools/admin/cf-vault { }; @@ -1293,6 +1333,8 @@ with pkgs; cidrgrep = callPackage ../tools/text/cidrgrep { }; + clematis = callPackage ../tools/misc/clematis { }; + cope = callPackage ../tools/misc/cope { }; ejson2env = callPackage ../tools/admin/ejson2env { }; @@ -1357,7 +1399,7 @@ with pkgs; kanata = callPackage ../tools/system/kanata { }; - kanata-with-cmd = callPackage ../tools/system/kanata { withCmd = true; }; + kanata-with-cmd = kanata.override { withCmd = true; }; ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; @@ -1377,6 +1419,8 @@ with pkgs; midi-trigger = callPackage ../applications/audio/midi-trigger { }; + mnc = callPackage ../tools/misc/mnc { }; + mprocs = callPackage ../tools/misc/mprocs { }; nominatim = callPackage ../servers/nominatim { }; @@ -1389,7 +1433,7 @@ with pkgs; q = callPackage ../tools/networking/q {}; - qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; + qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; quich = callPackage ../tools/misc/quich { } ; @@ -1409,6 +1453,8 @@ with pkgs; spectre-cli = callPackage ../tools/security/spectre-cli { }; + steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {}; + sx-go = callPackage ../tools/security/sx-go { }; systeroid = callPackage ../tools/system/systeroid { }; @@ -1427,10 +1473,14 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; + toast = callPackage ../development/tools/toast { }; + topicctl = callPackage ../tools/misc/topicctl { }; ttchat = callPackage ../tools/misc/ttchat { }; + unflac = callPackage ../tools/audio/unflac { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { @@ -1449,7 +1499,6 @@ with pkgs; winbox = callPackage ../tools/admin/winbox { wine = wineWowPackages.staging; - use64 = true; }; wwcd = callPackage ../tools/misc/wwcd { }; @@ -1458,6 +1507,8 @@ with pkgs; xcd = callPackage ../tools/misc/xcd { }; + xpaste = callPackage ../tools/text/xpaste { }; + xrootd = callPackage ../tools/networking/xrootd { }; xtrt = callPackage ../tools/archivers/xtrt { }; @@ -1480,6 +1531,389 @@ with pkgs; zq = callPackage ../development/tools/zq { }; + ### APPLICATIONS/VERSION-MANAGEMENT/GIT-AND-TOOLS + + git = callPackage ../applications/version-management/git-and-tools/git { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; + smtpPerlLibs = [ + perlPackages.libnet perlPackages.NetSMTPSSL + perlPackages.IOSocketSSL perlPackages.NetSSLeay + perlPackages.AuthenSASL perlPackages.DigestHMAC + ]; + }; + + # The full-featured Git. + gitFull = git.override { + svnSupport = true; + guiSupport = true; + sendEmailSupport = true; + withSsh = true; + withLibsecret = !stdenv.isDarwin; + }; + + # Git with SVN support, but without GUI. + gitSVN = lowPrio (git.override { svnSupport = true; }); + + git-doc = lib.addMetaAttrs { + description = "Additional documentation for Git"; + longDescription = '' + This package contains additional documentation (HTML and text files) that + is referenced in the man pages of Git. + ''; + } gitFull.doc; + + gitMinimal = git.override { + withManual = false; + pythonSupport = false; + perlSupport = false; + withpcre2 = false; + }; + + bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { }; + + bit = callPackage ../applications/version-management/git-and-tools/bit { }; + + bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; + + bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + + cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; + + cgit-pink = callPackage ../applications/version-management/git-and-tools/cgit/pink.nix { }; + + conform = callPackage ../applications/version-management/git-and-tools/conform { }; + + darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; + + delta = callPackage ../applications/version-management/git-and-tools/delta { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; + }; + + diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; + + gex = callPackage ../applications/version-management/git-and-tools/gex { }; + + gfold = callPackage ../applications/version-management/git-and-tools/gfold { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { }; + + gitoxide = callPackage ../applications/version-management/git-and-tools/gitoxide { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + + gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; + + github-cli = gh; + gh = callPackage ../applications/version-management/git-and-tools/gh { }; + + ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { }; + + ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; + + ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; + + git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-aggregator = callPackage ../applications/version-management/git-and-tools/git-aggregator { }; + + git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui { + inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; + }; + + git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx { + inherit (python3Packages) + buildPythonApplication + fetchPypi + dropbox + annexremote + humanfriendly; + }; + + git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive { + inherit (python3Packages) + buildPythonApplication + fetchPypi + annexremote + drivelib + gitpython + tenacity + humanfriendly; + }; + + git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { }; + + git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { }; + + git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise { }; + + git-backup = callPackage ../applications/version-management/git-and-tools/git-backup { + openssl = openssl_1_1; + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; + + git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + + git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { }; + + git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { }; + + git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + + git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; + + git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { }; + + git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { }; + + git-crecord = callPackage ../applications/version-management/git-and-tools/git-crecord { }; + + git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { }; + + git-credential-keepassxc = callPackage ../applications/version-management/git-and-tools/git-credential-keepassxc { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; + + git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { }; + + git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { }; + + git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { }; + + git-fame = callPackage ../applications/version-management/git-and-tools/git-fame { }; + + git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; + + git-fire = callPackage ../applications/version-management/git-and-tools/git-fire { }; + + git-ftp = callPackage ../applications/version-management/git-and-tools/git-ftp { }; + + git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-hound = callPackage ../applications/version-management/git-and-tools/git-hound { }; + + git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; + + git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { }; + + git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { }; + + git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-lfs = lowPrio (callPackage ../applications/version-management/git-and-tools/git-lfs { }); + + git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; + + git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { }; + + git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + + git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { }; + + git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; + + git-privacy = callPackage ../applications/version-management/git-and-tools/git-privacy { }; + + git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; + + git-quick-stats = callPackage ../applications/version-management/git-and-tools/git-quick-stats { }; + + git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + + git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { }; + + git-recent = callPackage ../applications/version-management/git-and-tools/git-recent { + util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; + }; + + git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; + + gitRepo = git-repo; + git-repo = callPackage ../applications/version-management/git-and-tools/git-repo { }; + + git-repo-updater = python3Packages.callPackage ../applications/version-management/git-and-tools/git-repo-updater { }; + + git-review = python3Packages.callPackage ../applications/version-management/git-and-tools/git-review { }; + + git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { }; + + git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { }; + + git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { }; + + git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { }; + + git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; + + git-series = callPackage ../applications/version-management/git-and-tools/git-series { + openssl = openssl_1_1; + }; + + git-sizer = callPackage ../applications/version-management/git-and-tools/git-sizer { }; + + git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { }; + + git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { }; + + git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { }; + + git-subset = callPackage ../applications/version-management/git-and-tools/git-subset { + openssl = openssl_1_1; + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { }; + + git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { }; + + git-team = callPackage ../applications/version-management/git-and-tools/git-team { }; + + git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; + + git-town = callPackage ../applications/version-management/git-and-tools/git-town { }; + + git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { + openssl = openssl_1_1; + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git-up = callPackage ../applications/version-management/git-and-tools/git-up { + pythonPackages = python3Packages; + }; + + git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { }; + + git-vendor = callPackage ../applications/version-management/git-and-tools/git-vendor { }; + + git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { }; + + git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { }; + + gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { }; + + gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { }; + + gitfs = callPackage ../tools/filesystems/gitfs { }; + + gitless = callPackage ../applications/version-management/git-and-tools/gitless { }; + + gitlint = python3Packages.callPackage ../applications/version-management/git-and-tools/gitlint { }; + + gitls = callPackage ../applications/version-management/git-and-tools/gitls { }; + + gitmux = callPackage ../applications/version-management/git-and-tools/gitmux { }; + + gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; + + gitsign = callPackage ../applications/version-management/git-and-tools/gitsign { }; + + gitstats = callPackage ../applications/version-management/git-and-tools/gitstats { }; + + gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; + + gitty = callPackage ../applications/version-management/git-and-tools/gitty { }; + + gitui = callPackage ../applications/version-management/git-and-tools/gitui { + inherit (darwin.apple_sdk.frameworks) Security AppKit; + }; + + gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; + + glab = callPackage ../applications/version-management/git-and-tools/glab { }; + + glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; + + gst = callPackage ../applications/version-management/git-and-tools/gst { }; + + hub = callPackage ../applications/version-management/git-and-tools/hub { }; + + hut = callPackage ../applications/version-management/git-and-tools/hut { }; + + josh = callPackage ../applications/version-management/git-and-tools/josh { }; + + lab = callPackage ../applications/version-management/git-and-tools/lab { }; + + lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { }; + + legit = callPackage ../applications/version-management/git-and-tools/legit { }; + + lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; + + pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; + + qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { }; + + radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli { + inherit (darwin) DarwinTools; + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + + radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream { }; + + rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; + + scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; + + stgit = callPackage ../applications/version-management/git-and-tools/stgit { }; + + subgit = callPackage ../applications/version-management/git-and-tools/subgit { }; + + svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { }; + + svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { + git = gitSVN; + }; + + thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; + + tig = callPackage ../applications/version-management/git-and-tools/tig { + readline = readline81; + }; + + top-git = callPackage ../applications/version-management/git-and-tools/topgit { }; + + transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { }; + + inherit (haskellPackages) git-annex; + + inherit (haskellPackages) git-brunch; + + git-autofixup = perlPackages.GitAutofixup; + + ghrepo-stats = with python3Packages; toPythonApplication ghrepo-stats; + + git-filter-repo = with python3Packages; toPythonApplication git-filter-repo; + + git-revise = with python3Packages; toPythonApplication git-revise; + ### APPLICATIONS/EMULATORS atari800 = callPackage ../applications/emulators/atari800 { }; @@ -1491,7 +1925,8 @@ with pkgs; basiliskii = callPackage ../applications/emulators/basiliskii { }; bochs = callPackage ../applications/emulators/bochs { - wxGTK = wxGTK30; + inherit (darwin) libobjc; + wxGTK = wxGTK32; }; box64 = callPackage ../applications/emulators/box64 { }; @@ -1504,6 +1939,8 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; + cemu = callPackage ../applications/emulators/cemu { }; + cen64 = callPackage ../applications/emulators/cen64 { }; citra-canary = callPackage ../applications/emulators/citra { @@ -1530,7 +1967,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; + duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; @@ -1538,7 +1975,10 @@ with pkgs; emulationstation = callPackage ../applications/emulators/emulationstation { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + fceux = callPackage ../applications/emulators/fceux { + lua = lua5_1; + inherit (libsForQt5) wrapQtAppsHook; + }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; @@ -1582,11 +2022,15 @@ with pkgs; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; + ludusavi = callPackage ../applications/backup/ludusavi { }; + maiko = callPackage ../applications/emulators/maiko { }; - mame = libsForQt514.callPackage ../applications/emulators/mame { - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; - }; + mame = libsForQt5.callPackage ../applications/emulators/mame { }; + + mame-tools = lib.addMetaAttrs { + description = mame.meta.description + " (tools only)"; + } (lib.getOutput "tools" mame); mednafen = callPackage ../applications/emulators/mednafen { inherit (darwin) libiconv; @@ -1623,7 +2067,7 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; pcsx2 = callPackage ../applications/emulators/pcsx2 { - wxGTK = wxGTK30-gtk3; + wxGTK = wxGTK30; }; pcsxr = callPackage ../applications/emulators/pcsxr { }; @@ -1727,10 +2171,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/RETROARCH - retroarchBare = callPackage ../applications/emulators/retroarch { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - }; + retroarchBare = callPackage ../applications/emulators/retroarch { }; retroarchFull = retroarch.override { cores = builtins.filter @@ -1750,6 +2191,8 @@ with pkgs; retroarch = retroarchBare; }); + libretro-core-info = callPackage ../applications/emulators/retroarch/libretro-core-info.nix { }; + kodi-retroarch-advanced-launchers = callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; @@ -2033,9 +2476,10 @@ with pkgs; android-backup-extractor = callPackage ../tools/backup/android-backup-extractor {}; - android-tools = lowPrio (callPackage ../tools/misc/android-tools { - stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv; - }); + android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools + (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) { + stdenv = gcc10Stdenv; + })); anewer = callPackage ../tools/text/anewer { }; @@ -2091,10 +2535,7 @@ with pkgs; arandr = callPackage ../tools/X11/arandr { }; - inherit (callPackages ../servers/nosql/arangodb { - stdenv = gcc8Stdenv; - }) arangodb_3_3 arangodb_3_4 arangodb_3_5; - arangodb = arangodb_3_4; + arangodb = callPackage ../servers/nosql/arangodb { }; # arcanist currently crashes with some workflows on php8.1, use 8.0 arcanist = callPackage ../development/tools/misc/arcanist { php = php80; }; @@ -2114,7 +2555,7 @@ with pkgs; apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; - apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; argagg = callPackage ../development/libraries/argagg { }; @@ -2165,7 +2606,6 @@ with pkgs; asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2; }; - gsl = gsl_1; }; async = callPackage ../development/tools/async {}; @@ -2254,7 +2694,7 @@ with pkgs; brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: @@ -2330,6 +2770,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + asusctl = callPackage ../applications/system/asusctl { }; + autorevision = callPackage ../tools/misc/autorevision { }; automirror = callPackage ../tools/misc/automirror { }; @@ -2358,8 +2800,6 @@ with pkgs; electron = electron_13; }; - bit = callPackage ../applications/version-management/git-and-tools/bit { }; - bitwarden = callPackage ../tools/security/bitwarden { }; inherit (nodePackages) bitwarden-cli; @@ -2494,6 +2934,8 @@ with pkgs; buildGoModule = buildGo118Module; # tests fail with 1.19 }; + writeCueValidator = callPackage ../development/tools/cue/validator.nix { }; + cuelsp = callPackage ../development/tools/cuelsp {}; cyclone-scheme = callPackage ../development/interpreters/cyclone { }; @@ -2625,18 +3067,6 @@ with pkgs; gem = callPackage ../applications/audio/pd-plugins/gem { }; - git-fire = callPackage ../tools/misc/git-fire { }; - - git-privacy = callPackage ../development/tools/git-privacy { }; - - git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; - - git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; - - git-revise = with python3Packages; toPythonApplication git-revise; - - git-town = callPackage ../tools/misc/git-town { }; - github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; github-commenter = callPackage ../development/tools/github-commenter { }; @@ -2647,14 +3077,8 @@ with pkgs; github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; - gitless = callPackage ../applications/version-management/gitless { }; - - gitls = callPackage ../tools/security/gitls { }; - gistyc = with python3Packages; toPythonApplication gistyc; - gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; - gitter = callPackage ../applications/networking/instant-messengers/gitter { }; gjs = callPackage ../development/libraries/gjs { }; @@ -2677,6 +3101,11 @@ with pkgs; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; + go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications; + }; + go2tv-lite = go2tv.override { withGui = false; }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; @@ -2765,8 +3194,12 @@ with pkgs; ipgrep = callPackage ../tools/networking/ipgrep { }; + ipp-usb = callPackage ../os-specific/linux/ipp-usb { }; + itch = callPackage ../games/itch {}; + itd = callPackage ../applications/misc/itd { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -2793,8 +3226,6 @@ with pkgs; passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; - pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; - pass-nodmenu = callPackage ../tools/security/pass { dmenuSupport = false; pass = pass-nodmenu; @@ -2907,6 +3338,8 @@ with pkgs; sshs = callPackage ../development/tools/sshs { }; + supergfxctl = callPackage ../applications/system/supergfxctl { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -3048,6 +3481,8 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; + BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; + beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -3101,8 +3536,6 @@ with pkgs; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; - blitz = callPackage ../development/libraries/blitz { }; blockbook = callPackage ../servers/blockbook { }; @@ -3188,7 +3621,7 @@ with pkgs; bookstack = callPackage ../servers/web-apps/bookstack { }; # Upstream recommends qt5.12 and it doesn't build with qt5.15 - boomerang = libsForQt512.callPackage ../development/tools/boomerang { }; + boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -3316,7 +3749,7 @@ with pkgs; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt515.callPackage ../tools/misc/calamares { + calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = boost.override { enablePython = true; python = python3; }; }; @@ -3432,7 +3865,7 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { }; - cloudflare-dyndns = python3Packages.cloudflare-dyndns; + cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; @@ -3440,7 +3873,7 @@ with pkgs; clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; - clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; }; + clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; @@ -3522,6 +3955,8 @@ with pkgs; swaysome = callPackage ../tools/wayland/swaysome { }; + swayimg = callPackage ../tools/wayland/swayimg { }; + swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; @@ -3552,6 +3987,8 @@ with pkgs; wlopm = callPackage ../tools/wayland/wlopm { }; + wlprop = callPackage ../tools/wayland/wlprop {}; + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; wlrctl = callPackage ../tools/wayland/wlrctl { }; @@ -3629,6 +4066,8 @@ with pkgs; crossplane = with python3Packages; toPythonApplication crossplane; + crowdsec = callPackage ../tools/security/crowdsec { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -3801,7 +4240,7 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; }; + djv = callPackage ../applications/graphics/djv { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -3861,6 +4300,8 @@ with pkgs; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + dynamic-wallpaper = callPackage ../tools/graphics/dynamic-wallpaper { }; + dyncall = callPackage ../development/libraries/dyncall { }; dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; @@ -3875,6 +4316,8 @@ with pkgs; easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { }; + easyocr = with python3.pkgs; toPythonApplication easyocr; + EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; ecasound = callPackage ../applications/audio/ecasound { }; @@ -3943,6 +4386,8 @@ with pkgs; esptool = callPackage ../tools/misc/esptool { }; + esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; + esptool-ck = callPackage ../tools/misc/esptool-ck { }; ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; @@ -4021,6 +4466,8 @@ with pkgs; frawk = callPackage ../tools/text/frawk { }; + frei = callPackage ../tools/misc/frei { }; + fselect = callPackage ../tools/misc/fselect { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -4029,6 +4476,51 @@ with pkgs; fsql = callPackage ../tools/misc/fsql { }; + ### TOOLS/TYPESETTING/TEX + + auctex = callPackage ../tools/typesetting/tex/auctex { }; + + blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; + + dblatex = callPackage ../tools/typesetting/tex/dblatex { }; + + dblatexFull = dblatex.override { enableAllFeatures = true; }; + + latexrun = callPackage ../tools/typesetting/tex/latexrun { }; + + lkproof = callPackage ../tools/typesetting/tex/lkproof { }; + + mftrace = callPackage ../tools/typesetting/tex/mftrace { }; + + # Keep the old PGF since some documents don't render properly with + # the new one. + pgf1 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-1.x.nix { }; + + pgf2 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-2.x.nix { }; + + pgf3 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-3.x.nix { }; + + pgf = pgf2; + + pgf-pie = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-pie.nix { }; + + pgf-umlcd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix { }; + + pgf-umlsd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix { }; + + pgfplots = callPackage ../tools/typesetting/tex/pgf-tikz/pgfplots.nix { }; + + pplatex = callPackage ../tools/typesetting/tex/pplatex { }; + + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; + + tex-match = callPackage ../tools/typesetting/tex/tex-match { }; + + texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; + + # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive + texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { }); + fop = callPackage ../tools/typesetting/fop { jdk = openjdk8; }; @@ -4079,10 +4571,7 @@ with pkgs; gdu = callPackage ../tools/system/gdu { }; - go-chromecast = callPackage ../applications/video/go-chromecast { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; @@ -4192,8 +4681,6 @@ with pkgs; grim = callPackage ../tools/graphics/grim { }; - gringo = callPackage ../tools/misc/gringo { }; - grit = callPackage ../tools/misc/grit { }; grobi = callPackage ../tools/X11/grobi { }; @@ -4252,9 +4739,13 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { + stdenv = gcc11Stdenv; + }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { + stdenv = gcc11Stdenv; + }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -4324,7 +4815,9 @@ with pkgs; karma = callPackage ../servers/monitoring/karma { }; - kaldi = callPackage ../tools/audio/kaldi { }; + kaldi = callPackage ../tools/audio/kaldi { + inherit (darwin.apple_sdk.frameworks) Accelerate; + }; kalker = callPackage ../tools/misc/kalker { }; @@ -4439,6 +4932,9 @@ with pkgs; mapcidr = callPackage ../tools/misc/mapcidr { }; + maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5; + maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5; + marl = callPackage ../development/libraries/marl {}; marlin-calc = callPackage ../tools/misc/marlin-calc {}; @@ -4509,6 +5005,8 @@ with pkgs; mmctl = callPackage ../tools/misc/mmctl { }; + moar = callPackage ../tools/misc/moar { }; + molly-brown = callPackage ../servers/gemini/molly-brown { }; monetdb = callPackage ../servers/sql/monetdb { }; @@ -4601,6 +5099,8 @@ with pkgs; nsync = callPackage ../development/libraries/nsync { }; + nsz = with python3.pkgs; toPythonApplication nsz; + nwipe = callPackage ../tools/security/nwipe { }; nx2elf = callPackage ../tools/compression/nx2elf { }; @@ -4611,6 +5111,8 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; + oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -4621,6 +5123,8 @@ with pkgs; orjail = callPackage ../tools/security/orjail { }; + online-judge-template-generator = python3Packages.callPackage ../tools/misc/online-judge-template-generator { }; + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; onnxruntime = callPackage ../development/libraries/onnxruntime { @@ -4677,6 +5181,8 @@ with pkgs; photon = callPackage ../tools/networking/photon { }; + photoprism = callPackage ../servers/photoprism { }; + piglit = callPackage ../tools/graphics/piglit { }; pika = callPackage ../applications/graphics/pika { }; @@ -4685,9 +5191,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_14; - }; + pocket-casts = callPackage ../applications/audio/pocket-casts { }; pouf = callPackage ../tools/misc/pouf { }; @@ -4703,6 +5207,8 @@ with pkgs; precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { }; + proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { }; + pueue = callPackage ../applications/misc/pueue { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -4711,10 +5217,7 @@ with pkgs; pixiecore = callPackage ../tools/networking/pixiecore {}; - waitron = callPackage ../tools/networking/waitron { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + waitron = callPackage ../tools/networking/waitron { }; pyCA = python3Packages.callPackage ../applications/video/pyca {}; @@ -4766,7 +5269,9 @@ with pkgs; shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { }; + sheldon = callPackage ../tools/misc/sheldon { + inherit (darwin.apple_sdk.frameworks) Security; + }; shell-hist = callPackage ../tools/misc/shell-hist { }; @@ -4790,6 +5295,10 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + smokegen = callPackage ../development/libraries/smokegen {}; + + smokeqt = callPackage ../development/libraries/smokeqt {}; + snazy = callPackage ../development/tools/snazy { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -4802,7 +5311,9 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; + srvc = callPackage ../applications/version-management/srvc { + inherit (darwin.apple_sdk.frameworks) Security; + }; ssmsh = callPackage ../tools/admin/ssmsh { }; @@ -4958,8 +5469,6 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appleseed = callPackage ../tools/graphics/appleseed { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; arping = callPackage ../tools/networking/arping { }; @@ -5016,6 +5525,10 @@ with pkgs; bbe = callPackage ../tools/misc/bbe { }; + bkcrack = callPackage ../tools/security/bkcrack { + inherit (llvmPackages) openmp; + }; + bdsync = callPackage ../tools/backup/bdsync { }; beamerpresenter = beamerpresenter-mupdf; @@ -5051,8 +5564,6 @@ with pkgs; bettercap = callPackage ../tools/security/bettercap { }; - bfg-repo-cleaner = callPackage ../applications/version-management/git-and-tools/bfg-repo-cleaner { }; - bfs = callPackage ../tools/system/bfs { }; bgs = callPackage ../tools/X11/bgs { }; @@ -5068,8 +5579,6 @@ with pkgs; birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; - blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; - blueberry = callPackage ../tools/bluetooth/blueberry { }; blueman = callPackage ../tools/bluetooth/blueman { }; @@ -5080,6 +5589,8 @@ with pkgs; bogofilter = callPackage ../tools/misc/bogofilter { }; + bomber-go = callPackage ../development/tools/bomber-go { }; + bomutils = callPackage ../tools/archivers/bomutils { }; boofuzz= callPackage ../tools/security/boofuzz { }; @@ -5092,8 +5603,6 @@ with pkgs; btar = callPackage ../tools/backup/btar { }; - bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; - bumpver = callPackage ../applications/version-management/bumpver { }; bup = callPackage ../tools/backup/bup { }; @@ -5134,7 +5643,9 @@ with pkgs; cadaver = callPackage ../tools/networking/cadaver { }; - davix = callPackage ../tools/networking/davix { }; + davix = callPackage ../tools/networking/davix { + inherit (darwin.apple_sdk.frameworks) Security; + }; davix-copy = davix.override { enableThirdPartyCopy = true; }; @@ -5170,9 +5681,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; - cemu = qt5.callPackage ../applications/science/math/cemu { - stdenv = gcc9Stdenv; - }; + cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; cider = callPackage ../applications/audio/cider { }; @@ -5189,8 +5698,6 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; - # needs to be the same openssl version as python/pyopenssl - curl = (curl.override { openssl = openssl_1_1; }); }) ceph ceph-client; @@ -5253,16 +5760,13 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_21_01_0 - citrix_workspace_21_03_0 - citrix_workspace_21_06_0 - citrix_workspace_21_08_0 citrix_workspace_21_09_0 citrix_workspace_21_12_0 citrix_workspace_22_05_0 citrix_workspace_22_07_0 + citrix_workspace_22_12_0 ; - citrix_workspace = citrix_workspace_22_07_0; + citrix_workspace = citrix_workspace_22_12_0; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -5274,7 +5778,12 @@ with pkgs; crlfuzz = callPackage ../tools/security/crlfuzz {}; - hedgedoc = callPackage ../servers/web-apps/hedgedoc { }; + hedgedoc = callPackage ../servers/web-apps/hedgedoc { + inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { + nodejs = nodejs-16_x; + }) mkYarnPackage; + nodejs = nodejs-16_x; + }; colord = callPackage ../tools/misc/colord { }; @@ -5288,24 +5797,21 @@ with pkgs; conspy = callPackage ../os-specific/linux/conspy {}; - inherit (callPackage ../tools/networking/connman {}) + connmanPackages = + recurseIntoAttrs (callPackage ../tools/networking/connman { }); + inherit (connmanPackages) connman connmanFull connmanMinimal + connman_dmenu + connman-gtk + connman-ncurses + connman-notify ; - connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; - - connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { }; - - connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - - connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; - convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -5321,10 +5827,6 @@ with pkgs; ethash = callPackage ../development/libraries/ethash { }; - ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; - ethminer-cuda = ethminer.override { cudaSupport = true; }; - ethminer-free = ethminer.override { cudaSupport = false; }; - cuetools = callPackage ../tools/cd-dvd/cuetools { }; u3-tool = callPackage ../tools/filesystems/u3-tool { }; @@ -5476,6 +5978,8 @@ with pkgs; artim-dark = callPackage ../data/themes/artim-dark {}; + bbin = callPackage ../development/tools/bbin {}; + bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -5692,7 +6196,9 @@ with pkgs; daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/backup/dar { }; + dar = callPackage ../tools/backup/dar { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; darkhttpd = callPackage ../servers/http/darkhttpd { }; @@ -5702,15 +6208,7 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 - - # TODO: remove once maven uses JDK 11 - # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 - maven = maven.override { - jdk = jdk11; - }; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -5736,10 +6234,6 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; - delta = callPackage ../applications/version-management/git-and-tools/delta { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; - }; - deno = callPackage ../development/web/deno { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) @@ -5766,6 +6260,8 @@ with pkgs; dd_rescue = callPackage ../tools/system/dd_rescue { }; + ddh = callPackage ../tools/system/ddh { }; + ddrescue = callPackage ../tools/system/ddrescue { }; ddrescueview = callPackage ../tools/system/ddrescueview { }; @@ -5773,7 +6269,7 @@ with pkgs; ddrutility = callPackage ../tools/system/ddrutility { }; inherit (callPackages ../applications/networking/p2p/deluge { - libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x; }) deluge-gtk deluged @@ -5785,6 +6281,8 @@ with pkgs; dfc = callPackage ../tools/system/dfc { }; + dfrs = callPackage ../tools/system/dfrs { }; + dev86 = callPackage ../development/compilers/dev86 { }; diskrsync = callPackage ../tools/backup/diskrsync { }; @@ -5831,8 +6329,6 @@ with pkgs; diction = callPackage ../tools/text/diction { }; - diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; - diffoscopeMinimal = callPackage ../tools/misc/diffoscope { jdk = jdk8; }; @@ -5936,11 +6432,15 @@ with pkgs; sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { - wxGTK = wxGTK30; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; sladeUnstable = callPackage ../applications/misc/slade/git.nix { - wxGTK = wxGTK30; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; drive = callPackage ../applications/networking/drive { }; @@ -6143,9 +6643,7 @@ with pkgs; teamocil = callPackage ../tools/misc/teamocil { }; - the-way = callPackage ../development/tools/the-way { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; + the-way = callPackage ../development/tools/the-way { }; timeline = callPackage ../applications/office/timeline { }; @@ -6248,7 +6746,9 @@ with pkgs; choose = callPackage ../tools/text/choose { }; - conform = callPackage ../applications/version-management/git-and-tools/conform { }; + d2 = callPackage ../tools/text/d2 { }; + + easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { llvmPackages = llvmPackages_14; @@ -6362,6 +6862,8 @@ with pkgs; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; + evcc = callPackage ../servers/home-automation/evcc { }; + eventstat = callPackage ../os-specific/linux/eventstat { }; evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; @@ -6378,14 +6880,7 @@ with pkgs; exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { }; - exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isDarwin then stdenv - else if stdenv.isi686 then gcc6Stdenv - else gcc9Stdenv; - boost = if stdenv.isDarwin then boost else boost15x; - }; - - execline = skawarePackages.execline; + exempi = callPackage ../development/libraries/exempi { }; executor = with python3Packages; toPythonApplication executor; @@ -6547,6 +7042,8 @@ with pkgs; fluent-bit = callPackage ../tools/misc/fluent-bit { }; + fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { }; + flux = callPackage ../development/compilers/flux { }; fido2luks = callPackage ../tools/security/fido2luks {}; @@ -6671,7 +7168,7 @@ with pkgs; fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix {}; footswitch = callPackage ../tools/inputmethods/footswitch { }; @@ -6682,7 +7179,6 @@ with pkgs; fortune = callPackage ../tools/misc/fortune { }; fox = callPackage ../development/libraries/fox { - libpng = libpng12; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6753,8 +7249,6 @@ with pkgs; fsarchiver = callPackage ../tools/archivers/fsarchiver { }; - fsfs = callPackage ../tools/filesystems/fsfs { }; - fstl = qt5.callPackage ../applications/graphics/fstl { }; fswebcam = callPackage ../os-specific/linux/fswebcam { }; @@ -6884,8 +7378,6 @@ with pkgs; gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gex = callPackage ../applications/version-management/git-and-tools/gex { }; - gftp = callPackage ../applications/networking/ftp/gftp { gtk = gtk2; }; @@ -6894,28 +7386,12 @@ with pkgs; gfbgraph = callPackage ../development/libraries/gfbgraph { }; - gfold = callPackage ../applications/version-management/git-and-tools/gfold { - inherit (darwin.apple_sdk.frameworks) Security; - }; - ggobi = callPackage ../tools/graphics/ggobi { }; - gh = callPackage ../applications/version-management/git-and-tools/gh { }; - - ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { }; - ghost = callPackage ../tools/security/ghost { }; ghostunnel = callPackage ../tools/networking/ghostunnel { }; - ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; - - gst = callPackage ../applications/version-management/git-and-tools/gst { }; - - ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; - - ghrepo-stats = with python3Packages; toPythonApplication ghrepo-stats; - ghz = callPackage ../tools/networking/ghz { }; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; @@ -6926,201 +7402,11 @@ with pkgs; gifski = callPackage ../tools/graphics/gifski { }; - git-absorb = callPackage ../applications/version-management/git-and-tools/git-absorb { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - inherit (haskellPackages) git-annex; - - git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-and-tools/git-annex-metadata-gui { - inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; - }; - - git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx { - inherit (python3Packages) - buildPythonApplication - fetchPypi - dropbox - annexremote - humanfriendly; - }; - - git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive { - inherit (python3Packages) - buildPythonApplication - fetchPypi - annexremote - drivelib - GitPython - tenacity - humanfriendly; - }; - - git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { }; - - git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { }; - - git-appraise = callPackage ../applications/version-management/git-and-tools/git-appraise {}; - - git-backup = callPackage ../applications/version-management/git-backup { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; - - git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - - inherit (haskellPackages) git-brunch; - - git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { }; - - git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { }; - - git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - - git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; - - git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { }; - - git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { }; - - git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { }; - - git-crecord = callPackage ../applications/version-management/git-crecord { }; - - git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { }; - - git-delete-merged-branches = callPackage ../applications/version-management/git-and-tools/git-delete-merged-branches { }; - - git-extras = callPackage ../applications/version-management/git-and-tools/git-extras { }; - - git-fame = callPackage ../applications/version-management/git-and-tools/git-fame {}; - - git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; - - git-filter-repo = with python3Packages; toPythonApplication git-filter-repo; - - git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-hound = callPackage ../tools/security/git-hound { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; - - git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; - - git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { }; - - git-imerge = python3Packages.callPackage ../applications/version-management/git-and-tools/git-imerge { }; - - git-interactive-rebase-tool = callPackage ../applications/version-management/git-and-tools/git-interactive-rebase-tool { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); - - git-ftp = callPackage ../development/tools/git-ftp { }; - - git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { }; - - git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; - - git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; - - git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { }; - - git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; - - git-quickfix = callPackage ../applications/version-management/git-and-tools/git-quickfix { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - - git-radar = callPackage ../applications/version-management/git-and-tools/git-radar { }; - - git-recent = callPackage ../applications/version-management/git-and-tools/git-recent { - util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; - }; - - git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-and-tools/git-remote-codecommit { }; - - git-remote-gcrypt = callPackage ../applications/version-management/git-and-tools/git-remote-gcrypt { }; - - git-remote-hg = callPackage ../applications/version-management/git-and-tools/git-remote-hg { }; - - git-reparent = callPackage ../applications/version-management/git-and-tools/git-reparent { }; - - git-secret = callPackage ../applications/version-management/git-and-tools/git-secret { }; - - git-secrets = callPackage ../applications/version-management/git-and-tools/git-secrets { }; - - git-series = callPackage ../development/tools/git-series { - openssl = openssl_1_1; - }; - - git-sizer = callPackage ../applications/version-management/git-sizer { }; - - git-standup = callPackage ../applications/version-management/git-and-tools/git-standup { }; - - git-stree = callPackage ../applications/version-management/git-and-tools/git-stree { }; - - git-subrepo = callPackage ../applications/version-management/git-and-tools/git-subrepo { }; - - git-subset = callPackage ../applications/version-management/git-and-tools/git-subset { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-subtrac = callPackage ../applications/version-management/git-and-tools/git-subtrac { }; - - git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { }; - - git-test = callPackage ../applications/version-management/git-and-tools/git-test { }; - - git-trim = callPackage ../applications/version-management/git-and-tools/git-trim { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-up = callPackage ../applications/version-management/git-up { - pythonPackages = python3Packages; - }; - - git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { }; - - git-vendor = callPackage ../applications/version-management/git-and-tools/git-vendor { }; - - git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { }; - - git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git2cl = callPackage ../applications/version-management/git-and-tools/git2cl { }; - - gita = python3Packages.callPackage ../applications/version-management/git-and-tools/gita { }; - - gitbatch = callPackage ../applications/version-management/git-and-tools/gitbatch { }; - - gitflow = callPackage ../applications/version-management/git-and-tools/gitflow { }; - - gitfs = callPackage ../tools/filesystems/gitfs { }; - github-backup = callPackage ../tools/misc/github-backup { }; - github-runner = callPackage ../development/tools/continuous-integration/github-runner { }; + github-runner = callPackage ../development/tools/continuous-integration/github-runner { + inherit (darwin) autoSignDarwinBinariesHook; + }; gitkraken = callPackage ../applications/version-management/gitkraken { }; @@ -7132,6 +7418,8 @@ with pkgs; gitlabEnterprise = true; }; + gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -7142,22 +7430,10 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitsign = callPackage ../tools/security/gitsign { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; - gitstats = callPackage ../applications/version-management/gitstats { }; - - gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; - - gitty = callPackage ../applications/version-management/git-and-tools/gitty { }; - - gitui = callPackage ../applications/version-management/git-and-tools/gitui { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - }; - gogs = callPackage ../applications/version-management/gogs { }; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; @@ -7168,10 +7444,6 @@ with pkgs; gl2ps = callPackage ../development/libraries/gl2ps { }; - glab = callPackage ../applications/version-management/git-and-tools/glab { }; - - glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; - glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -7254,7 +7526,9 @@ with pkgs; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -7281,6 +7555,8 @@ with pkgs; godot-server = callPackage ../development/tools/godot/3/server.nix { }; + goeland = callPackage ../applications/networking/feedreaders/goeland { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; goofys = callPackage ../tools/filesystems/goofys { }; @@ -7316,12 +7592,7 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { - openssl = openssl_1_1; - abseil-cpp = abseil-cpp.override { - cxxStandard = "14"; - }; - }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; @@ -7494,6 +7765,8 @@ with pkgs; openssl = openssl_1_1; }; + sonic-server = callPackage ../servers/search/sonic-server { }; + gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmlib = callPackage ../development/libraries/gsmlib @@ -7624,6 +7897,8 @@ with pkgs; hashcat-utils = callPackage ../tools/security/hashcat-utils { }; + hashrat = callPackage ../tools/security/hashrat { }; + hash_extender = callPackage ../tools/security/hash_extender { openssl = openssl_1_1; }; @@ -7718,6 +7993,8 @@ with pkgs; hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; + hexgui = callPackage ../games/hexgui { }; + hey = callPackage ../tools/networking/hey { }; hhpc = callPackage ../tools/misc/hhpc { }; @@ -7776,10 +8053,7 @@ with pkgs; httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; - httpdump = callPackage ../tools/security/httpdump { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + httpdump = callPackage ../tools/security/httpdump { }; httpie = with python3Packages; toPythonApplication httpie; @@ -7799,14 +8073,10 @@ with pkgs; hurl = callPackage ../tools/networking/hurl { }; - hub = callPackage ../applications/version-management/git-and-tools/hub { }; - hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; - hut = callPackage ../applications/version-management/git-and-tools/hut { }; - hwinfo = callPackage ../tools/system/hwinfo { }; hw-probe = perlPackages.callPackage ../tools/system/hw-probe { }; @@ -7821,10 +8091,7 @@ with pkgs; i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + i2p = callPackage ../tools/networking/i2p { }; i2pd = callPackage ../tools/networking/i2pd { }; @@ -7866,6 +8133,10 @@ with pkgs; iftop = callPackage ../tools/networking/iftop { }; + ifwifi = callPackage ../tools/networking/ifwifi { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; idevicerestore = callPackage ../tools/misc/idevicerestore { }; @@ -8063,6 +8334,8 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; + jd-cli = callPackage ../tools/security/jd-cli { }; + jd-diff-patch = callPackage ../development/tools/jd-diff-patch { }; jd-gui = callPackage ../tools/security/jd-gui { }; @@ -8221,6 +8494,8 @@ with pkgs; kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + katana = callPackage ../tools/security/katana { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { @@ -8239,10 +8514,14 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; + kestrel = callPackage ../tools/security/kestrel { }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; + keepmenu = callPackage ../applications/misc/keepmenu { }; + kent = callPackage ../applications/science/biology/kent { }; keybase = callPackage ../tools/security/keybase { @@ -8270,10 +8549,9 @@ with pkgs; jdk = jdk11; }; - kfctl = callPackage ../applications/networking/cluster/kfctl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kfctl = callPackage ../applications/networking/cluster/kfctl { }; + + kluctl = callPackage ../applications/networking/cluster/kluctl { }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; kibana = kibana7; @@ -8350,8 +8628,6 @@ with pkgs; l2md = callPackage ../tools/text/l2md { }; - lab = callPackage ../applications/version-management/git-and-tools/lab { }; - lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; last-resort = callPackage ../data/fonts/last-resort {}; @@ -8366,8 +8642,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { }; - lego = callPackage ../tools/admin/lego { }; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; @@ -8461,6 +8735,8 @@ with pkgs; lottieconverter = callPackage ../tools/misc/lottieconverter { }; + loudgain = callPackage ../tools/audio/loudgain/default.nix { }; + lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { }; lsd = callPackage ../tools/misc/lsd { }; @@ -8586,8 +8862,6 @@ with pkgs; mesa-demos = callPackage ../tools/graphics/mesa-demos { }; - mftrace = callPackage ../tools/typesetting/tex/mftrace { }; - mhonarc = perlPackages.MHonArc; minica = callPackage ../tools/security/minica { }; @@ -8699,9 +8973,21 @@ with pkgs; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; + nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { }; + nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-18_x; - nodejs-slim_latest = nodejs-slim-18_x; + nodejs_latest = nodejs-19_x; + nodejs-slim_latest = nodejs-slim-19_x; + + buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; + + npmHooks = callPackage ../build-support/node/build-npm-package/hooks { }; + + inherit (callPackage ../build-support/node/fetch-npm-deps { + inherit (darwin.apple_sdk.frameworks) Security; + }) fetchNpmDeps prefetch-npm-deps; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; @@ -8733,8 +9019,6 @@ with pkgs; latex2html = callPackage ../tools/misc/latex2html { }; - latexrun = callPackage ../tools/typesetting/tex/latexrun { }; - lazycli = callPackage ../tools/misc/lazycli { }; lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; @@ -8763,6 +9047,8 @@ with pkgs; lemmeknow = callPackage ../tools/misc/lemmeknow { }; + lemmy-help = callPackage ../tools/misc/lemmy-help { }; + lethe = callPackage ../tools/security/lethe { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9190,10 +9476,7 @@ with pkgs; minissdpd = callPackage ../tools/networking/minissdpd { }; - inherit (callPackage ../tools/networking/miniupnpc - { inherit (darwin) cctools; }) - miniupnpc_1 miniupnpc_2; - miniupnpc = miniupnpc_1; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -9261,6 +9544,8 @@ with pkgs; monit = callPackage ../tools/system/monit { }; + monocraft = callPackage ../data/fonts/monocraft { }; + monolith = callPackage ../tools/backup/monolith { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9277,6 +9562,8 @@ with pkgs; mosh = callPackage ../tools/networking/mosh { }; + motrix = callPackage ../tools/networking/motrix { }; + mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; @@ -9454,10 +9741,6 @@ with pkgs; netselect = callPackage ../tools/networking/netselect { }; - nettee = callPackage ../tools/networking/nettee { - inherit (skawarePackages) cleanPackaging; - }; - networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; @@ -9495,6 +9778,16 @@ with pkgs; inherit (callPackage ../servers/nextcloud {}) nextcloud23 nextcloud24 nextcloud25; + nextcloud23Packages = ( callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/23.json; + }); + nextcloud24Packages = ( callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/24.json; + }); + nextcloud25Packages = ( callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/25.json; + }); + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -9516,22 +9809,12 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_3; - - # 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_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { - buildGoModule = buildGo119Module; - }; - nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { - buildGoModule = buildGo119Module; - }; - nomad_1_4 = callPackage ../applications/networking/cluster/nomad/1.4.nix { - buildGoModule = buildGo119Module; - }; + inherit (callPackage ../applications/networking/cluster/nomad { }) + nomad + nomad_1_2 + nomad_1_3 + nomad_1_4 + ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -9609,6 +9892,8 @@ with pkgs; pwsafe = callPackage ../applications/misc/pwsafe { }; + pw-viz = callPackage ../applications/misc/pw-viz { }; + napi-rs-cli = callPackage ../development/tools/napi-rs-cli { }; neil = callPackage ../development/tools/neil { }; @@ -9761,10 +10046,7 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -9794,7 +10076,7 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -10071,6 +10353,8 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; + paper-note = callPackage ../applications/office/paper-note { }; + paperless-ngx = callPackage ../applications/office/paperless-ngx { }; paperoni = callPackage ../tools/text/paperoni { @@ -10120,13 +10404,11 @@ with pkgs; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { - stdenv = gcc10StdenvCompat; boost = boost159; openssl = openssl_1_1; }; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { - stdenv = gcc10StdenvCompat; - boost = boost170; + boost = boost177; openssl = openssl_1_1; }; @@ -10142,7 +10424,13 @@ with pkgs; prism = callPackage ../applications/video/prism { }; - pulumi-bin = callPackage ../tools/admin/pulumi { }; + pulumi = callPackage ../tools/admin/pulumi { }; + + pulumiPackages = recurseIntoAttrs ( + callPackage ../tools/admin/pulumi-packages { } + ); + + pulumi-bin = callPackage ../tools/admin/pulumi-bin { }; p0f = callPackage ../tools/security/p0f { }; @@ -10172,6 +10460,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + pcscliteWithPolkit = pcsclite.override { + pname = "pcsclite-with-polkit"; + polkitSupport = true; + }; + pcsctools = callPackage ../tools/security/pcsctools { }; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; @@ -10256,6 +10549,8 @@ with pkgs; phosh = callPackage ../applications/window-managers/phosh { }; + phosh-mobile-settings = callPackage ../applications/window-managers/phosh/phosh-mobile-settings.nix { }; + pinentry = libsForQt5.callPackage ../tools/security/pinentry { }; pinentry-curses = (lib.getOutput "curses" pinentry); @@ -10403,7 +10698,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; }; + wxGTK30 = wxGTK30.override { withWebKit = true; }; }; polaris = callPackage ../servers/polaris { }; @@ -10438,8 +10733,6 @@ with pkgs; ppl = callPackage ../development/libraries/ppl { }; - pplatex = callPackage ../tools/typesetting/tex/pplatex { }; - ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp {}; @@ -10471,6 +10764,8 @@ with pkgs; proot = callPackage ../tools/system/proot { }; + protoscope = callPackage ../development/tools/protoscope { }; + prototypejs = callPackage ../development/libraries/prototypejs { }; inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) @@ -10560,7 +10855,7 @@ with pkgs; pympress = callPackage ../applications/office/pympress { }; - pyocd = python3Packages.callPackage ../development/embedded/pyocd { }; + pyocd = with python3Packages; toPythonApplication pyocd; pypass = with python3Packages; toPythonApplication pypass; @@ -10576,6 +10871,8 @@ with pkgs; pydeps = with python3Packages; toPythonApplication pydeps; + python-launcher = callPackage ../development/tools/misc/python-launcher { }; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; @@ -10653,8 +10950,6 @@ with pkgs; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - qgit = qt5.callPackage ../applications/version-management/git-and-tools/qgit { }; - qgrep = callPackage ../tools/text/qgrep { inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; }; @@ -10789,7 +11084,7 @@ with pkgs; reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt5.callPackage ../applications/editors/retext { }; + retext = qt6Packages.callPackage ../applications/editors/retext { }; inherit (callPackage ../tools/security/rekor { }) rekor-cli @@ -10848,7 +11143,7 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; + renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; replace = callPackage ../tools/text/replace { }; @@ -10932,8 +11227,6 @@ with pkgs; rq = callPackage ../development/tools/rq { }; - rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; - rsnapshot = callPackage ../tools/backup/rsnapshot { }; rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -10944,7 +11237,7 @@ with pkgs; rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -11051,16 +11344,6 @@ with pkgs; s5cmd = callPackage ../tools/networking/s5cmd { }; - s6-dns = skawarePackages.s6-dns; - - s6-linux-init = skawarePackages.s6-linux-init; - - s6-linux-utils = skawarePackages.s6-linux-utils; - - s6-networking = skawarePackages.s6-networking; - - s6-portable-utils = skawarePackages.s6-portable-utils; - sacad = callPackage ../tools/misc/sacad { }; sad = callPackage ../tools/text/sad { }; @@ -11075,7 +11358,7 @@ with pkgs; safe-rm = callPackage ../tools/system/safe-rm { }; - safeeyes = with python3.pkgs; toPythonApplication safeeyes; + safeeyes = callPackage ../applications/misc/safeeyes { }; sagoin = callPackage ../tools/misc/sagoin { }; @@ -11109,8 +11392,6 @@ with pkgs; scdoc = callPackage ../tools/typesetting/scdoc { }; - scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scorecard = callPackage ../tools/security/scorecard { }; scream = callPackage ../applications/audio/scream { }; @@ -11127,8 +11408,6 @@ with pkgs; screen-message = callPackage ../tools/X11/screen-message { }; - screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { }; - screenkey = callPackage ../applications/video/screenkey { }; scrub = callPackage ../tools/misc/scrub { }; @@ -11202,6 +11481,10 @@ with pkgs; sftpman = callPackage ../tools/filesystems/sftpman { }; + sftpgo = callPackage ../servers/sftpgo { + buildGoModule = buildGo119Module; + }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; @@ -11341,9 +11624,6 @@ with pkgs; sleuthkit = callPackage ../tools/system/sleuthkit {}; - # Not updated upstream since 2018, doesn't support qt newer than 5.12 - sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; @@ -11442,6 +11722,7 @@ with pkgs; suricata = callPackage ../applications/networking/ids/suricata { python = python3; + libbpf = libbpf_0; }; sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; @@ -11485,6 +11766,8 @@ with pkgs; sqliteman = callPackage ../applications/misc/sqliteman { }; + sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { }; + sqls = callPackage ../applications/misc/sqls { }; stdman = callPackage ../data/documentation/stdman { }; @@ -11571,8 +11854,6 @@ with pkgs; sstp = callPackage ../tools/networking/sstp {}; - stgit = callPackage ../applications/version-management/git-and-tools/stgit { }; - strip-nondeterminism = perlPackages.strip-nondeterminism; structure-synth = callPackage ../tools/graphics/structure-synth { }; @@ -11583,9 +11864,7 @@ with pkgs; subedit = callPackage ../tools/text/subedit { }; - subgit = callPackage ../applications/version-management/git-and-tools/subgit { }; - - subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -11607,10 +11886,7 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -11691,14 +11967,8 @@ with pkgs; swtpm = callPackage ../tools/security/swtpm { }; - svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { - git = gitSVN; - }; - svnfs = callPackage ../tools/filesystems/svnfs { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/git-and-tools/svn-all-fast-export { }; - svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; sycl-info = callPackage ../development/libraries/sycl-info { }; @@ -11793,6 +12063,8 @@ with pkgs; tayga = callPackage ../tools/networking/tayga { }; + tcb = callPackage ../tools/security/tcb { }; + tcpcrypt = callPackage ../tools/security/tcpcrypt { }; tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; @@ -11819,7 +12091,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; teip = callPackage ../tools/text/teip { }; @@ -11871,8 +12143,6 @@ with pkgs; texworks = libsForQt5.callPackage ../applications/editors/texworks { }; - tex-match = callPackage ../tools/typesetting/tex/tex-match { }; - tf2pulumi = callPackage ../development/tools/tf2pulumi { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -11899,14 +12169,14 @@ with pkgs; theme-sh = callPackage ../tools/misc/theme-sh { }; - thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; - thiefmd = callPackage ../applications/editors/thiefmd { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; + threatest = callPackage ../tools/security/threatest { }; + threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { }; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; @@ -11957,8 +12227,6 @@ with pkgs; tldr-hs = haskellPackages.tldr; - tlspool = callPackage ../tools/networking/tlspool { }; - tlsx = callPackage ../tools/security/tlsx { }; tmate = callPackage ../tools/misc/tmate { }; @@ -12003,7 +12271,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - top-git = callPackage ../applications/version-management/git-and-tools/topgit { }; + topiary = callPackage ../development/tools/misc/topiary { }; todo = callPackage ../tools/misc/todo { }; @@ -12033,6 +12301,8 @@ with pkgs; trackma-qt = trackma.override { withQT = true; }; + tran = callPackage ../tools/networking/tran { }; + tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; @@ -12063,6 +12333,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + trunk-io = callPackage ../development/tools/trunk-io { }; + tthsum = callPackage ../applications/misc/tthsum { }; ttp = with python3.pkgs; toPythonApplication ttp; @@ -12075,16 +12347,12 @@ with pkgs; tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; - tracee = callPackage ../tools/security/tracee { - buildGoModule = buildGo118Module; # tests fail with 1.19 - }; + tracee = callPackage ../tools/security/tracee { }; tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { }; tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; - transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { }; - transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { }; translate-shell = callPackage ../applications/misc/translate-shell { }; @@ -12218,6 +12486,8 @@ with pkgs; udftools = callPackage ../tools/filesystems/udftools {}; + udpreplay = callPackage ../tools/networking/udpreplay { }; + udpt = callPackage ../servers/udpt { }; udptunnel = callPackage ../tools/networking/udptunnel { }; @@ -12346,6 +12616,8 @@ with pkgs; versus = callPackage ../applications/networking/versus { }; + vexctl = callPackage ../tools/security/vexctl { }; + vgrep = callPackage ../tools/text/vgrep { }; vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; @@ -12384,6 +12656,8 @@ with pkgs; vkBasalt32 = pkgsi686Linux.vkBasalt; }; + vkmark = callPackage ../tools/graphics/vkmark { }; + vncrec = callPackage ../tools/video/vncrec { }; vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; @@ -12545,6 +12819,8 @@ with pkgs; xplr = callPackage ../applications/misc/xplr {}; + xray = callPackage ../tools/networking/xray { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; @@ -12601,6 +12877,8 @@ with pkgs; openssl = openssl_1_1; }; + tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { }; + truecrack = callPackage ../tools/security/truecrack { }; truecrack-cuda = truecrack.override { cudaSupport = true; }; @@ -12651,6 +12929,7 @@ with pkgs; unicorn = callPackage ../development/libraries/unicorn { inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin) cctools; }; units = callPackage ../tools/misc/units { @@ -12748,19 +13027,21 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish71 varnish72; + varnish60 varnish72; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish71Packages varnish72Packages; + varnish60Packages varnish72Packages; - varnishPackages = varnish71Packages; + varnishPackages = varnish72Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK30; + wxGTK = wxGTK32; }; + veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; @@ -12837,7 +13118,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { libjpeg8 = libjpeg.override { enableJpeg8 = true; }; @@ -12846,18 +13127,13 @@ with pkgs; wml = callPackage ../development/web/wml { }; - wmc-mpris = callPackage ../applications/misc/web-media-controller { }; - wol = callPackage ../tools/networking/wol { }; wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; wpgtk = callPackage ../tools/X11/wpgtk { }; - wrap = callPackage ../tools/text/wrap { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + wrap = callPackage ../tools/text/wrap { }; wring = nodePackages.wring; @@ -12865,10 +13141,9 @@ with pkgs; wrk2 = callPackage ../tools/networking/wrk2 { }; - wuzz = callPackage ../tools/networking/wuzz { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + wsysmon = callPackage ../tools/system/wsysmon { }; + + wuzz = callPackage ../tools/networking/wuzz { }; wv = callPackage ../tools/misc/wv { }; @@ -13023,6 +13298,8 @@ with pkgs; yj = callPackage ../development/tools/yj { }; + zarchive = callPackage ../tools/archivers/zarchive { }; + zprint = callPackage ../development/tools/zprint { }; yle-dl = callPackage ../tools/misc/yle-dl {}; @@ -13034,6 +13311,7 @@ with pkgs; zbackup = callPackage ../tools/backup/zbackup {}; zbar = libsForQt5.callPackage ../tools/graphics/zbar { + inherit (darwin.apple_sdk.frameworks) Foundation; autoreconfHook = buildPackages.autoreconfHook269; }; @@ -13087,6 +13365,8 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; + zinc = callPackage ../servers/search/zinc { }; + zkfuse = callPackage ../tools/filesystems/zkfuse { }; zpaq = callPackage ../tools/archivers/zpaq { }; @@ -13116,6 +13396,8 @@ with pkgs; zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { }; + zsh-edit = callPackage ../shells/zsh/zsh-edit { }; + zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-history = callPackage ../shells/zsh/zsh-history { }; @@ -13134,6 +13416,8 @@ with pkgs; zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-forgit = callPackage ../shells/zsh/zsh-forgit { }; + zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { }; @@ -13158,12 +13442,16 @@ with pkgs; cmake = buildPackages.cmakeMinimal; }; + zsv = callPackage ../development/tools/zsv { }; + zsync = callPackage ../tools/compression/zsync { }; zxing = callPackage ../tools/graphics/zxing {}; zkar = callPackage ../tools/security/zkar { }; + zlint = callPackage ../tools/security/zlint { }; + zmap = callPackage ../tools/security/zmap { }; zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; @@ -13272,21 +13560,25 @@ with pkgs; _4th = callPackage ../development/compilers/4th { }; - abcl = callPackage ../development/compilers/abcl { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + abcl = callPackage ../development/compilers/abcl { }; + + temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; + temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; + + temurin-bin-18 = javaPackages.compiler.temurin-bin.jdk-18; + temurin-jre-bin-18 = javaPackages.compiler.temurin-bin.jre-18; temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; + temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - temurin-bin = temurin-bin-17; - temurin-jre-bin = temurin-jre-bin-17; + temurin-bin = temurin-bin-19; + temurin-jre-bin = temurin-jre-bin-19; semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; @@ -13303,13 +13595,6 @@ with pkgs; adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; - adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-17 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {}; - adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot; adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot; adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9; @@ -13370,7 +13655,9 @@ with pkgs; avra = callPackage ../development/compilers/avra { }; - ballerina = callPackage ../development/compilers/ballerina { openjdk = openjdk11; }; + ballerina = callPackage ../development/compilers/ballerina { + openjdk = openjdk11_headless; + }; beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { }; @@ -13549,7 +13836,9 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; - cotton = callPackage ../development/tools/cotton { }; + cotton = callPackage ../development/tools/cotton { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; inherit (callPackages ../development/compilers/crystal { llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; @@ -13597,6 +13886,11 @@ with pkgs; fasmg = callPackage ../development/compilers/fasmg { }; + fbc = if stdenv.hostPlatform.isDarwin then + callPackage ../development/compilers/fbc/mac-bin.nix { } + else + callPackage ../development/compilers/fbc { }; + filecheck = with python3Packages; toPythonApplication filecheck; firrtl = callPackage ../development/compilers/firrtl { }; @@ -13760,7 +14054,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -13774,7 +14068,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -13791,7 +14085,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13810,7 +14104,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13825,7 +14119,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13840,7 +14134,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13852,7 +14146,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13864,7 +14158,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13876,7 +14170,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -14049,7 +14343,7 @@ with pkgs; gnatboot = if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform - then buildPackages.gnatboot + then buildPackages.gnatboot11 else buildPackages.gnat11; }); @@ -14065,11 +14359,13 @@ with pkgs; gnatboot = if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform - then buildPackages.gnatboot + then buildPackages.gnatboot12 else buildPackages.gnat12; }); - gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); + gnatboot = gnatboot12; + gnatboot11 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "11"; }); + gnatboot12 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "12"; }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; @@ -14104,7 +14400,7 @@ with pkgs; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {}; - gcc-arm-embedded = gcc-arm-embedded-10; + gcc-arm-embedded = gcc-arm-embedded-11; # Has to match the default gcc so that there are no linking errors when # using C/C++ libraries in D packages @@ -14220,12 +14516,44 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { }; + fstar = callPackage ../development/compilers/fstar { + # Work around while compatibility with ppxlib >= 0.26 is unavailable + # Should be removed when a fix is availaible + # See https://github.com/FStarLang/FStar/issues/2681 + ocamlPackages = + ocamlPackages.overrideScope' (self: super: { + ppxlib = super.ppxlib.override { + version = if lib.versionAtLeast self.ocaml.version "4.07" + then if lib.versionAtLeast self.ocaml.version "4.08" + then "0.24.0" else "0.15.0" else "0.13.0"; + }; + ppx_deriving_yojson = super.ppx_deriving_yojson.overrideAttrs (oldAttrs: rec { + version = "3.6.1"; + src = fetchFromGitHub { + owner = "ocaml-ppx"; + repo = "ppx_deriving_yojson"; + rev = "v${version}"; + sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; + }; + }); + sedlex = super.sedlex.overrideAttrs (oldAttrs: rec { + version = "2.5"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = "sedlex"; + rev = "v${version}"; + sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; + }; + }); + }); + }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); glslang = callPackage ../development/compilers/glslang { }; + gnostic = callPackage ../development/compilers/gnostic {}; + go-junit-report = callPackage ../development/tools/go-junit-report { }; gobang = callPackage ../development/tools/database/gobang { @@ -14303,14 +14631,14 @@ with pkgs; openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; - openjdk18-bootstrap = javaPackages.compiler.openjdk18-bootstrap; - openjdk18 = javaPackages.compiler.openjdk18; - openjdk18_headless = javaPackages.compiler.openjdk18.headless; - jdk18 = openjdk18; - jdk18_headless = openjdk18_headless; + openjdk19 = javaPackages.compiler.openjdk19; + openjdk19_headless = javaPackages.compiler.openjdk19.headless; + jdk19 = openjdk19; + jdk19_headless = openjdk19_headless; /* default JDK */ - jdk = jdk17; + jdk = jdk19; + jdk_headless = jdk19_headless; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -14319,13 +14647,16 @@ with pkgs; # 'jre_minimal' to build a bespoke JRE containing only the modules you need. # # For a general-purpose system, 'jre' defaults to the full JDK: - jre = jdk17; - jre_headless = jdk17_headless; + jre = jdk; + jre_headless = jdk_headless; + jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { + jdk = jdk17; + }; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; - openjdk = openjdk17; - openjdk_headless = openjdk17_headless; + openjdk = jdk; + openjdk_headless = jdk_headless; graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { @@ -14370,35 +14701,14 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + jna = callPackage ../development/java-modules/jna { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; juniper = callPackage ../development/compilers/juniper { }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - 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 { - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; - - julia-lts = julia_10; - julia-stable = julia_15; + julia-lts = julia_16-bin; + julia-stable = julia_18; julia = julia-stable; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; @@ -14512,8 +14822,9 @@ with pkgs; # assumption is that or any later version is good. choose = platform: /**/ if platform.isDarwin then 11 - else if platform.isFreeBSD then 7 + else if platform.isFreeBSD then 12 else if platform.isAndroid then 12 + else if platform.system == "armv6l-linux" then 7 # This fixes armv6 cross-compilation else if platform.isLinux then 11 else if platform.isWasm then 12 else latest_version; @@ -14527,36 +14838,42 @@ with pkgs; llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; + targetLlvm = targetPackages.llvmPackages_5.llvm or llvmPackages_5.llvm; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries; }); llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; + targetLlvm = targetPackages.llvmPackages_6.llvm or llvmPackages_6.llvm; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; }); llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; + targetLlvm = targetPackages.llvmPackages_7.llvm or llvmPackages_7.llvm; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries; }); llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; + targetLlvm = targetPackages.llvmPackages_8.llvm or llvmPackages_8.llvm; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries; }); llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; + targetLlvm = targetPackages.llvmPackages_9.llvm or llvmPackages_9.llvm; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries; }); llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; + targetLlvm = targetPackages.llvmPackages_10.llvm or llvmPackages_10.llvm; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries; }); @@ -14564,32 +14881,28 @@ with pkgs; inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc7Stdenv; + targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; })); llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc7Stdenv; + targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; })); llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_13.tools; targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc7Stdenv; + targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; })); llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_14.tools; targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc7Stdenv; + targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; })); llvmPackages_latest = llvmPackages_14; @@ -14604,9 +14917,7 @@ with pkgs; marst = callPackage ../development/compilers/marst { }; - mercury = callPackage ../development/compilers/mercury { - jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + mercury = callPackage ../development/compilers/mercury { }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -14693,6 +15004,8 @@ with pkgs; nasmfmt = callPackage ../development/tools/nasmfmt { }; + nqc = callPackage ../development/compilers/nqc { }; + nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; obliv-c = callPackage ../development/compilers/obliv-c @@ -14766,6 +15079,16 @@ with pkgs; rgbds = callPackage ../development/compilers/rgbds { }; + rml = callPackage ../development/compilers/rml { }; + + composable_kernel = callPackage ../development/libraries/composable_kernel { + inherit (llvmPackages) openmp; + }; + + clang-ocl = callPackage ../development/libraries/clang-ocl { + inherit (llvmPackages_rocm) clang; + }; + rgxg = callPackage ../tools/text/rgxg { }; rocclr = callPackage ../development/libraries/rocclr { }; @@ -14774,6 +15097,12 @@ with pkgs; inherit (llvmPackages_rocm) clang llvm; }; + hipcub = callPackage ../development/libraries/hipcub { }; + + hipsparse = callPackage ../development/libraries/hipsparse { }; + + rccl = callPackage ../development/libraries/rccl { }; + rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; rocm-comgr = callPackage ../development/libraries/rocm-comgr { @@ -14800,15 +15129,54 @@ with pkgs; rocminfo = callPackage ../development/tools/rocminfo { }; + rocmlir = callPackage ../development/libraries/rocmlir { }; + + rocprim = callPackage ../development/libraries/rocprim { }; + + rocsparse = callPackage ../development/libraries/rocsparse { }; + + rocfft = callPackage ../development/libraries/rocfft { }; + + rocrand = callPackage ../development/libraries/rocrand { }; + + tensile = python3Packages.callPackage ../development/libraries/tensile { }; + + rocwmma = callPackage ../development/libraries/rocwmma { + inherit (llvmPackages) openmp; + }; + + rocblas = callPackage ../development/libraries/rocblas { + inherit (llvmPackages_rocm) llvm; + }; + + miopengemm = callPackage ../development/libraries/miopengemm { + inherit (llvmPackages_rocm) clang; + }; + + rocthrust = callPackage ../development/libraries/rocthrust { }; + + miopen = callPackage ../development/libraries/miopen { + inherit (llvmPackages_rocm) clang llvm; + boost = boost.override { enableStatic = true; }; + }; + + miopen-hip = miopen.override { + useOpenCL = false; + }; + + miopen-opencl = miopen.override { + useOpenCL = true; + }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; - rust_1_64 = callPackage ../development/compilers/rust/1_64.nix { + rust_1_65 = callPackage ../development/compilers/rust/1_65.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_64; + rust = rust_1_65; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -14817,8 +15185,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_64 = rust_1_64.packages.stable; - rustPackages = rustPackages_1_64; + rustPackages_1_65 = rust_1_65.packages.stable; + rustPackages = rustPackages_1_65; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -14826,7 +15194,6 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { inherit (darwin.apple_sdk.frameworks) Security; @@ -14841,12 +15208,11 @@ with pkgs; inherit (linuxPackages) perf; }; - carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; - defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; cargo-about = callPackage ../development/tools/rust/cargo-about { }; cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; + cargo-apk = callPackage ../development/tools/rust/cargo-apk { }; cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14863,6 +15229,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; + cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; + }; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14875,8 +15244,10 @@ with pkgs; }; cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; + cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; + cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { @@ -14944,13 +15315,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; + cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14961,7 +15333,6 @@ with pkgs; cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { @@ -14987,6 +15358,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { }; + cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; @@ -15045,9 +15417,6 @@ with pkgs; rhack = callPackage ../development/tools/rust/rhack { }; roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; - rustracer = callPackage ../development/tools/rust/racer { - inherit (darwin.apple_sdk.frameworks) Security; - }; rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -15064,8 +15433,10 @@ with pkgs; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; rusty-man = callPackage ../development/tools/rust/rusty-man { }; + typeshare = callPackage ../development/tools/rust/typeshare { }; sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; @@ -15080,7 +15451,8 @@ with pkgs; sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.4"; }; sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.6"; }; sbcl_2_2_9 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.9"; }; - sbcl = sbcl_2_2_9; + sbcl_2_2_10 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.10"; }; + sbcl = sbcl_2_2_10; roswell = callPackage ../development/tools/roswell { }; @@ -15135,6 +15507,8 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; + spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -15196,6 +15570,8 @@ with pkgs; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; + inherit (nodePackages) typescript; + bupc = callPackage ../development/compilers/bupc { }; uasm = callPackage ../development/compilers/uasm { }; @@ -15240,7 +15616,7 @@ with pkgs; # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package , nixSupport ? {} , ... } @ extraArgs: @@ -15533,6 +15909,8 @@ with pkgs; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; + luau = callPackage ../development/interpreters/luau { }; + toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( }; @@ -15560,6 +15938,8 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nelua = callPackage ../development/interpreters/nelua { }; + nextflow = callPackage ../development/interpreters/nextflow { }; ngn-k = callPackage ../development/interpreters/ngn-k { }; @@ -15592,11 +15972,21 @@ with pkgs; phpExtensions = php.extensions; phpPackages = php.packages; + # Import PHP82 interpreter, extensions and packages + php82 = callPackage ../development/interpreters/php/8.2.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + }; + php82Extensions = recurseIntoAttrs php82.extensions; + php82Packages = recurseIntoAttrs php82.packages; + # Import PHP81 interpreter, extensions and packages php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 }; }; php81Extensions = recurseIntoAttrs php81.extensions; @@ -15606,7 +15996,7 @@ with pkgs; php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 }; }; php80Extensions = recurseIntoAttrs php80.extensions; @@ -15724,7 +16114,7 @@ with pkgs; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; - svg2tikz = python27Packages.svg2tikz; + svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; svg2pdf = callPackage ../tools/graphics/svg2pdf { }; @@ -15745,12 +16135,10 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire { # ffmpeg depends on SDL2 which depends on pipewire by default. - # Break the cycle by disabling pipewire support in our ffmpeg. - ffmpeg = ffmpeg.override { - SDL2 = SDL2.override { - pipewireSupport = false; - }; - }; + # Break the cycle by depending on ffmpeg-headless. + # Pipewire only uses libavcodec (via an SPA plugin), which isn't + # affected by the *-headless changes. + ffmpeg = ffmpeg-headless; }; pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; @@ -15848,6 +16236,8 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; + spark2014 = callPackage ../development/libraries/ada/spark2014 { }; + spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc; }; @@ -15965,6 +16355,8 @@ with pkgs; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; + guile-sqlite3 = callPackage ../development/guile-modules/guile-sqlite3 { }; + guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; guile-xcb = callPackage ../development/guile-modules/guile-xcb { @@ -16006,6 +16398,8 @@ with pkgs; llvmPackages = llvmPackages_latest; }; + refurb = callPackage ../development/tools/refurb { }; + srandrd = callPackage ../tools/X11/srandrd { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -16045,47 +16439,50 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; + apgdiff = callPackage ../development/tools/database/apgdiff { }; + apkg = callPackage ../tools/package-management/apkg { }; augeas = callPackage ../tools/system/augeas { }; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_12; - ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_14; + ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.13.6"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8="; + }; + })); ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.12.6"; + version = "2.12.10"; src = oldAttrs.src.override { inherit version; - hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0="; - sha256 = ""; + hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY="; }; meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst"; })); ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; + ansible-language-server = callPackage ../development/tools/ansible-language-server { }; + ansible-later = with python3.pkgs; toPythonApplication ansible-later; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { - jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 - }; - - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; antlr3 = antlr3_5; - antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - - antlr4_9 = callPackage ../development/tools/parsing/antlr/4.9.nix { }; + inherit (callPackages ../development/tools/parsing/antlr/4.nix { }) + antlr4_8 + antlr4_9 + antlr4_10 + antlr4_11; antlr4 = antlr4_8; @@ -16110,7 +16507,7 @@ with pkgs; arpa2common = callPackage ../development/libraries/arpa2common { }; - asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; + asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; @@ -16136,7 +16533,8 @@ with pkgs; electron_18 electron_19 electron_20 - electron_21; + electron_21 + electron_22; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -16377,18 +16775,21 @@ with pkgs; bump = callPackage ../development/tools/github/bump { }; - libbpf_1 = callPackage ../os-specific/linux/libbpf { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { }; - # until more issues are fixed default to libbpf 0.x - libbpf = libbpf_0; + + bundlewrap = with python3.pkgs; toPythonApplication bundlewrap; bpftools = callPackage ../os-specific/linux/bpftools { }; bcc = callPackage ../os-specific/linux/bcc { - python = pkgs.python3; + python = python3; + llvmPackages = llvmPackages_14; }; - bpftrace = callPackage ../os-specific/linux/bpftrace { }; + bpftrace = callPackage ../os-specific/linux/bpftrace { + llvmPackages = llvmPackages_14; + }; bpm-tools = callPackage ../tools/audio/bpm-tools { }; @@ -16396,8 +16797,6 @@ with pkgs; cadre = callPackage ../development/tools/cadre { }; - cask = callPackage ../development/tools/cask { }; - cbrowser = callPackage ../development/tools/misc/cbrowser { }; cc-tool = callPackage ../development/embedded/cc-tool { }; @@ -16486,6 +16885,8 @@ with pkgs; coan = callPackage ../development/tools/analysis/coan { }; + coder = callPackage ../development/tools/coder { }; + compile-daemon = callPackage ../development/tools/compile-daemon { }; complexity = callPackage ../development/tools/misc/complexity { }; @@ -16592,6 +16993,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + devbox = callPackage ../development/tools/devbox { }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -16615,13 +17018,9 @@ with pkgs; python = python3; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { - python3 = python38; - }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; - # special forks used for dsview - libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; - libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; + sqlcl = callPackage ../development/tools/database/sqlcl { }; sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; @@ -16762,6 +17161,8 @@ with pkgs; explain = callPackage ../development/tools/explain { }; + func = callPackage ../applications/networking/cluster/func { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; license_finder = callPackage ../development/tools/license_finder { }; @@ -16781,6 +17182,8 @@ with pkgs; faas-cli = callPackage ../development/tools/faas-cli { }; + fastddsgen = callPackage ../development/tools/fastddsgen { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; findnewest = callPackage ../development/tools/misc/findnewest { }; @@ -16852,8 +17255,6 @@ with pkgs; gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; - git-aggregator = callPackage ../development/tools/git-aggregator { }; - github-release = callPackage ../development/tools/github/github-release { }; global = callPackage ../development/tools/misc/global { }; @@ -17012,6 +17413,8 @@ with pkgs; itstool = callPackage ../development/tools/misc/itstool { }; + jacoco = callPackage ../development/tools/analysis/jacoco { }; + inherit (callPackage ../development/tools/build-managers/jam { }) jam ftjam; @@ -17192,7 +17595,7 @@ with pkgs; minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; + minizincide = libsForQt5.callPackage ../development/tools/minizinc/ide.nix { }; mkcert = callPackage ../development/tools/misc/mkcert { }; @@ -17205,7 +17608,10 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { - inherit (llvmPackages) stdenv; + # C++20 is required, aarch64-linux has gcc 9 by default + stdenv = if stdenv.isLinux && stdenv.isAarch64 + then llvmPackages_12.libcxxStdenv + else llvmPackages.stdenv; }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -17227,6 +17633,8 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; + nap = callPackage ../development/tools/nap { }; + nil = callPackage ../development/tools/nil { }; ninja = callPackage ../development/tools/build-managers/ninja { }; @@ -17288,7 +17696,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole {}; + pahole = callPackage ../development/tools/misc/pahole { }; panopticon = callPackage ../development/tools/analysis/panopticon {}; @@ -17299,15 +17707,16 @@ with pkgs; patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then patchelf_0_13 else - patchelf_0_14; - patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; + patchelfStable; patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { - patchelf = patchelf_0_14; + patchelf = patchelfStable; }; - patchelf_0_14 = callPackage ../development/tools/misc/patchelf { }; + patchelfStable = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); + patsh = callPackage ../development/tools/misc/patsh { }; + pax-rs = callPackage ../development/tools/pax-rs { }; perfect-hash = callPackage ../development/tools/misc/perfect-hash { }; @@ -17368,6 +17777,8 @@ with pkgs; privacyidea = callPackage ../applications/misc/privacyidea { }; + process-compose = callPackage ../applications/misc/process-compose { }; + process-viewer = callPackage ../applications/misc/process-viewer { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; @@ -17412,7 +17823,7 @@ with pkgs; rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; - cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; + cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { }; ragel = ragelStable; @@ -17510,9 +17921,7 @@ with pkgs; sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; - mill = callPackage ../development/tools/build-managers/mill { - jre = jre8; - }; + mill = callPackage ../development/tools/build-managers/mill {}; sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; @@ -17639,6 +18048,8 @@ with pkgs; strace = callPackage ../development/tools/misc/strace { }; + strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; + stylua = callPackage ../development/tools/stylua { }; summon = callPackage ../development/tools/summon { }; @@ -17682,6 +18093,10 @@ with pkgs; taoup = callPackage ../tools/misc/taoup { }; + tarmac = callPackage ../development/tools/tarmac { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; @@ -17893,6 +18308,7 @@ with pkgs; abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -17974,6 +18390,8 @@ with pkgs; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; asio = callPackage ../development/libraries/asio { }; + asmjit = callPackage ../development/libraries/asmjit { }; + aspell = callPackage ../development/libraries/aspell { }; aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {}); @@ -18055,6 +18473,10 @@ with pkgs; belr = callPackage ../development/libraries/belr { }; + bencode = callPackage ../development/libraries/bencode { + stdenv = gcc10StdenvCompat; + }; + bencodetools = callPackage ../development/libraries/bencodetools { }; beignet = callPackage ../development/libraries/beignet { @@ -18074,7 +18496,11 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat { }; + bobcat = callPackage ../development/libraries/bobcat + (lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) { + # C++20 is required, aarch64-linux has gcc 9 by default + stdenv = gcc10Stdenv; + }); boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -18116,6 +18542,8 @@ with pkgs; boxfort = callPackage ../development/libraries/boxfort { }; + brunsli = callPackage ../development/libraries/brunsli { }; + buddy = callPackage ../development/libraries/buddy { }; buildkit-nix = callPackage ../applications/virtualization/buildkit-nix { }; @@ -18126,9 +18554,7 @@ with pkgs; bzrtp = callPackage ../development/libraries/bzrtp { }; - c-ares = callPackage ../development/libraries/c-ares { - inherit (buildPackages) cmake; - }; + c-ares = callPackage ../development/libraries/c-ares { }; c-aresMinimal = callPackage ../development/libraries/c-ares { withCMake = false; @@ -18139,6 +18565,8 @@ with pkgs; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix; + cubeb = callPackage ../development/libraries/audio/cubeb { }; + hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; hci = callPackage ../development/tools/continuous-integration/hci { }; @@ -18269,7 +18697,9 @@ with pkgs; coercer = callPackage ../tools/security/coercer { }; - cogl = callPackage ../development/libraries/cogl { }; + cogl = callPackage ../development/libraries/cogl { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -18353,13 +18783,12 @@ with pkgs; cxxopts = callPackage ../development/libraries/cxxopts { }; - cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; + cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; - openssl = openssl_1_1; + libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5; }; # Make bdb5 the default as it is the last release under the custom @@ -18407,6 +18836,8 @@ with pkgs; fltk = fltk13; }; + dillong = callPackage ../applications/networking/browsers/dillong { }; + directfb = callPackage ../development/libraries/directfb { }; discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; @@ -18482,6 +18913,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; + emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; @@ -18512,6 +18945,8 @@ with pkgs; factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { }; factor-lang = factor-lang-scope.interpreter; + fancypp = callPackage ../development/libraries/fancypp { }; + 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; @@ -18588,7 +19023,7 @@ with pkgs; samba = if stdenv.isDarwin then null else samba; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox - VideoDecodeAcceleration; + VideoDecodeAcceleration VideoToolbox; }; ffmpeg_5-full = ffmpeg-full.override { @@ -18609,10 +19044,7 @@ with pkgs; filter-audio = callPackage ../development/libraries/filter-audio {}; - filtron = callPackage ../servers/filtron { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + filtron = callPackage ../servers/filtron { }; flann = callPackage ../development/libraries/flann { }; @@ -18789,14 +19221,9 @@ with pkgs; gd = callPackage ../development/libraries/gd { automake = automake115x; - libtiff = null; - libXpm = null; }; - gdal = callPackage ../development/libraries/gdal { - pythonPackages = python3Packages; - autoreconfHook = buildPackages.autoreconfHook269; - }; + gdal = callPackage ../development/libraries/gdal { }; gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; @@ -18818,15 +19245,11 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; - graphia = libsForQt514.callPackage ../applications/science/misc/graphia { - # Using gcc 10 because this fails to build with gcc 11 - # Error similar to this https://github.com/RPCS3/rpcs3/issues/10291 - stdenv = gcc10Stdenv; - }; + graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; - graphinder = callPackage ../tools/security/graphinder { - python3 = python310; - }; + graphinder = callPackage ../tools/security/graphinder { }; + + httplib = callPackage ../development/libraries/httplib { }; icon-lang = callPackage ../development/interpreters/icon-lang { }; @@ -18927,6 +19350,7 @@ with pkgs; if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else targetPackages.darwin.LibsystemCross or (throw "don't yet have a `targetPackages.darwin.LibsystemCross for ${stdenv.targetPlatform.config}`") + else if name == "fblibc" then targetPackages.freebsdCross.libc or freebsdCross.libc else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else if name == "relibc" then targetPackages.relibc or relibc @@ -18935,10 +19359,13 @@ with pkgs; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; - threadsCross = - if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) - then targetPackages.windows.mcfgthreads or windows.mcfgthreads - else null; + threadsCross = if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) + then { + # other possible values: win32 or posix + model = "mcf"; + # For win32 or posix set this to null + package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; + } else {}; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; @@ -19022,8 +19449,7 @@ with pkgs; gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; - gobject-introspection = if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages - then callPackage ../development/libraries/gobject-introspection/wrapper.nix { } else gobject-introspection-unwrapped; + gobject-introspection = callPackage ../development/libraries/gobject-introspection/wrapper.nix { }; gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; @@ -19046,16 +19472,16 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; grpc = callPackage ../development/libraries/grpc { - # grpc builds with c++14 so abseil must also be built that way - abseil-cpp = abseil-cpp_202111.override { - cxxStandard = "14"; + # grpc builds with c++17 so abseil must also be built that way + abseil-cpp = abseil-cpp_202206.override { + cxxStandard = "17"; }; }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; }); + callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; }); inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); @@ -19098,8 +19524,6 @@ with pkgs; gsl = callPackage ../development/libraries/gsl { }; - gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; - gsl-lite = callPackage ../development/libraries/gsl-lite { }; gsm = callPackage ../development/libraries/gsm {}; @@ -19277,7 +19701,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; autoreconfHook = buildPackages.autoreconfHook269; }; - libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; @@ -19392,8 +19815,11 @@ with pkgs; icu71 = callPackage ../development/libraries/icu/71.nix ({ nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; }); + icu72 = callPackage ../development/libraries/icu/72.nix ({ + nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; }; + }); - icu = icu71; + icu = icu72; id3lib = callPackage ../development/libraries/id3lib { }; @@ -19512,11 +19938,7 @@ with pkgs; jbigkit = callPackage ../development/libraries/jbigkit { }; - jemalloc = callPackage ../development/libraries/jemalloc { - # tests fail with LLVM 11+ - # https://github.com/jemalloc/jemalloc/issues/2091 - stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv; - }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jose = callPackage ../development/libraries/jose { }; @@ -19569,7 +19991,6 @@ with pkgs; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; - krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; kronosnet = callPackage ../development/libraries/kronosnet { }; @@ -19613,12 +20034,16 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; - lemon-graph = callPackage ../development/libraries/lemon-graph { }; + lemon-graph = callPackage ../development/libraries/lemon-graph { + stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + }; levmar = callPackage ../development/libraries/levmar { }; leptonica = callPackage ../development/libraries/leptonica { }; + lerc = callPackage ../development/libraries/lerc { }; + lib2geom = callPackage ../development/libraries/lib2geom { }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -20024,6 +20449,7 @@ with pkgs; libgxps = callPackage ../development/libraries/libgxps { }; libiio = callPackage ../development/libraries/libiio { + inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices; python = python3; }; @@ -20116,7 +20542,10 @@ with pkgs; inherit (darwin) libobjc; }; - libftdi = callPackage ../development/libraries/libftdi { }; + libftdi = callPackage ../development/libraries/libftdi { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; @@ -20173,6 +20602,10 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libhv = callPackage ../development/libraries/libhv { + inherit (darwin.apple_sdk.frameworks) Security; + }; + libhwy = callPackage ../development/libraries/libhwy { }; libHX = callPackage ../development/libraries/libHX { }; @@ -20251,9 +20684,7 @@ with pkgs; libmysofa = callPackage ../development/libraries/audio/libmysofa { }; - libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { - openssl = openssl_1_1; - }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {}; libnatpmp = callPackage ../development/libraries/libnatpmp { }; @@ -20543,7 +20974,9 @@ with pkgs; libow = callPackage ../development/libraries/libow { }; - libp11 = callPackage ../development/libraries/libp11 { }; + libp11 = callPackage ../development/libraries/libp11 { + openssl = openssl_1_1; + }; libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; @@ -20717,7 +21150,7 @@ with pkgs; libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python2; + python = python3; }; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; @@ -20913,7 +21346,7 @@ with pkgs; }; libxml2Python = let - libxml2 = python2Packages.libxml2; + inherit (python3.pkgs) libxml2; in pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; @@ -20998,6 +21431,8 @@ with pkgs; liquidfun = callPackage ../development/libraries/liquidfun { }; + litehtml = callPackage ../development/libraries/litehtml { }; + live555 = callPackage ../development/libraries/live555 { }; log4cpp = callPackage ../development/libraries/log4cpp { }; @@ -21016,6 +21451,8 @@ with pkgs; luabind_luajit = luabind.override { lua = luajit; }; + luabridge = callPackage ../development/libraries/luabridge { }; + luksmeta = callPackage ../development/libraries/luksmeta { asciidoc = asciidoc-full; }; @@ -21029,15 +21466,12 @@ with pkgs; opencl-clang = callPackage ../development/libraries/opencl-clang { }; mapnik = callPackage ../development/libraries/mapnik { - gdal = gdal.override { - libgeotiff = libgeotiff.override { proj = proj_7; }; - libspatialite = libspatialite.override { proj = proj_7; }; - proj = proj_7; + harfbuzz = harfbuzz.override { + withIcu = true; }; - proj = proj_7; - boost = boost175; }; + manticoresearch = callPackage ../servers/search/manticoresearch { }; marisa = callPackage ../development/libraries/marisa {}; @@ -21047,7 +21481,8 @@ with pkgs; maxflow = callPackage ../development/libraries/maxflow { }; - mbedtls = callPackage ../development/libraries/mbedtls { }; + mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; + mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; mdctags = callPackage ../development/tools/misc/mdctags { }; @@ -21157,6 +21592,8 @@ with pkgs; mosquitto = callPackage ../servers/mqtt/mosquitto { }; + nanomq = callPackage ../servers/mqtt/nanomq { }; + mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -21195,6 +21632,8 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; + mujoco = callPackage ../applications/science/robotics/mujoco { }; + muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; @@ -21297,8 +21736,6 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - nsss = skawarePackages.nsss; - ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -21361,11 +21798,15 @@ with pkgs; ode = callPackage ../development/libraries/ode { }; - ogre = callPackage ../development/libraries/ogre {}; + ogre = callPackage ../development/libraries/ogre { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; - ogrepaged = callPackage ../development/libraries/ogrepaged { }; + ogrepaged = callPackage ../development/libraries/ogrepaged { + ogre = ogre1_9; + }; olm = callPackage ../development/libraries/olm { }; @@ -21447,7 +21888,7 @@ with pkgs; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; openldap = callPackage ../development/libraries/openldap { - openssl = openssl_1_1; + openssl = openssl_legacy; }; opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { @@ -21498,10 +21939,16 @@ with pkgs; boringssl = callPackage ../development/libraries/boringssl { }; - wolfssl = callPackage ../development/libraries/wolfssl { }; + wolfssl = callPackage ../development/libraries/wolfssl { + inherit (darwin.apple_sdk.frameworks) Security; + }; openssl = openssl_3; + openssl_legacy = openssl.override { + conf = ../development/libraries/openssl/3.0/legacy.cnf; + }; + inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3; @@ -21570,7 +22017,7 @@ with pkgs; pe-parse = callPackage ../development/libraries/pe-parse { }; inherit (callPackage ../development/libraries/physfs { - inherit (darwin.apple_sdk.frameworks) Foundation Carbon; + inherit (darwin.apple_sdk.frameworks) Foundation; }) physfs_2 physfs; @@ -21688,7 +22135,7 @@ with pkgs; python-qt = callPackage ../development/libraries/python-qt { python = python27; - inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; + inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -21732,60 +22179,20 @@ with pkgs; developerBuild = true; }; - qt512 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.12) { - inherit newScope; - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit darwin; - inherit buildPackages; - stdenv = if stdenv.cc.isGNU - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) - else stdenv; - }); - - qt514 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.14) { - inherit newScope; - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit darwin; - inherit buildPackages; - stdenv = if stdenv.cc.isGNU - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) - else stdenv; - }); - - qt515 = recurseIntoAttrs (makeOverridable + qt5 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3 python3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; inherit buildPackages; }); - libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt512; - }); - - libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt514; - }); - - libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib pkgs; - qt5 = qt515; + libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { + inherit lib pkgs qt5; }); - qt5 = qt515; - libsForQt5 = libsForQt515; - # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 qt5_openssl_1_1 = qt5.overrideScope' (_: super: { qtbase = super.qtbase.override { @@ -21802,7 +22209,7 @@ with pkgs; }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop - plasma5Packages = libsForQt515; + plasma5Packages = libsForQt5; qtEnv = qt5.env; qt5Full = qt5.full; @@ -21810,10 +22217,11 @@ with pkgs; qt6 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-6) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; + inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit buildPackages; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; + inherit darwin buildPackages libglvnd; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ ../development/libraries/qt-6/patches/cmake.patch @@ -22057,8 +22465,6 @@ with pkgs; SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - sdnotify-wrapper = skawarePackages.sdnotify-wrapper; - sdrplay = callPackage ../applications/radio/sdrplay {}; sdrpp = callPackage ../applications/radio/sdrpp { @@ -22077,6 +22483,8 @@ with pkgs; seasocks = callPackage ../development/libraries/seasocks { }; + semver-cpp = callPackage ../development/libraries/semver-cpp { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf { @@ -22086,10 +22494,7 @@ with pkgs; sfsexp = callPackage ../development/libraries/sfsexp {}; - shhgit = callPackage ../tools/security/shhgit { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + shhgit = callPackage ../tools/security/shhgit { }; shhmsg = callPackage ../development/libraries/shhmsg { }; @@ -22128,45 +22533,34 @@ with pkgs; skjold = callPackage ../development/tools/skjold { }; - skalibs = skawarePackages.skalibs; - skalibs_2_10 = skawarePackages.skalibs_2_10; - - skawarePackages = recurseIntoAttrs rec { - cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { - inherit cleanPackaging; - }; - buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { }; - - skalibs = callPackage ../development/libraries/skalibs { }; - skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { }; - execline = callPackage ../tools/misc/execline { }; + skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { }); + + inherit (skawarePackages) + execline + execline-man-pages + mdevd + nsss + s6 + s6-dns + s6-linux-init + s6-linux-utils + s6-man-pages + s6-networking + s6-networking-man-pages + s6-portable-utils + s6-portable-utils-man-pages + s6-rc + sdnotify-wrapper + skalibs + skalibs_2_10 + utmps; - execline-man-pages = callPackage ../data/documentation/execline-man-pages { - inherit buildManPages; - }; - - s6 = callPackage ../tools/system/s6 { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; - s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; - s6-networking = callPackage ../tools/networking/s6-networking { }; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; - s6-rc = callPackage ../tools/system/s6-rc { }; - s6-man-pages = callPackage ../data/documentation/s6-man-pages { - inherit buildManPages; - }; - s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages { - inherit buildManPages; - }; - s6-portable-utils-man-pages = callPackage ../data/documentation/s6-portable-utils-man-pages { - inherit buildManPages; - }; + kgt = callPackage ../development/tools/kgt { + inherit (skawarePackages) cleanPackaging; + }; - mdevd = callPackage ../os-specific/linux/mdevd { }; - nsss = callPackage ../development/libraries/nsss { }; - utmps = callPackage ../development/libraries/utmps { }; - sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; }; slang = callPackage ../development/libraries/slang { }; @@ -22182,6 +22576,8 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + snac2 = callPackage ../servers/snac2 { }; + snappymail = callPackage ../servers/snappymail { }; snow = callPackage ../tools/security/snow { }; @@ -22271,6 +22667,8 @@ with pkgs; speech-tools = callPackage ../development/libraries/speech-tools {}; + speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {}; + speex = callPackage ../development/libraries/speex { fftw = fftwFloat; }; @@ -22285,6 +22683,8 @@ with pkgs; sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; + inherit (python3Packages) sphinxHook; + sphinxsearch = callPackage ../servers/search/sphinxsearch { }; spice = callPackage ../development/libraries/spice { }; @@ -22388,15 +22788,6 @@ with pkgs; suil = callPackage ../development/libraries/audio/suil { }; - suil-qt5 = suil.override { - withQt4 = false; - withQt5 = true; - }; - suil-qt4 = suil.override { - withQt4 = true; - withQt5 = false; - }; - sundials = callPackage ../development/libraries/sundials { python = python3; }; @@ -22570,8 +22961,6 @@ with pkgs; uthenticode = callPackage ../development/libraries/uthenticode { }; - utmps = skawarePackages.utmps; - ucommon = callPackage ../development/libraries/ucommon { }; v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; @@ -22635,7 +23024,7 @@ with pkgs; vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { + vtk_8 = libsForQt5.callPackage ../development/libraries/vtk/8.x.nix { stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -22646,7 +23035,7 @@ with pkgs; vtk_8_withQt5 = vtk_8.override { enableQt = true; }; - vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -22669,7 +23058,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; - vulkan-utils = haskell.lib.compose.justStaticExecutables haskellPackages.vulkan-utils; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vxl = callPackage ../development/libraries/vxl { }; @@ -22729,24 +23117,14 @@ with pkgs; wt3 wt4; - wxformbuilder = callPackage ../development/tools/wxformbuilder { }; - - wxGTK = wxGTK28; - - wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; - - wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; + wxformbuilder = callPackage ../development/tools/wxformbuilder { + inherit (darwin.apple_sdk.frameworks) Cocoa; }; wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { - withGtk2 = true; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; }; - wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; - wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { inherit (darwin.stubs) derez rez setfile; @@ -22757,8 +23135,6 @@ with pkgs; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; }; - wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; - wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix { inherit (darwin.stubs) setfile; @@ -22766,7 +23142,7 @@ with pkgs; }; wxSVG = callPackage ../development/libraries/wxSVG { - wxGTK = wxGTK30-gtk3; + wxGTK = wxGTK30; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -22855,8 +23231,6 @@ with pkgs; yojimbo = callPackage ../development/libraries/yojimbo { }; - yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; - yubico-pam = callPackage ../development/libraries/yubico-pam { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { @@ -22865,6 +23239,7 @@ with pkgs; yubihsm-connector = callPackage ../tools/security/yubihsm-connector { }; + yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; @@ -22879,6 +23254,8 @@ with pkgs; yubihsm-shell = callPackage ../tools/security/yubihsm-shell { }; + yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -23019,19 +23396,6 @@ with pkgs; buildGoModule = buildGo119Module; buildGoPackage = buildGo119Package; - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ - inherit (darwin.apple_sdk.frameworks) Foundation Security; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - buildGo117Module = callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_17; - }; - buildGo117Package = callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_17; - }; - # requires a newer Apple SDK go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; @@ -23239,18 +23603,17 @@ with pkgs; cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix { + # Effective Cassandra 4.0.2 there is full Java 11 support + # -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html + jre = pkgs.jdk11_headless; + }; cassandra = cassandra_3_11; cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { }; @@ -23267,7 +23630,7 @@ with pkgs; inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_16 asterisk_18 asterisk_19; + asterisk_16 asterisk_18 asterisk_19 asterisk_20; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; @@ -23382,6 +23745,8 @@ with pkgs; hyp = callPackage ../servers/http/hyp { }; + peering-manager = callPackage ../servers/web-apps/peering-manager { }; + podgrab = callPackage ../servers/misc/podgrab { }; portunus = callPackage ../servers/portunus { }; @@ -23450,9 +23815,7 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { - buildGoModule = buildGo118Module; # tests fail with 1.19 - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; @@ -23465,10 +23828,7 @@ with pkgs; gerbera = callPackage ../servers/gerbera {}; - gobetween = callPackage ../servers/gobetween { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gobetween = callPackage ../servers/gobetween { }; gobgpd = callPackage ../servers/misc/gobgpd { }; @@ -23486,9 +23846,8 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_1_7 hbase_2_4 hbase_3_0; - hbase1 = hbase_1_7; - hbase2 = hbase_2_4; + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; + hbase2 = hbase_2_5; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release @@ -23504,6 +23863,8 @@ with pkgs; home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; + honk = callPackage ../servers/honk { }; + hqplayerd = callPackage ../servers/hqplayerd { }; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; @@ -23512,8 +23873,6 @@ with pkgs; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; }; ic-keysmith = callPackage ../tools/security/ic-keysmith { }; @@ -23627,6 +23986,8 @@ with pkgs; memcached = callPackage ../servers/memcached {}; + merecat = callPackage ../servers/http/merecat { }; + meteor = callPackage ../servers/meteor { }; micronaut = callPackage ../development/tools/micronaut {}; @@ -23769,9 +24130,7 @@ with pkgs; openbgpd = callPackage ../servers/openbgpd { }; - openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; - # Current stable release; don't backport release updates! - openafs = openafs_1_8; + openafs = callPackage ../servers/openafs/1.8 { }; openresty = callPackage ../servers/http/openresty { withPerl = false; @@ -23867,6 +24226,10 @@ with pkgs; boost = boost172; }; + soundux = callPackage ../applications/audio/soundux { + yt-dlp = yt-dlp.override { withAlias = true; }; + }; + tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; @@ -23892,7 +24255,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_107 mariadb_108 mariadb_109 ; @@ -23952,12 +24314,6 @@ with pkgs; nginx-sso = callPackage ../servers/nginx-sso { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { - stdenv = gcc10StdenvCompat; - openssl = openssl_1_1; - }; - percona-server = percona-server56; - immudb = callPackage ../servers/nosql/immudb { }; influxdb = callPackage ../servers/nosql/influxdb { }; @@ -24135,6 +24491,7 @@ with pkgs; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; + prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19 }; @@ -24180,7 +24537,7 @@ with pkgs; pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { }; pypiserver = with python3Packages; toPythonApplication pypiserver; @@ -24199,12 +24556,6 @@ with pkgs; radicale = radicale3; - radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {}; - rake = callPackage ../development/tools/build-managers/rake { }; rakkess = callPackage ../development/tools/rakkess { }; @@ -24241,9 +24592,7 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - s6 = skawarePackages.s6; - - s6-rc = skawarePackages.s6-rc; + rustic-rs = callPackage ../tools/backup/rustic-rs { inherit (darwin) Security; }; supervise = callPackage ../tools/system/supervise { }; @@ -24313,10 +24662,7 @@ with pkgs; spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; - squid = callPackage ../servers/squid { - # https://bugs.squid-cache.org/show_bug.cgi?id=5133 - openssl = openssl_1_1; - }; + squid = callPackage ../servers/squid { }; duckling-proxy = callPackage ../servers/duckling-proxy { }; @@ -24326,6 +24672,10 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; + surrealdb = callPackage ../servers/nosql/surrealdb { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; slurm = callPackage ../servers/computing/slurm { }; @@ -24338,6 +24688,8 @@ with pkgs; tailscale = callPackage ../servers/tailscale { }; + tailspin = callPackage ../tools/misc/tailspin { }; + thanos = callPackage ../servers/monitoring/thanos { }; trafficserver = callPackage ../servers/http/trafficserver { }; @@ -24418,6 +24770,8 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; + wesher = callPackage ../servers/wesher { }; + wishlist = callPackage ../servers/wishlist { }; wsdd = callPackage ../servers/wsdd { }; @@ -24442,19 +24796,41 @@ with pkgs; inherit (darwin.apple_sdk.libs) Xplugin; }; - # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` - # so as not to have the newly bound xorg items already in scope, which would - # have created a cycle. - xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { - }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; - inherit (darwin.apple_sdk.libs) Xplugin; - inherit (buildPackages.darwin) bootstrap_cmds; - udev = if stdenv.isLinux then udev else null; - libdrm = if stdenv.isLinux then libdrm else null; - abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` - or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - })); + xorg = let + otherSplices = { + selfBuildBuild = pkgsBuildBuild.xorg; + selfBuildHost = pkgsBuildHost.xorg; + selfBuildTarget = pkgsBuildTarget.xorg; + selfHostHost = pkgsHostHost.xorg; + selfTargetTarget = pkgsTargetTarget.xorg or { }; + }; + keep = _self: { }; + extra = _spliced0: { }; + + # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` + # so as not to have the newly bound xorg items already in scope, which would + # have created a cycle. + overrides = lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; + inherit (darwin.apple_sdk.libs) Xplugin; + inherit (buildPackages.darwin) bootstrap_cmds; + udev = if stdenv.isLinux then udev else null; + libdrm = if stdenv.isLinux then libdrm else null; + abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` + or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin + }; + + generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {}; + + xorgPackages = lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (lib.extends overrides generatedPackages); + + in recurseIntoAttrs xorgPackages; xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { }; @@ -24501,10 +24877,7 @@ with pkgs; mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; @@ -24534,10 +24907,7 @@ with pkgs; alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; - alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; @@ -24756,6 +25126,8 @@ with pkgs; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; + fan2go = callPackage ../os-specific/linux/fan2go { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; ffado = libsForQt5.callPackage ../os-specific/linux/ffado { @@ -24828,7 +25200,9 @@ with pkgs; htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; - humility = callPackage ../development/tools/rust/humility {}; + humility = callPackage ../development/tools/rust/humility { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; btop = callPackage ../tools/system/btop { stdenv = gcc11Stdenv; @@ -24854,6 +25228,8 @@ with pkgs; intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; + level-zero = callPackage ../development/libraries/level-zero { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; @@ -24925,7 +25301,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Hypervisor; }; - libkrun-sev = callPackage ../development/libraries/libkrun { sevVariant = true; }; + libkrun-sev = libkrun.override { sevVariant = true; }; libkrunfw = callPackage ../development/libraries/libkrunfw { }; @@ -24975,7 +25351,7 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; }; - inherit (callPackages ../os-specific/linux/kernel-headers { }) + inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) linuxHeaders makeLinuxHeaders; linuxHeaders_5_19 = linuxHeaders.overrideAttrs (_: rec { @@ -25070,8 +25446,6 @@ with pkgs; linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; - linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; - linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; @@ -25181,7 +25555,7 @@ with pkgs; mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; - inherit (skawarePackages) mdevd; + mdevctl = callPackage ../os-specific/linux/mdevctl { }; metastore = callPackage ../os-specific/linux/metastore { }; @@ -25320,10 +25694,7 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; - go-mockery = callPackage ../development/tools/go-mockery { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + go-mockery = callPackage ../development/tools/go-mockery { }; gomacro = callPackage ../development/tools/gomacro { }; @@ -25391,9 +25762,7 @@ with pkgs; pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; - pam_p11 = callPackage ../os-specific/linux/pam_p11 { - openssl = openssl_1_1; - }; + pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; @@ -25405,10 +25774,7 @@ with pkgs; pam_usb = callPackage ../os-specific/linux/pam_usb { }; - pam_ussh = callPackage ../os-specific/linux/pam_ussh { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + pam_ussh = callPackage ../os-specific/linux/pam_ussh { }; paxctl = callPackage ../os-specific/linux/paxctl { }; @@ -25557,6 +25923,8 @@ with pkgs; shadow = callPackage ../os-specific/linux/shadow { }; + shortcat = callPackage ../os-specific/darwin/shortcat { }; + sinit = callPackage ../os-specific/linux/sinit { rcinit = "/etc/rc.d/rc.init"; rcshutdown = "/etc/rc.d/rc.shutdown"; @@ -25574,10 +25942,11 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; + steamos-devkit = callPackage ../development/tools/steamos-devkit { }; + swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; sysdig = callPackage ../os-specific/linux/sysdig { - openssl = openssl_1_1; kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor @@ -25678,6 +26047,8 @@ with pkgs; twa = callPackage ../tools/networking/twa { }; + twingate = callPackage ../applications/networking/twingate { }; + # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot @@ -25850,6 +26221,10 @@ with pkgs; alegreya-sans = callPackage ../data/fonts/alegreya-sans { }; + alice = callPackage ../data/fonts/alice { }; + + alkalami = callPackage ../data/fonts/alkalami { }; + amber-theme = callPackage ../data/themes/amber { }; amiri = callPackage ../data/fonts/amiri { }; @@ -25929,6 +26304,8 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; + catppuccin-cursors = callPackage ../data/icons/catppuccin-cursors { }; + ccsymbols = callPackage ../data/fonts/ccsymbols { }; charis-sil = callPackage ../data/fonts/charis-sil { }; @@ -25977,6 +26354,8 @@ with pkgs; crimson = callPackage ../data/fonts/crimson {}; + crimson-pro = callPackage ../data/fonts/crimson-pro {}; + dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 @@ -26085,8 +26464,6 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; - execline-man-pages = skawarePackages.execline-man-pages; - ezra-sil = callPackage ../data/fonts/ezra-sil { }; fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; @@ -26167,6 +26544,10 @@ with pkgs; hack-font = callPackage ../data/fonts/hack { }; + hackgen-font = callPackage ../data/fonts/hackgen { }; + + hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { }; + helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; helvum = callPackage ../applications/audio/helvum { }; @@ -26181,6 +26562,8 @@ with pkgs; hermit = callPackage ../data/fonts/hermit { }; + hubot-sans = callPackage ../data/fonts/hubot-sans { }; + humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { }; hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; @@ -26308,6 +26691,8 @@ with pkgs; line-awesome = callPackage ../data/fonts/line-awesome { }; + linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {}; + linux-manual = callPackage ../data/documentation/linux-manual { }; lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {}; @@ -26350,6 +26735,8 @@ with pkgs; manrope = callPackage ../data/fonts/manrope { }; + martian-mono = callPackage ../data/fonts/martian-mono { }; + marwaita = callPackage ../data/themes/marwaita { }; marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; @@ -26398,6 +26785,8 @@ with pkgs; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; + mona-sans = callPackage ../data/fonts/mona-sans { }; + monoid = callPackage ../data/fonts/monoid { }; mononoki = callPackage ../data/fonts/mononoki { }; @@ -26428,9 +26817,7 @@ with pkgs; national-park-typeface = callPackage ../data/fonts/national-park { }; - netease-music-tui = callPackage ../applications/audio/netease-music-tui { - openssl = openssl_1_1; - }; + netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration; @@ -26601,6 +26988,8 @@ with pkgs; route159 = callPackage ../data/fonts/route159 { }; + ruwudu = callPackage ../data/fonts/ruwudu { }; + sampradaya = callPackage ../data/fonts/sampradaya { }; sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; @@ -26623,6 +27012,8 @@ with pkgs; sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; + simp1e-cursors = callPackage ../data/icons/simp1e-cursors { }; + sjasmplus = callPackage ../development/compilers/sjasmplus { }; skeu = callPackage ../data/themes/skeu { }; @@ -26677,6 +27068,8 @@ with pkgs; stix-two = callPackage ../data/fonts/stix-two { }; + super-tiny-icons = callPackage ../data/icons/super-tiny-icons { }; + inherit (callPackages ../data/fonts/gdouros { }) aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings; @@ -26717,12 +27110,6 @@ with pkgs; open-fonts = callPackage ../data/fonts/open-fonts { }; - s6-man-pages = skawarePackages.s6-man-pages; - - s6-networking-man-pages = skawarePackages.s6-networking-man-pages; - - s6-portable-utils-man-pages = skawarePackages.s6-portable-utils-man-pages; - scientifica = callPackage ../data/fonts/scientifica { }; siji = callPackage ../data/fonts/siji { }; @@ -26772,7 +27159,9 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; - tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { + inherit (gnome) adwaita-icon-theme; + }; tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; @@ -26912,7 +27301,9 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { }; + zeal = zeal-qt5; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -26968,6 +27359,8 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; + aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {}; + abcde = callPackage ../applications/audio/abcde { inherit (python3Packages) eyeD3; }; @@ -26994,7 +27387,7 @@ with pkgs; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; - foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { }; + foxitreader = libsForQt5.callPackage ../applications/misc/foxitreader { }; pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; @@ -27023,7 +27416,7 @@ with pkgs; ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { qt5 = qt514; }; + airwave = callPackage ../applications/audio/airwave { }; akira-unstable = callPackage ../applications/graphics/akira { }; @@ -27043,7 +27436,7 @@ with pkgs; msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5_openssl_1_1.callPackage ../applications/audio/amarok { }; + amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -27062,7 +27455,7 @@ with pkgs; antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt514.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -27094,6 +27487,7 @@ with pkgs; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; + ardour_6 = callPackage ../applications/audio/ardour/6.nix { }; ardour = callPackage ../applications/audio/ardour { }; arelle = with python3Packages; toPythonApplication arelle; @@ -27152,7 +27546,6 @@ with pkgs; audacity = callPackage ../applications/audio/audacity { inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; - suil = suil-qt5; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -27183,7 +27576,7 @@ with pkgs; milkytracker = callPackage ../applications/audio/milkytracker { }; - ptcollab = libsForQt515.callPackage ../applications/audio/ptcollab { }; + ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -27191,6 +27584,8 @@ with pkgs; join-desktop = callPackage ../applications/misc/join-desktop { }; + json-plot = callPackage ../applications/graphics/json-plot {}; + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found }; @@ -27356,7 +27751,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; bottles = callPackage ../applications/misc/bottles { - wine = wineWowPackages.minimal; + wine = null; }; brave = callPackage ../applications/networking/browsers/brave { }; @@ -27403,6 +27798,8 @@ with pkgs; inherit (gnome2) libglade; }; + calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { }; + calcurse = callPackage ../applications/misc/calcurse { }; calculix = callPackage ../applications/science/math/calculix {}; @@ -27439,7 +27836,7 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -27462,9 +27859,6 @@ with pkgs; centerim = callPackage ../applications/networking/instant-messengers/centerim { }; - cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; - cgit-pink = callPackage ../applications/version-management/git-and-tools/cgit/pink.nix { }; - chatty = callPackage ../applications/networking/instant-messengers/chatty { }; chirp = callPackage ../applications/radio/chirp { }; @@ -27569,7 +27963,7 @@ with pkgs; ffmpeg = ffmpeg-full; }; - cpeditor = libsForQt515.callPackage ../applications/editors/cpeditor { }; + cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -27608,6 +28002,8 @@ with pkgs; cozy-drive = callPackage ../applications/networking/cozy-drive {}; + cplay-ng = callPackage ../applications/audio/cplay-ng { }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -27654,8 +28050,6 @@ with pkgs; configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); - darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; - darkman = callPackage ../applications/misc/darkman { }; darktable = callPackage ../applications/graphics/darktable { @@ -27766,6 +28160,8 @@ with pkgs; docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; + dockstarter = callPackage ../tools/virtualization/dockstarter {}; + doodle = callPackage ../applications/search/doodle { }; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; @@ -27838,6 +28234,8 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; + emoji-picker = callPackage ../applications/misc/emoji-picker {}; + exploitdb = callPackage ../tools/security/exploitdb { }; evilwm = callPackage ../applications/window-managers/evilwm { @@ -27854,9 +28252,7 @@ with pkgs; echoip = callPackage ../servers/echoip { }; - eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { - jdk = jdk11; - }); + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -27949,9 +28345,9 @@ with pkgs; inherit (gnome) empathy; - endeavour = callPackage ../applications/misc/endeavour { }; + endeavour = callPackage ../applications/office/endeavour { }; - enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { }; entangle = callPackage ../applications/video/entangle { inherit (gst_all_1) gstreamer gst-plugins-base; @@ -28019,7 +28415,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; + furtherance = callPackage ../applications/misc/furtherance { }; gigalixir = callPackage ../tools/misc/gigalixir { }; @@ -28035,6 +28431,8 @@ with pkgs; gspeech = callPackage ../applications/audio/gspeech { }; + gtkcord4 = callPackage ../applications/audio/gtkcord4 {}; + haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; @@ -28078,8 +28476,6 @@ with pkgs; kvmtool = callPackage ../applications/virtualization/kvmtool { }; - exrdisplay = callPackage ../applications/graphics/exrdisplay { }; - exrtools = callPackage ../applications/graphics/exrtools { }; f1viewer = callPackage ../applications/video/f1viewer {}; @@ -28213,8 +28609,6 @@ with pkgs; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; - gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; - globe-cli = callPackage ../applications/misc/globe-cli { }; gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; @@ -28257,7 +28651,7 @@ with pkgs; python = python3; }; }; - gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio.pkgs; + gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs; # A build without gui components and other utilites not needed for end user # libraries gnuradio3_9Minimal = gnuradio.override { @@ -28384,7 +28778,9 @@ with pkgs; fftw = fftwSinglePrec; }; - gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gjay = callPackage ../applications/audio/gjay { }; @@ -28448,11 +28844,9 @@ with pkgs; firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; firefox = wrapFirefox firefox-unwrapped { }; - firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; - firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; @@ -28494,10 +28888,6 @@ with pkgs; libName = "librewolf"; }; - librewolf-wayland = librewolf.override { - forceWayland = true; - }; - firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; fmtoy = callPackage ../tools/audio/fmtoy { }; @@ -28543,7 +28933,7 @@ with pkgs; freecad = libsForQt5.callPackage ../applications/graphics/freecad { boost = python3Packages.boost; inherit (python3Packages) - GitPython + gitpython matplotlib pivy ply @@ -28558,6 +28948,9 @@ with pkgs; freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; + codec2 = codec2.override { + freedvSupport = true; + }; }; freemind = callPackage ../applications/misc/freemind { @@ -28565,9 +28958,7 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freenet = callPackage ../applications/networking/p2p/freenet { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + freenet = callPackage ../applications/networking/p2p/freenet { }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; @@ -28625,61 +29016,8 @@ with pkgs; gtk = gtk3; }; - git = callPackage ../applications/version-management/git-and-tools/git { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; - smtpPerlLibs = [ - perlPackages.libnet perlPackages.NetSMTPSSL - perlPackages.IOSocketSSL perlPackages.NetSSLeay - perlPackages.AuthenSASL perlPackages.DigestHMAC - ]; - }; - - # The full-featured Git. - gitFull = git.override { - svnSupport = true; - guiSupport = true; - sendEmailSupport = true; - withSsh = true; - withLibsecret = !stdenv.isDarwin; - }; - - # Git with SVN support, but without GUI. - gitSVN = lowPrio (git.override { svnSupport = true; }); - - git-autofixup = perlPackages.GitAutofixup; - - git-doc = lib.addMetaAttrs { - description = "Additional documentation for Git"; - longDescription = '' - This package contains additional documentation (HTML and text files) that - is referenced in the man pages of Git. - ''; - } gitFull.doc; - - gitMinimal = git.override { - withManual = false; - pythonSupport = false; - perlSupport = false; - withpcre2 = false; - }; - - gitRepo = callPackage ../applications/version-management/git-repo { }; - - git-quick-stats = callPackage ../development/tools/git-quick-stats {}; - - git-review = python3Packages.callPackage ../applications/version-management/git-review { }; - - git-team = callPackage ../applications/version-management/git-and-tools/git-team { }; - - github-cli = gh; - gitolite = callPackage ../applications/version-management/gitolite { }; - gitoxide = callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - inherit (gnome) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -28697,7 +29035,7 @@ with pkgs; gum = callPackage ../applications/misc/gum { }; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { - inherit miniupnpc_2 swftools; + inherit miniupnpc swftools; inherit (qt5) wrapQtAppsHook; }; @@ -28710,8 +29048,6 @@ with pkgs; jmusicbot = callPackage ../applications/audio/jmusicbot { }; - josh = callPackage ../applications/version-management/josh { }; - junction = callPackage ../applications/misc/junction { }; lemonade = callPackage ../applications/misc/lemonade { }; @@ -28846,6 +29182,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; }; + goodvibes = callPackage ../applications/audio/goodvibes { }; + googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; @@ -28856,6 +29194,8 @@ with pkgs; go-graft = callPackage ../applications/networking/go-graft { }; + gostatic = callPackage ../applications/misc/gostatic {}; + gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; @@ -28880,12 +29220,18 @@ with pkgs; gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; + gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; + + gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; + + gpxsee = gpxsee-qt5; gspell = callPackage ../development/libraries/gspell { }; gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; + gtklock = callPackage ../tools/wayland/gtklock { }; + guardian-agent = callPackage ../tools/networking/guardian-agent { }; gv = callPackage ../applications/misc/gv { }; @@ -28922,10 +29268,6 @@ with pkgs; hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; - hdr-plus = callPackage ../applications/graphics/hdr-plus { - stdenv = clangStdenv; - }; - hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { }; heimer = libsForQt5.callPackage ../applications/misc/heimer { }; @@ -29006,7 +29348,7 @@ with pkgs; inherit (nodePackages) hueadm; hugin = callPackage ../applications/graphics/hugin { - wxGTK = wxGTK30; + wxGTK = wxGTK32; }; haunt = callPackage ../applications/misc/haunt { }; @@ -29062,6 +29404,8 @@ with pkgs; meerk40t = callPackage ../applications/misc/meerk40t { }; + meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; + musikcube = callPackage ../applications/audio/musikcube { inherit (darwin.apple_sdk.frameworks) Cocoa SystemConfiguration; }; @@ -29098,6 +29442,8 @@ with pkgs; pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; + popura = callPackage ../tools/networking/popura {}; + shepherd = nodePackages."@nerdwallet/shepherd"; skate = callPackage ../applications/misc/skate { }; @@ -29140,9 +29486,11 @@ with pkgs; electron = electron_17; }; - wlroots = wlroots_0_15; - wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { }; - wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { }; + inherit (callPackages ../development/libraries/wlroots {}) + wlroots_0_14 + wlroots_0_15 + wlroots_0_16 + wlroots; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; @@ -29171,6 +29519,8 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; + waylock = callPackage ../applications/misc/waylock {}; + wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; @@ -29271,8 +29621,6 @@ with pkgs; stdenv = gccStdenv; }; - ike = callPackage ../applications/networking/ike { }; - ikiwiki = callPackage ../applications/misc/ikiwiki { python = python3; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; @@ -29374,6 +29722,8 @@ with pkgs; imhex = callPackage ../applications/editors/imhex { }; + inframap = callPackage ../applications/networking/cluster/inframap {}; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inklingreader = callPackage ../tools/misc/inklingreader { }; @@ -29399,7 +29749,7 @@ with pkgs; lua = lua5_1; }; - ipe = libsForQt514.callPackage ../applications/graphics/ipe { + ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -29436,7 +29786,7 @@ with pkgs; }; jabref = callPackage ../applications/office/jabref { - jdk = jdk18; + jdk = javaPackages.compiler.openjdk18; }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -29524,11 +29874,7 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt514.callPackage ../applications/office/kexi { }; - - kgt = callPackage ../development/tools/kgt { - inherit (skawarePackages) cleanPackaging; - }; + kexi = libsForQt5.callPackage ../applications/office/kexi { }; khronos = callPackage ../applications/office/khronos { }; @@ -29570,8 +29916,7 @@ with pkgs; kooha = callPackage ../applications/video/kooha { }; - # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently) - kotatogram-desktop = libsForQt515.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { + kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo @@ -29624,10 +29969,7 @@ with pkgs; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; - kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; kubent = callPackage ../applications/networking/cluster/kubent { }; @@ -29726,7 +30068,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -29746,7 +30088,9 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; - ladybird = qt6.callPackage ../applications/networking/browsers/ladybird { }; + ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -29764,7 +30108,7 @@ with pkgs; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - legit = callPackage ../applications/version-management/git-and-tools/legit { }; + legitify = callPackage ../development/tools/legitify { }; lens = callPackage ../applications/networking/cluster/lens { }; @@ -29842,6 +30186,8 @@ with pkgs; lingot = callPackage ../applications/audio/lingot { }; + litebrowser = callPackage ../applications/networking/browsers/litebrowser { }; + littlegptracker = callPackage ../applications/audio/littlegptracker { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -29870,6 +30216,8 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_09) ocaml; }; + lls = callPackage ../applications/networking/lls { }; + lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -29915,10 +30263,6 @@ with pkgs; lscolors = callPackage ../applications/misc/lscolors { }; - lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { - inherit (darwin.apple_sdk.frameworks) OpenCL; - }; - luddite = with python3Packages; toPythonApplication luddite; goobook = with python3Packages; toPythonApplication goobook; @@ -29946,6 +30290,7 @@ with pkgs; lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; lxi-tools = callPackage ../tools/networking/lxi-tools { }; + lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -30072,12 +30417,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + sapling = callPackage ../applications/version-management/sapling { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + }; + mercurialFull = mercurial.override { fullBuild = true; }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; mepo = callPackage ../applications/misc/mepo { }; - mepo-x11 = callPackage ../applications/misc/mepo { withX11 = true; }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -30135,9 +30483,9 @@ with pkgs; MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - wxGTK30 = wxGTK30.override { + inherit (darwin) libobjc; + wxGTK = wxGTK32.override { withWebKit = true; - withGtk2 = false; }; }; @@ -30433,7 +30781,7 @@ with pkgs; ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = callPackage ../tools/misc/nncp { }; + nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; notion = callPackage ../applications/window-managers/notion { }; @@ -30465,6 +30813,8 @@ with pkgs; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; + opcr-policy = callPackage ../development/tools/opcr-policy { }; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; @@ -30536,7 +30886,7 @@ with pkgs; yambar = callPackage ../applications/misc/yambar { }; - polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; @@ -30577,7 +30927,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt514.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; @@ -30671,7 +31021,7 @@ with pkgs; mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -30685,6 +31035,8 @@ with pkgs; navipowm = callPackage ../applications/misc/navipowm { }; + nc4nix = callPackage ../development/tools/nc4nix { }; + netbeans = callPackage ../applications/editors/netbeans { jdk = jdk17; }; @@ -30717,13 +31069,15 @@ with pkgs; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; - notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; pythonPackages = python3Packages; }; + notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; + notejot = callPackage ../applications/misc/notejot { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; @@ -30752,9 +31106,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { + obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; }; + obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; @@ -30814,10 +31169,7 @@ with pkgs; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; - open-stage-control = callPackage ../applications/audio/open-stage-control { - electron = electron_15; - nodejs = nodejs-16_x; - }; + open-stage-control = callPackage ../applications/audio/open-stage-control { }; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; @@ -30872,7 +31224,7 @@ with pkgs; libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; - openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; + openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; opusfile = callPackage ../applications/audio/opusfile { }; @@ -30991,7 +31343,7 @@ with pkgs; pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; pianoteq = callPackage ../applications/audio/pianoteq { }; @@ -31101,6 +31453,8 @@ with pkgs; poke = callPackage ../applications/editors/poke { }; + pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; + pokemonsay = callPackage ../tools/misc/pokemonsay { }; polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; @@ -31173,14 +31527,7 @@ with pkgs; pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { - # use the same stdenv as libsForQt514 to fix build - boost = boost.override { - stdenv = if stdenv.cc.isGNU - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) - else stdenv; - }; - }; + pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; @@ -31247,7 +31594,7 @@ with pkgs; qmidiroute = callPackage ../applications/audio/qmidiroute { }; - qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; + qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; @@ -31316,7 +31663,7 @@ with pkgs; quisk = python38Packages.callPackage ../applications/radio/quisk { }; - quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; quodlibet = callPackage ../applications/audio/quodlibet { inherit (gnome) adwaita-icon-theme; @@ -31454,6 +31801,8 @@ with pkgs; rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { }; + rke = callPackage ../applications/networking/cluster/rke {}; + rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; @@ -31511,6 +31860,10 @@ with pkgs; inherit (gnome) zenity; }; + rymdport = callPackage ../applications/networking/rymdport { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + uade = callPackage ../applications/audio/uade {}; udevil = callPackage ../applications/misc/udevil {}; @@ -31519,13 +31872,13 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = libsForQt515.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -31552,6 +31905,8 @@ with pkgs; semiphemeral = callPackage ../tools/misc/semiphemeral { }; + semver = callPackage ../applications/misc/semver { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; @@ -31566,10 +31921,7 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -31607,6 +31959,8 @@ with pkgs; slrn = callPackage ../applications/networking/newsreaders/slrn { }; + sniffnet = callPackage ../applications/networking/sniffnet { }; + sniproxy = callPackage ../applications/networking/sniproxy { }; snixembed = callPackage ../applications/misc/snixembed { }; @@ -31695,15 +32049,19 @@ with pkgs; synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; + synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { }; + maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; + maestro = callPackage ../development/mobile/maestro { }; + myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; insync = callPackage ../applications/networking/insync { }; - insync-v3 = libsForQt515.callPackage ../applications/networking/insync/v3.nix { }; + insync-v3 = libsForQt5.callPackage ../applications/networking/insync/v3.nix { }; libstrangle = callPackage ../tools/X11/libstrangle { stdenv = stdenv_32bit; @@ -31723,6 +32081,8 @@ with pkgs; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; + lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { conf = config.lightdm-tiny-greeter.conf or ""; }; @@ -31749,21 +32109,11 @@ with pkgs; printrun = callPackage ../applications/misc/printrun { }; - prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { }; - super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { - # https://github.com/supermerill/SuperSlicer/issues/1093 - withEGL = false; - }; - }; + super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; - super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { - # https://github.com/supermerill/SuperSlicer/issues/1093 - withEGL = false; - }; - }).latest; + super-slicer-latest = super-slicer.latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -31815,9 +32165,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - spotify-unwrapped = callPackage ../applications/audio/spotify { }; - - spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; + spotify = callPackage ../applications/audio/spotify { }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -31907,7 +32255,7 @@ with pkgs; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im { + swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; boost = boost168; }; @@ -31952,10 +32300,8 @@ with pkgs; # customConfig = builtins.readFile ./tabbed.config.h; }; - # Use GHC 9.0 when this asserts starts to fire - taffybar = assert haskellPackages.taffybar.version == "3.3.0"; - callPackage ../applications/window-managers/taffybar { - inherit (haskell.packages.ghc810) ghcWithPackages taffybar; + taffybar = callPackage ../applications/window-managers/taffybar { + inherit (haskellPackages) ghcWithPackages taffybar; }; tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; @@ -31983,6 +32329,8 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; + teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; @@ -32043,7 +32391,9 @@ with pkgs; temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { }; - tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; + temporalite = callPackage ../applications/networking/cluster/temporalite { }; + + tenacity = callPackage ../applications/audio/tenacity { }; tendermint = callPackage ../tools/networking/tendermint { }; @@ -32093,7 +32443,6 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; - thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; @@ -32115,10 +32464,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - tig = callPackage ../applications/version-management/git-and-tools/tig { - readline = readline81; - }; - tilemaker = callPackage ../applications/misc/tilemaker { }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -32183,6 +32528,10 @@ with pkgs; torrential = callPackage ../applications/networking/p2p/torrential { }; + torrenttools = callPackage ../tools/misc/torrenttools { + fmt = fmt_8; + }; + tortoisehg = callPackage ../applications/version-management/tortoisehg { }; tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { }; @@ -32193,7 +32542,7 @@ with pkgs; tonelib-metal = callPackage ../applications/audio/tonelib-metal { }; - tony = libsForQt514.callPackage ../applications/audio/tony { }; + tony = libsForQt5.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -32260,6 +32609,10 @@ with pkgs; tudu = callPackage ../applications/office/tudu { }; + tumpa = callPackage ../applications/misc/tumpa { + inherit (pkgs.libsForQt5) wrapQtAppsHook; + }; + tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; tunefish = callPackage ../applications/audio/tunefish { @@ -32329,9 +32682,7 @@ with pkgs; enableX11 = config.unison.enableX11 or true; }; - unpaper = callPackage ../tools/graphics/unpaper { - ffmpeg_5 = ffmpeg_5-headless; - }; + unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { }; @@ -32448,9 +32799,7 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { - inherit (darwin.apple_sdk.frameworks) Security ApplicationServices Carbon AppKit; - }; + neovide = callPackage ../applications/editors/neovim/neovide { }; neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; @@ -32479,7 +32828,6 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { @@ -32571,6 +32919,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + vsce = callPackage ../development/tools/vsce { }; + vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; @@ -32764,7 +33114,7 @@ with pkgs; wordgrinder = callPackage ../applications/office/wordgrinder { }; workrave = callPackage ../applications/misc/workrave { - inherit (python27Packages) cheetah; + inherit (python3Packages) jinja2; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; @@ -32838,7 +33188,7 @@ with pkgs; gtk = gtk2; }; - xxh = with python3Packages; toPythonApplication xxh; + xxh = callPackage ../tools/networking/xxh { }; kodiPackages = recurseIntoAttrs (kodi.packages); @@ -32858,7 +33208,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; - xca = libsForQt5_openssl_1_1.callPackage ../applications/misc/xca { }; + xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -33053,7 +33403,9 @@ with pkgs; xmenu = callPackage ../applications/misc/xmenu { }; - xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; xmp = callPackage ../applications/audio/xmp { }; @@ -33061,11 +33413,7 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; - xvidcap = callPackage ../applications/video/xvidcap { - inherit (gnome2) scrollkeeper libglade; - }; - - xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -33077,6 +33425,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + yaup = callPackage ../applications/networking/yaup { }; + ydiff = with python3.pkgs; toPythonApplication ydiff; ydict = callPackage ../applications/misc/ydict {}; @@ -33099,6 +33449,8 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; + youtube-music = callPackage ../applications/audio/youtube-music { }; + yt-dlp = with python3Packages; toPythonApplication yt-dlp; yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; @@ -33117,7 +33469,7 @@ with pkgs; ytmdl = callPackage ../tools/misc/ytmdl { }; - yutto = with python3.pkgs; toPythonApplication yutto; + yutto = callPackage ../tools/misc/yutto { }; yuview = libsForQt5.yuview; @@ -33212,25 +33564,24 @@ with pkgs; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { boost = boost17x; - miniupnpc = miniupnpc_2; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind = callPackage ../applications/blockchains/bitcoin { boost = boost17x; - miniupnpc = miniupnpc_2; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { boost = boost17x; - miniupnpc = miniupnpc_2; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; + btcd = callPackage ../applications/blockchains/btcd { }; + cgminer = callPackage ../applications/blockchains/cgminer { }; chia = callPackage ../applications/blockchains/chia { }; @@ -33253,7 +33604,7 @@ with pkgs; withGui = false; }; - bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited { + bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -33262,24 +33613,6 @@ with pkgs; withGui = false; }; - bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic { - boost = boost165; - withGui = true; - }; - bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic { - boost = boost165; - withGui = false; - }; - - bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold { - boost = boost165; - withGui = true; - }; - bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold { - boost = boost165; - withGui = false; - }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; @@ -33289,15 +33622,6 @@ with pkgs; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { - withGui = true; - boost = boost170; - }; - digibyted = callPackage ../applications/blockchains/digibyte { - withGui = false; - boost = boost170; - }; - dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { boost = boost165; withGui = true; @@ -33314,13 +33638,11 @@ with pkgs; }; elements = libsForQt5.callPackage ../applications/blockchains/elements { - miniupnpc = miniupnpc_2; withGui = true; boost = boost175; inherit (darwin) autoSignDarwinBinariesHook; }; elementsd = callPackage ../applications/blockchains/elements { - miniupnpc = miniupnpc_2; withGui = false; boost = boost175; inherit (darwin) autoSignDarwinBinariesHook; @@ -33366,10 +33688,7 @@ with pkgs; }; litecoind = litecoin.override { withGui = false; }; - livedl = callPackage ../tools/misc/livedl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + livedl = callPackage ../tools/misc/livedl { }; lnd = callPackage ../applications/blockchains/lnd { }; @@ -33447,7 +33766,7 @@ with pkgs; tessera = callPackage ../applications/blockchains/tessera { }; - vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { + vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { boost = boost165; withGui = true; }; @@ -33465,7 +33784,8 @@ with pkgs; }; zcash = callPackage ../applications/blockchains/zcash { - stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv; + inherit (darwin.apple_sdk.frameworks) Security; + stdenv = llvmPackages_14.stdenv; }; zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { }; @@ -33478,7 +33798,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; + particl-core = callPackage ../applications/blockchains/particl-core { }; quorum = callPackage ../applications/blockchains/quorum { }; @@ -33503,6 +33823,8 @@ with pkgs; conmon = callPackage ../applications/virtualization/conmon { }; + conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; @@ -33677,7 +33999,6 @@ with pkgs; asc = callPackage ../games/asc { lua = lua5_1; - libsigcxx = libsigcxx12; physfs = physfs_2; }; @@ -34138,16 +34459,12 @@ with pkgs; methane = callPackage ../games/methane { }; - mindustry = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; - }; + mindustry = callPackage ../games/mindustry { }; mindustry-wayland = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; glew = glew-egl; }; mindustry-server = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; enableClient = false; enableServer = true; }; @@ -34304,7 +34621,9 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; - prismlauncher = libsForQt5.callPackage ../games/prismlauncher { }; + prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher { }; + + prismlauncher = qt6Packages.callPackage ../games/prismlauncher { }; pong3d = callPackage ../games/pong3d { }; @@ -34359,6 +34678,8 @@ with pkgs; randtype = callPackage ../games/randtype { }; + raylib-games = callPackage ../games/raylib-games { }; + redeclipse = callPackage ../games/redeclipse { }; rftg = callPackage ../games/rftg { }; @@ -34447,7 +34768,7 @@ with pkgs; openssl = openssl_1_1; }; - sienna = callPackage ../games/sienna { love = love_0_10; }; + sienna = callPackage ../games/sienna { }; sil = callPackage ../games/sil { }; @@ -34509,7 +34830,7 @@ with pkgs; inherit winetricks steam-run yad; }; - protonup = with python3Packages; toPythonApplication protonup; + protonup-ng = with python3Packages; toPythonApplication protonup-ng; steam-rom-manager = callPackage ../tools/games/steam-rom-manager {}; @@ -35013,10 +35334,7 @@ with pkgs; deepdiff = with python3Packages; toPythonApplication deepdiff; - deepsea = callPackage ../tools/security/deepsea { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + deepsea = callPackage ../tools/security/deepsea { }; deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; @@ -35112,6 +35430,10 @@ with pkgs; minimap2 = callPackage ../applications/science/biology/minimap2 { }; + mmseqs2 = callPackage ../applications/science/biology/mmseqs2 { + inherit (llvmPackages) openmp; + }; + mosdepth = callPackage ../applications/science/biology/mosdepth { }; niftyreg = callPackage ../applications/science/biology/niftyreg { }; @@ -35151,6 +35473,8 @@ with pkgs; seqtk = callPackage ../applications/science/biology/seqtk { }; + seqkit = callPackage ../applications/science/biology/seqkit { }; + snpeff = callPackage ../applications/science/biology/snpeff { }; somafm-cli = callPackage ../tools/misc/somafm-cli { }; @@ -35324,11 +35648,11 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; - # or-tools builds with -std=c++17, so abseil-cpp must + # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp.override { + abseil-cpp = abseil-cpp_202111.override { static = true; - cxxStandard = "17"; + cxxStandard = "20"; }; }; @@ -35541,9 +35865,7 @@ with pkgs; gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); stdenv = gccStdenv; }; - cvc4 = callPackage ../applications/science/logic/cvc4 { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + cvc4 = callPackage ../applications/science/logic/cvc4 { }; cvc5 = callPackage ../applications/science/logic/cvc5 { }; @@ -35590,26 +35912,18 @@ with pkgs; isabelle = callPackage ../applications/science/logic/isabelle { polyml = polyml.overrideAttrs (_: { pname = "polyml-for-isabelle"; - version = "2021-1"; + version = "2022"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; buildFlags = [ "compiler" ]; src = fetchFromGitHub { owner = "polyml"; repo = "polyml"; - rev = "39d96a2def903ed019c6855e3b688df5070d633a"; - sha256 = "sha256-S7d2Vr/nB+rCX9d4qQj4f7edVZKocKIjc5rrx9A/B4Q="; + rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6"; + sha256 = "1ygs09zzq8icq1gc8qf4sb24lxx7sbcyd5hw3vw67a3ryaki0qw2"; }; }); java = openjdk17; - z3 = z3_4_4_0.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "0482e7fe727c75e259ac55a932b28cf1842c530e"; - sha256 = "1m53avlljxqd2p8w266ksmjywjycsd23h224yn786qsnf36dr63x"; - }; - }); }; isabelle-components = recurseIntoAttrs (callPackage ../applications/science/logic/isabelle/components { }); @@ -35644,6 +35958,8 @@ with pkgs; monosat = callPackage ../applications/science/logic/monosat {}; + nusmv = callPackage ../applications/science/logic/nusmv { }; + nuXmv = callPackage ../applications/science/logic/nuXmv {}; opensmt = callPackage ../applications/science/logic/opensmt { }; @@ -35701,7 +36017,7 @@ with pkgs; }; - inherit (callPackages ../applications/science/logic/z3 { python = python2; }) + inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_11 z3_4_8 z3_4_7; @@ -35736,6 +36052,10 @@ with pkgs; symfpu = callPackage ../applications/science/logic/symfpu {}; + uhdm = callPackage ../applications/science/logic/uhdm {}; + + surelog = callPackage ../applications/science/logic/surelog {}; + mcy = callPackage ../applications/science/logic/mcy {}; lingeling = callPackage ../applications/science/logic/lingeling {}; @@ -35766,6 +36086,8 @@ with pkgs; flatcam = callPackage ../applications/science/electronics/flatcam { }; + flopoco = callPackage ../applications/science/electronics/flopoco { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { @@ -35881,7 +36203,9 @@ with pkgs; inherit (linuxPackages) nvidia_x11; }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; + wxmaxima = callPackage ../applications/science/math/wxmaxima { + wxGTK = wxGTK32; + }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; @@ -35920,7 +36244,7 @@ with pkgs; msieve = callPackage ../applications/science/math/msieve { }; - weka = callPackage ../applications/science/math/weka { }; + weka = callPackage ../applications/science/math/weka { jre = openjdk11; }; yad = callPackage ../tools/misc/yad { }; @@ -35963,11 +36287,16 @@ with pkgs; gplates = libsForQt5.callPackage ../applications/science/misc/gplates { boost = boost175; + # build with Python 3.10 fails, because boost <= 1.78 can't find + # pythons with double digits in minor versions, like X.YZ + python3 = python39; }; gravit = callPackage ../applications/science/astronomy/gravit { }; - golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; + golly = callPackage ../applications/science/misc/golly { + wxGTK = wxGTK32; + }; megam = callPackage ../applications/science/misc/megam { inherit (ocaml-ng.ocamlPackages_4_07) ocaml; @@ -35982,6 +36311,8 @@ with pkgs; root = callPackage ../applications/science/misc/root { python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { @@ -36003,7 +36334,7 @@ with pkgs; sq = callPackage ../development/tools/sq { }; - stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { }; stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; @@ -36078,7 +36409,7 @@ with pkgs; ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -36104,8 +36435,6 @@ with pkgs; fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; - auctex = callPackage ../tools/typesetting/tex/auctex { }; - areca = callPackage ../applications/backup/areca { jdk = jdk8; jre = jre8; @@ -36158,7 +36487,7 @@ with pkgs; cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {}; - cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {}; + cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog {}; cups-dymo = callPackage ../misc/cups/drivers/dymo {}; @@ -36183,6 +36512,12 @@ with pkgs; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; + foomatic-db = callPackage ../misc/cups/drivers/foomatic-db {}; + foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine {}; + foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree {}; + foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds {}; + foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; + gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; @@ -36222,10 +36557,6 @@ with pkgs; dbacl = callPackage ../tools/misc/dbacl { }; - dblatex = callPackage ../tools/typesetting/tex/dblatex { }; - - dblatexFull = dblatex.override { enableAllFeatures = true; }; - dbus-map = callPackage ../tools/misc/dbus-map { }; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; @@ -36329,6 +36660,10 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; + gotrue = callPackage ../tools/security/gotrue {}; + + gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix {}; + gowitness = callPackage ../tools/security/gowitness { }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -36355,7 +36690,7 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { }; + hyfetch = callPackage ../tools/misc/hyfetch { }; hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; @@ -36449,8 +36784,8 @@ with pkgs; lguf-brightness = callPackage ../misc/lguf-brightness { }; - lighthouse = callPackage ../applications/blockchains/lighthouse { - inherit (darwin.apple_sdk.frameworks) Security; + lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; @@ -36494,6 +36829,8 @@ with pkgs; muse = libsForQt5.callPackage ../applications/audio/muse { }; + museeks = callPackage ../applications/audio/museeks { }; + musly = callPackage ../applications/audio/musly { }; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; @@ -36685,6 +37022,8 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; + nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; alejandra = callPackage ../tools/nix/alejandra { }; @@ -36735,8 +37074,6 @@ with pkgs; i3a = callPackage ../misc/i3a { }; - lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - lice = python3Packages.callPackage ../tools/misc/lice {}; m33-linux = callPackage ../misc/drivers/m33-linux { }; @@ -36745,10 +37082,8 @@ with pkgs; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in { gdal = gdal.override { - libmysqlclient = mysql // { - lib = { dev = mysql; } - ;} - ;}; + libmysqlclient = mysql; + }; mysql = mysql; pcre = pcre-cpp; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -36756,7 +37091,7 @@ with pkgs; r128gain = callPackage ../applications/audio/r128gain { }; - redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; + resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; robin-map = callPackage ../development/libraries/robin-map { }; @@ -36792,18 +37127,6 @@ with pkgs; pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; - pgf = pgf2; - - # Keep the old PGF since some documents don't render properly with - # the new one. - pgf1 = callPackage ../tools/typesetting/tex/pgf/1.x.nix { }; - - pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { }; - - pgf3 = callPackage ../tools/typesetting/tex/pgf/3.x.nix { }; - - pgfplots = callPackage ../tools/typesetting/tex/pgfplots { }; - physlock = callPackage ../misc/screensavers/physlock { }; pjsip = callPackage ../applications/networking/pjsip { @@ -36828,7 +37151,7 @@ with pkgs; gtk2 = gtk2-x11; }; - qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; @@ -37083,16 +37406,8 @@ with pkgs; timeular = callPackage ../applications/office/timeular {}; - tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tewi-font = callPackage ../data/fonts/tewi { }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - - # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive - texlive = recurseIntoAttrs - (callPackage ../tools/typesetting/tex/texlive { }); - ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; @@ -37174,6 +37489,8 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; + vhs = callPackage ../applications/misc/vhs { }; + vgmstream = callPackage ../applications/audio/vgmstream { }; viddy = callPackage ../tools/misc/viddy { }; @@ -37218,7 +37535,10 @@ with pkgs; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; - wasmer = callPackage ../development/interpreters/wasmer { }; + wasmer = callPackage ../development/interpreters/wasmer { + llvmPackages = llvmPackages_12; + inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; + }; yabasic = callPackage ../development/interpreters/yabasic { }; @@ -37312,7 +37632,7 @@ with pkgs; }; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { - wxGTK = wxGTK30; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.stubs) setfile; }; @@ -37383,7 +37703,10 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom {}; - yabai = callPackage ../os-specific/darwin/yabai { }; + yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) Cocoa Carbon ScriptingBridge; + inherit (darwin.apple_sdk_11_0.frameworks) SkyLight; + }; yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; @@ -37588,7 +37911,6 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; simple-http-server = callPackage ../servers/simple-http-server { - openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -37600,6 +37922,8 @@ with pkgs; wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { }; + wiremock = callPackage ../tools/networking/wiremock { }; + teseq = callPackage ../applications/misc/teseq { }; ape = callPackage ../applications/misc/ape { }; @@ -37618,6 +37942,11 @@ with pkgs; name = "bsd-setup-hook"; } ../os-specific/bsd/setup-hook.sh; + freebsd = callPackage ../os-specific/bsd/freebsd {}; + freebsdCross = callPackage ../os-specific/bsd/freebsd { + stdenv = crossLibcStdenv; + }; + netbsd = callPackage ../os-specific/bsd/netbsd {}; netbsdCross = callPackage ../os-specific/bsd/netbsd { stdenv = crossLibcStdenv; @@ -37680,9 +38009,7 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - zrepl = callPackage ../tools/backup/zrepl { - buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19 - }; + zrepl = callPackage ../tools/backup/zrepl { }; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -37718,14 +38045,13 @@ with pkgs; stayrtr = callPackage ../servers/stayrtr {}; + sunshine = callPackage ../servers/sunshine {}; + sentencepiece = callPackage ../development/libraries/sentencepiece {}; kaf = callPackage ../development/tools/kaf { }; - kcli = callPackage ../development/tools/kcli { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; @@ -37752,11 +38078,9 @@ with pkgs; udev = systemdMinimal; jack = libjack2; }; - inherit (jami) jami-daemon jami-client-qt; + inherit (jami) jami-daemon jami-client; - jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { - electron = electron_17; - }; + jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; zenstates = callPackage ../os-specific/linux/zenstates {}; @@ -37766,9 +38090,7 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { - ffmpeg = ffmpeg-headless; - }; + navidrome = callPackage ../servers/misc/navidrome { }; zalgo = callPackage ../tools/misc/zalgo { }; @@ -37776,7 +38098,7 @@ with pkgs; texlive = texlive.combined.scheme-medium; }; - unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + unpoller = callPackage ../servers/monitoring/unpoller {}; fac-build = callPackage ../development/tools/build-managers/fac { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -37796,6 +38118,10 @@ with pkgs; lc3tools = callPackage ../development/tools/lc3tools {}; + ldid = callPackage ../development/tools/ldid { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + xcolor = callPackage ../tools/graphics/xcolor { }; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 6f2be43854b63..e5dcff00a5bdb 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,7 +1,7 @@ { beam , callPackage , openssl_1_1 -, wxGTK30 +, wxGTK32 , buildPackages , stdenv , wxSupport ? true @@ -31,7 +31,7 @@ in # R25 erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix { - wxGTK = wxGTK30; + wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; @@ -45,7 +45,7 @@ in # R24 erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix { - wxGTK = wxGTK30; + wxGTK = wxGTK32; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; @@ -61,7 +61,7 @@ in # R23 erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix { openssl = openssl_1_1; - wxGTK = wxGTK30; + wxGTK = wxGTK32; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; @@ -77,7 +77,7 @@ in # R22 erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix { openssl = openssl_1_1; - wxGTK = wxGTK30; + wxGTK = wxGTK32; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; @@ -93,7 +93,7 @@ in # R21 erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix { openssl = openssl_1_1; - wxGTK = wxGTK30; + wxGTK = wxGTK32; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 65de529685e3a..605988b588e85 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -82,6 +82,7 @@ let mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {}; mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; + mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {}; mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; metacoq = callPackage ../development/coq-modules/metacoq { }; metacoq-template-coq = self.metacoq.template-coq; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 70d57672a0f56..c57e486406e1f 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -28,15 +28,15 @@ let "1.2.2.5" = { hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY="; }; - "1.3.1.3" = { - hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; + "1.5.0.3" = { + hash = "sha256-T96+lPC6OTOkIs/z3QWg73oYVSyidN0SVkBWmT9VRx0="; }; }; inherit (final) cudaMajorMinorVersion cudaMajorVersion; cutensor = buildCuTensorPackage rec { - version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.3.1.3"; + version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.5.0.3"; inherit (cuTensorVersions.${version}) hash; # This can go into generic.nix libPath = "lib/${if cudaMajorVersion == "10" then cudaMajorMinorVersion else cudaMajorVersion}"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44ffc7335c349..bf43f22c9b49d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -17,8 +17,10 @@ let "ghc902" "ghc90" "ghc924" + "ghc925" "ghc92" "ghc942" + "ghc943" "ghc94" "ghcHEAD" ]; @@ -28,8 +30,10 @@ let "ghc902" "ghc92" "ghc924" + "ghc925" "ghc94" "ghc942" + "ghc943" "ghcHEAD" ]; @@ -164,6 +168,23 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc810 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc92 = ghc924; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = @@ -189,10 +210,34 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc94 = ghc942; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. + # For GHC 9.2 no armv7l bindists are available. if stdenv.hostPlatform.isAarch32 then packages.ghc924 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -310,13 +355,23 @@ in { ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; + ghc925 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc925; + ghc = bh.compiler.ghc925; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + }; ghc92 = ghc924; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94= ghc942; + ghc943 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc943; + ghc = bh.compiler.ghc943; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = ghc942; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 242596d28c6b0..4d847e280f4b9 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -47,7 +47,12 @@ in # it's a directory, so the set of overlays from the directory, ordered lexicographically let content = builtins.readDir path; in map (n: import (path + ("/" + n))) - (builtins.filter (n: builtins.match ".*\\.nix" n != null || builtins.pathExists (path + ("/" + n + "/default.nix"))) + (builtins.filter + (n: + (builtins.match ".*\\.nix" n != null && + # ignore Emacs lock files (.#foo.nix) + builtins.match "\\.#.*" n == null) || + builtins.pathExists (path + ("/" + n + "/default.nix"))) (builtins.attrNames content)) else # it's a file, so the result is the contents of the file itself diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 8a419a6a0960e..769549847309b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -9,11 +9,12 @@ 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 { }; + openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; mavenfod = callPackage ../development/java-modules/maven-fod.nix { }; in { - inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15 openjfx17; + inherit mavenbuild mavenfod fetchMaven openjfx11 openjfx15 openjfx17 openjfx19; compiler = let @@ -44,7 +45,7 @@ in { mkBootstrap = adoptopenjdk: path: args: /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ - if adoptopenjdk.jdk-hotspot.meta.available + if !stdenv.hostPlatform.isi686 then # only linux has the gtkSupport option if stdenv.isLinux @@ -198,6 +199,14 @@ in { openjfx = openjfx17; }; + openjdk19 = mkOpenjdk + ../development/compilers/openjdk/19.nix + ../development/compilers/openjdk/darwin/19.nix + { + openjdk19-bootstrap = temurin-bin.jdk-19; + openjfx = openjfx19; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2b690422ecd52..166f09f6e49a1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -93,16 +93,7 @@ in { rpiVersion = 4; }; - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; - - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = @@ -160,18 +151,11 @@ in { ]; }; - linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { kernelPatches = [ @@ -193,7 +177,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_19; + kernel = linux_6_0; kernelPatches = kernel.kernelPatches; }; @@ -232,9 +216,9 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = xanmodKernels.current; - linux_xanmod_latest = xanmodKernels.next; - linux_xanmod_tt = xanmodKernels.tt; + linux_xanmod_stable = xanmodKernels.main; + linux_xanmod_latest = xanmodKernels.main; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -248,7 +232,8 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = hardenedKernelFor kernels.linux_5_19 { }; + linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; + linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -269,6 +254,7 @@ in { # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) bcc bpftrace; # added 2021-12 + inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11 acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -340,6 +326,8 @@ in { liquidtux = callPackage ../os-specific/linux/liquidtux {}; + lkrg = callPackage ../os-specific/linux/lkrg {}; + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; @@ -389,6 +377,8 @@ in { rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; + rtl8723ds = callPackage ../os-specific/linux/rtl8723ds { }; + rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; @@ -432,8 +422,6 @@ in { netatop = callPackage ../os-specific/linux/netatop { }; - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - perf = callPackage ../os-specific/linux/kernel/perf { }; phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -446,9 +434,7 @@ in { rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { }; - sysdig = callPackage ../os-specific/linux/sysdig { - openssl = pkgs.openssl_1_1; - }; + sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -524,17 +510,15 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 - linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); 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 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 - linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); + linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); }; @@ -574,14 +558,15 @@ in { linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { }); + linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; + linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ae1536402941e..3348f74e65d1a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -411,6 +411,12 @@ let ethernet = callPackage ../development/ocaml-modules/ethernet { }; + extlib = extlib-1-7-9; + + extlib-1-7-9 = callPackage ../development/ocaml-modules/extlib { }; + + extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; @@ -561,9 +567,7 @@ let iter = callPackage ../development/ocaml-modules/iter { }; - javalib = callPackage ../development/ocaml-modules/javalib { - extlib = ocaml_extlib; - }; + javalib = callPackage ../development/ocaml-modules/javalib { }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; @@ -644,8 +648,6 @@ let js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; - js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; - js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {}; js_of_ocaml-lwt = callPackage ../development/tools/ocaml/js_of_ocaml/lwt.nix {}; @@ -956,6 +958,8 @@ let else null; + ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_expat = @@ -984,6 +988,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocamline = callPackage ../development/ocaml-modules/ocamline { }; + jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; @@ -1048,12 +1054,6 @@ let ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; - ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; - - ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { }; - - ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { }; - ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; ocsigen-ppx-rpc = callPackage ../development/ocaml-modules/ocsigen-ppx-rpc { }; @@ -1256,12 +1256,6 @@ let ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; - ocaml_extlib = ocaml_extlib-1-7-8; - - ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { }; - - ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { }; - ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; ocurl = callPackage ../development/ocaml-modules/ocurl { }; @@ -1312,6 +1306,8 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + ppx_yojson_conv = callPackage ../development/ocaml-modules/ppx_yojson_conv {}; + ppx_yojson_conv_lib = callPackage ../development/ocaml-modules/ppx_yojson_conv_lib {}; prettym = callPackage ../development/ocaml-modules/prettym { }; @@ -1559,10 +1555,6 @@ let zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { }; - ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { - oasis = ocaml_oasis; - }; - # Jane Street janePackage = @@ -1615,10 +1607,7 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { - # needs Base64 module - ocaml_extlib = ocaml_extlib.override { minimal = false; }; - }; + google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; hol_light = callPackage ../applications/science/logic/hol_light { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b16f8844856e0..c9879db716507 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -385,7 +385,11 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; hash = "sha256-UyJOS7vv/0z3tj7ZpiljiTuf/Ull1w2WcQNI+Gdt4kk="; }; - propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + postPatch = '' + substituteInPlace Build.PL \ + --replace "gtk+-2.0" "gtk+-3.0" + ''; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; meta = { description = "Building, finding and using wxWidgets binaries"; @@ -1203,15 +1207,15 @@ let url = "mirror://cpan/authors/id/S/SJ/SJQUINNEY/Authen-Krb5-Admin-0.17.tar.gz"; hash = "sha256-XdScrNmD79YajD8aVlcbtzeF6xVZCLXXvsl+7XjfDFQ="; }; - propagatedBuildInputs = [ pkgs.krb5Full.dev AuthenKrb5 ]; + propagatedBuildInputs = [ pkgs.krb5.dev AuthenKrb5 ]; # The following ENV variables are required by Makefile.PL to find - # programs in krb5Full.dev. It is not enough to just specify the - # path to krb5-config as this tool returns the prefix of krb5Full, + # programs in krb5.dev. It is not enough to just specify the + # path to krb5-config as this tool returns the prefix of krb5, # which implies a working value for KRB5_LIBDIR, but not the others. perlPreHook = '' - export KRB5_CONFTOOL=${pkgs.krb5Full.dev}/bin/krb5-config - export KRB5_BINDIR=${pkgs.krb5Full.dev}/bin - export KRB5_INCDIR=${pkgs.krb5Full.dev}/include + export KRB5_CONFTOOL=${pkgs.krb5.dev}/bin/krb5-config + export KRB5_BINDIR=${pkgs.krb5.dev}/bin + export KRB5_INCDIR=${pkgs.krb5.dev}/include ''; # Tests require working Kerberos infrastructure so replace with a # simple attempt to exercise the module. @@ -10525,8 +10529,8 @@ let url = "mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz"; hash = "sha256-fY8se2F2L7TsctLsKBKQ8vh/nH0pgnPaRSVDKmXncNY="; }; - propagatedBuildInputs = [ pkgs.krb5Full.dev ]; - makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5Full.dev}" ]; + propagatedBuildInputs = [ pkgs.krb5.dev ]; + makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5.dev}" ]; meta = { description = "Perl extension providing access to the GSSAPIv2 library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11998,10 +12002,10 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.801"; + version = "0.802"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz"; - hash = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.802.tar.gz"; + hash = "sha256-5YJzFXd2fEfqxDXvKQRmPUp1Cw5oAqSmGJo38Mswhzg"; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; @@ -12503,11 +12507,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.39"; + version = "12.51"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I="; + hash = "sha256-76meNQp9c0Z+81gNSMnDTtJmd/qOGu4uqeHsGhTnDkQ="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -12529,9 +12533,9 @@ let Reconyx, Ricoh, Samsung, Sanyo, Sigma/Foveon and Sony. ''; homepage = "https://exiftool.org/"; - + changelog = "https://exiftool.org/history.html"; license = with lib.licenses; [ gpl1Plus /* or */ artistic2 ]; - maintainers = [ maintainers.kiloreux ]; + maintainers = with maintainers; [ kiloreux anthonyroussel ]; mainProgram = "exiftool"; }; }; @@ -22634,12 +22638,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.8.0"; + version = "8.9.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI="; + hash = "sha256-s3N4KU0JnIXHKOme+2Vxapd6o8QeT6lUAb+r5i9Ogv0="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -26137,13 +26141,13 @@ let Tirex = buildPerlPackage rec { pname = "Tirex"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "tirex"; rev = "v${version}"; - hash = "sha256-8GXhF2v04ZSF0h0WNKPp4bgYcvPYCml6HtCbikFxUzc="; + hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg="; }; buildInputs = [ @@ -26158,6 +26162,7 @@ let ]; installPhase = '' + install -m 755 -d $out/usr/libexec make install DESTDIR=$out INSTALLOPTS="" mv $out/$out/lib $out/$out/share $out rmdir $out/$out $out/nix/store $out/nix @@ -26945,6 +26950,12 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz"; hash = "sha256-HP22U1oPRnbm8aqyydjhbVd74+s7fMBMgHTWheZlG3A="; }; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/gtk3.patch?h=perl-wx&id=a3776d3747e3767d1e0f6d37bdaabf087f779fea"; + hash = "sha256-CokmRzDTFmEMN/jTKw9ECCPvi0mHt5+h8Ojg4Jgd7D4="; + }) + ]; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK, is DISPLAY set properly?" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e5eb38c32e440..53f29b00ac5c7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -58,6 +58,9 @@ lib.makeScope pkgs.newScope (self: with self; { # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { pname = "php-${pname}"; + meta = args.meta // { + mainProgram = args.meta.mainProgram or pname; + }; }); # Function to build an extension which is shipped as part of the php @@ -70,16 +73,17 @@ lib.makeScope pkgs.newScope (self: with self; { # will mark the extension as a zend extension or not. mkExtension = lib.makeOverridable ({ name - , configureFlags ? [ "--enable-${name}" ] + , configureFlags ? [ "--enable-${extName}" ] , internalDeps ? [ ] , postPhpize ? "" , buildInputs ? [ ] , zendExtension ? false , doCheck ? true + , extName ? name , ... }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; - extensionName = name; + extensionName = extName; outputs = [ "out" "dev" ]; @@ -102,7 +106,7 @@ lib.makeScope pkgs.newScope (self: with self; { cdToExtensionRootPhase = '' # Go to extension source root. - cd "ext/${name}" + cd "ext/${extName}" ''; preConfigure = '' @@ -138,7 +142,7 @@ lib.makeScope pkgs.newScope (self: with self; { runHook preInstall mkdir -p $out/lib/php/extensions - cp modules/${name}.so $out/lib/php/extensions/${name}.so + cp modules/${extName}.so $out/lib/php/extensions/${extName}.so mkdir -p $dev/include ${rsync}/bin/rsync -r --filter="+ */" \ --filter="+ *.h" \ @@ -413,6 +417,16 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--with-openssl" ]; doCheck = false; } + # This provides a legacy OpenSSL PHP extension + # For situations where OpenSSL 3 do not support a set of features + # without a specific openssl.cnf file + { + name = "openssl-legacy"; + extName = "openssl"; + buildInputs = [ openssl_1_1 ]; + configureFlags = [ "--with-openssl" ]; + doCheck = false; + } { name = "pcntl"; } { name = "pdo"; doCheck = false; } { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 77088aa1bef25..a7c8782be21f5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + bsblan = python-bsblan; # added 2022-11-04 bt_proximity = bt-proximity; # added 2021-07-02 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 @@ -59,6 +60,7 @@ mapAliases ({ django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 + django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_guardian = django-guardian; # added 2022-05-19 @@ -76,13 +78,16 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flask_login = flask-login; # added 2022-10-17 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 + functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garminconnect-ha = garminconnect; # added 2022-02-05 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + GitPython = gitpython; # added 2022-10-28 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 @@ -99,10 +104,12 @@ mapAliases ({ ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-1017 + jinja2_time = jinja2-time; # added 2022-11-07 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 @@ -129,11 +136,13 @@ mapAliases ({ privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 + protonup = protonup-ng; # Added 2022-11-06 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 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 + pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 @@ -177,7 +186,7 @@ mapAliases ({ 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 + repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 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 @@ -203,10 +212,13 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 + weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 102d8629c1594..821073b9c7816 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6,146 +6,9 @@ # # For more details, please see the Python section in the Nixpkgs manual. -{ pkgs -, stdenv -, lib -, python -}: - -self: - -let - inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; - - namePrefix = python.libPrefix + "-"; - - 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`. - makeOverridablePythonPackage = f: origArgs: - let - ff = f origArgs; - overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs); - in - if builtins.isAttrs ff then (ff // { - overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); - }) - else if builtins.isFunction ff then { - overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); - __functor = self: ff; - } - else ff; - - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { - inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" - inherit toPythonModule; # Libraries provide modules - })); - - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { - namePrefix = ""; # Python applications should not have any prefix - toPythonModule = x: x; # Application does not provide modules. - })); - - # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../build-support/build-setupcfg self; - - fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { }; - - # Check whether a derivation provides a Python module. - hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; - - # Get list of required Python modules given a list of derivations. - requiredPythonModules = drvs: let - modules = lib.filter hasPythonModule drvs; - in lib.unique ([python] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPythonModules" modules)); - - # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations - # providing Python modules. - makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); - - removePythonPrefix = lib.removePrefix namePrefix; - - # Convert derivation to a Python module. - toPythonModule = drv: - drv.overrideAttrs( oldAttrs: { - # Use passthru in order to prevent rebuilds when possible. - passthru = (oldAttrs.passthru or {})// { - pythonModule = python; - pythonPath = [ ]; # Deprecated, for compatibility. - requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; - }; - }); - - # Convert a Python library to an application. - toPythonApplication = drv: - drv.overrideAttrs( oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { - # Remove Python prefix from name so we have a "normal" name. - # While the prefix shows up in the store path, it won't be - # used by `nix-env`. - name = removePythonPrefix oldAttrs.name; - pythonModule = false; - }; - }); - - disabled = drv: throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}"; - - disabledIf = x: drv: if x then disabled drv else drv; - -in { - - inherit pkgs stdenv; - - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; - inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; - inherit fetchPypi; - inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; - inherit toPythonModule toPythonApplication; - inherit buildSetupcfg; - - inherit (callPackage ../development/interpreters/python/hooks { }) - sphinxHook - condaInstallHook - condaUnpackHook - eggUnpackHook - eggBuildHook - eggInstallHook - flitBuildHook - pipBuildHook - pipInstallHook - pytestCheckHook - pythonCatchConflictsHook - pythonImportsCheckHook - pythonNamespacesHook - pythonOutputDistHook - pythonRecompileBytecodeHook - pythonRelaxDepsHook - pythonRemoveBinBytecodeHook - pythonRemoveTestsDirHook - setuptoolsBuildHook - setuptoolsCheckHook - unittestCheckHook - venvShellHook - wheelUnpackHook; - - # helpers - - # We use build packages because we are making a setup hook to be used as a - # native build input. The script itself references both the build-time - # (build) and run-time (host) python from the explicitly passed in `python` - # attribute, so the `buildPackages` doesn't effect that. - wrapPython = pkgs.buildPackages.callPackage ../development/interpreters/python/wrap-python.nix { - inherit python; - }; - - # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions - pythonPackages = self; - - # specials +self: super: with self; { - recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; + bootstrapped-pip = toPythonModule (callPackage ../development/python-modules/bootstrapped-pip { }); setuptools = callPackage ../development/python-modules/setuptools { }; @@ -375,6 +238,8 @@ in { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { }; + aiolimiter = callPackage ../development/python-modules/aiolimiter { }; aiolip = callPackage ../development/python-modules/aiolip { }; @@ -419,6 +284,8 @@ in { aioqsw = callPackage ../development/python-modules/aioqsw { }; + aioquic = callPackage ../development/python-modules/aioquic { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -477,6 +344,8 @@ in { aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aioweenect = callPackage ../development/python-modules/aioweenect { }; + aiowebostv = callPackage ../development/python-modules/aiowebostv { }; aiowinreg = callPackage ../development/python-modules/aiowinreg { }; @@ -503,6 +372,8 @@ in { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + ale-py = callPackage ../development/python-modules/ale-py { }; + alectryon = callPackage ../development/python-modules/alectryon { }; alembic = callPackage ../development/python-modules/alembic { }; @@ -649,8 +520,6 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; }); - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { }; @@ -711,6 +580,8 @@ in { aria2p = callPackage ../development/python-modules/aria2p { }; + ariadne = callPackage ../development/python-modules/ariadne { }; + arnparse = callPackage ../development/python-modules/arnparse { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; @@ -801,6 +672,8 @@ in { async-lru = callPackage ../development/python-modules/async-lru { }; + async-modbus = callPackage ../development/python-modules/async-modbus { }; + asyncclick = callPackage ../development/python-modules/asyncclick { }; asynccmd = callPackage ../development/python-modules/asynccmd { }; @@ -817,6 +690,8 @@ in { asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncserial = callPackage ../development/python-modules/asyncserial { }; + asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { }; asyncssh = callPackage ../development/python-modules/asyncssh { }; @@ -829,6 +704,8 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; + asyncua = callPackage ../development/python-modules/asyncua { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; @@ -928,6 +805,8 @@ in { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + awacs = callPackage ../development/python-modules/awacs { }; + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; awesomeversion = callPackage ../development/python-modules/awesomeversion { }; @@ -1205,10 +1084,16 @@ in { pad4pi = callPackage ../development/python-modules/pad4pi { }; - pulumi = callPackage ../development/python-modules/pulumi { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; + pulumi-aws-native = pkgs.pulumiPackages.pulumi-aws-native.sdks.python; + + pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python; + + pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; + backcall = callPackage ../development/python-modules/backcall { }; backoff = callPackage ../development/python-modules/backoff { }; @@ -1531,8 +1416,6 @@ in { bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - bsblan = callPackage ../development/python-modules/bsblan { }; - bson = callPackage ../development/python-modules/bson { }; bsuite = callPackage ../development/python-modules/bsuite { }; @@ -1547,7 +1430,7 @@ in { btrfs = callPackage ../development/python-modules/btrfs { }; - btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; }); + btrfsutil = callPackage ../development/python-modules/btrfsutil { }; btsocket = callPackage ../development/python-modules/btsocket { }; @@ -1583,6 +1466,8 @@ in { bunch = callPackage ../development/python-modules/bunch { }; + bundlewrap = callPackage ../development/python-modules/bundlewrap { }; + bx-python = callPackage ../development/python-modules/bx-python { }; bwapy = callPackage ../development/python-modules/bwapy { }; @@ -1699,9 +1584,9 @@ in { connection-pool = callPackage ../development/python-modules/connection-pool { }; - coqpit = callPackage ../development/python-modules/coqpit { }; + connio = callPackage ../development/python-modules/connio { }; - coqui-trainer = callPackage ../development/python-modules/coqui-trainer {}; + coqpit = callPackage ../development/python-modules/coqpit { }; cepa = callPackage ../development/python-modules/cepa { }; @@ -1749,6 +1634,8 @@ in { cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; + chacha20poly1305 = callPackage ../development/python-modules/chacha20poly1305 { }; + chacha20poly1305-reuseable = callPackage ../development/python-modules/chacha20poly1305-reuseable { }; chai = callPackage ../development/python-modules/chai { }; @@ -1857,6 +1744,8 @@ in { clf = callPackage ../development/python-modules/clf { }; + clip = callPackage ../development/python-modules/clip { }; + cock = callPackage ../development/python-modules/cock { }; click = callPackage ../development/python-modules/click { }; @@ -1917,8 +1806,6 @@ in { cloudflare = callPackage ../development/python-modules/cloudflare { }; - cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; - cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cloudscraper = callPackage ../development/python-modules/cloudscraper { }; @@ -2031,6 +1918,8 @@ in { conda = callPackage ../development/python-modules/conda { }; + confection = callPackage ../development/python-modules/confection { }; + configargparse = callPackage ../development/python-modules/configargparse { }; configclass = callPackage ../development/python-modules/configclass { }; @@ -2059,6 +1948,8 @@ in { construct = callPackage ../development/python-modules/construct { }; + construct-classes = callPackage ../development/python-modules/construct-classes { }; + consul = callPackage ../development/python-modules/consul { }; container-inspector = callPackage ../development/python-modules/container-inspector { }; @@ -2195,6 +2086,8 @@ in { cvelib = callPackage ../development/python-modules/cvelib { }; + cvss = callPackage ../development/python-modules/cvss { }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; @@ -2304,6 +2197,8 @@ in { datasette = callPackage ../development/python-modules/datasette { }; + datasette-publish-fly = callPackage ../development/python-modules/datasette-publish-fly { }; + datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { }; datashader = callPackage ../development/python-modules/datashader { }; @@ -2408,6 +2303,8 @@ in { deluge-client = callPackage ../development/python-modules/deluge-client { }; + demetriek = callPackage ../development/python-modules/demetriek { }; + demjson3 = callPackage ../development/python-modules/demjson3 { }; dendropy = callPackage ../development/python-modules/dendropy { }; @@ -2416,6 +2313,8 @@ in { dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + deploykit = callPackage ../development/python-modules/deploykit { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; @@ -2598,8 +2497,6 @@ in { django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { }; - django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; - django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; @@ -2755,6 +2652,8 @@ in { dlinfo = callPackage ../development/python-modules/dlinfo { }; + dlms-cosem = callPackage ../development/python-modules/dlms-cosem { }; + dlx = callPackage ../development/python-modules/dlx { }; dmenu-python = callPackage ../development/python-modules/dmenu { }; @@ -2937,6 +2836,8 @@ in { easygui = callPackage ../development/python-modules/easygui { }; + easyocr = callPackage ../development/python-modules/easyocr { }; + EasyProcess = callPackage ../development/python-modules/easyprocess { }; easysnmp = callPackage ../development/python-modules/easysnmp { }; @@ -3036,6 +2937,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + energyflip-client = callPackage ../development/python-modules/energyflip-client { }; + energyflow = callPackage ../development/python-modules/energyflow { }; enhancements = callPackage ../development/python-modules/enhancements { }; @@ -3335,8 +3238,6 @@ in { filelock = callPackage ../development/python-modules/filelock { }; - filemagic = callPackage ../development/python-modules/filemagic { }; - filetype = callPackage ../development/python-modules/filetype { }; filterpy = callPackage ../development/python-modules/filterpy { }; @@ -3525,6 +3426,8 @@ in { flit-core = callPackage ../development/python-modules/flit-core { }; + flit-scm = callPackage ../development/python-modules/flit-scm { }; + flow-record = callPackage ../development/python-modules/flow-record { }; flower = callPackage ../development/python-modules/flower { }; @@ -3641,8 +3544,6 @@ in { functools32 = callPackage ../development/python-modules/functools32 { }; - functorch = callPackage ../development/python-modules/functorch { }; - funcy = callPackage ../development/python-modules/funcy { }; furl = callPackage ../development/python-modules/furl { }; @@ -3665,8 +3566,12 @@ in { fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + fvs = callPackage ../development/python-modules/fvs { }; + fx2 = callPackage ../development/python-modules/fx2 { }; + g2pkk = callPackage ../development/python-modules/g2pkk { }; + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; @@ -3702,9 +3607,11 @@ in { gcovr = callPackage ../development/python-modules/gcovr { }; + gcs-oauth2-boto-plugin = callPackage ../development/python-modules/gcs-oauth2-boto-plugin { }; + gcsfs = callPackage ../development/python-modules/gcsfs { }; - gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); + gdal = toPythonModule (pkgs.gdal.override { python3 = python; }); gdata = callPackage ../development/python-modules/gdata { }; @@ -3829,18 +3736,19 @@ in { git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; - gitdb = callPackage ../development/python-modules/gitdb { }; + git-revise = callPackage ../development/python-modules/git-revise { }; - github3_py = callPackage ../development/python-modules/github3_py { }; + git-sweep = callPackage ../development/python-modules/git-sweep { }; + + gitdb = callPackage ../development/python-modules/gitdb { }; github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { }; github-webhook = callPackage ../development/python-modules/github-webhook { }; - GitPython = callPackage ../development/python-modules/GitPython { }; - git-revise = callPackage ../development/python-modules/git-revise { }; + github3_py = callPackage ../development/python-modules/github3_py { }; - git-sweep = callPackage ../development/python-modules/git-sweep { }; + gitpython = callPackage ../development/python-modules/gitpython { }; glad = callPackage ../development/python-modules/glad { }; @@ -3886,6 +3794,8 @@ in { google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; + google-apitools = callPackage ../development/python-modules/google-apitools { }; + googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; google-auth = callPackage ../development/python-modules/google-auth { }; @@ -4002,6 +3912,8 @@ in { google-re2 = callPackage ../development/python-modules/google-re2 { }; + google-reauth = callPackage ../development/python-modules/google-reauth { }; + google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; googletrans = callPackage ../development/python-modules/googletrans { }; @@ -4134,7 +4046,7 @@ in { gspread = callPackage ../development/python-modules/gspread { }; gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) krb5Full; + inherit (pkgs) krb5; inherit (pkgs.darwin.apple_sdk.frameworks) GSS; }; @@ -4180,6 +4092,8 @@ in { gym = callPackage ../development/python-modules/gym { }; + gym-notices = callPackage ../development/python-modules/gym-notices { }; + gyp = callPackage ../development/python-modules/gyp { }; h11 = callPackage ../development/python-modules/h11 { }; @@ -4254,6 +4168,8 @@ in { heapdict = callPackage ../development/python-modules/heapdict { }; + heatshrink2 = callPackage ../development/python-modules/heatshrink2 { }; + heatzypy = callPackage ../development/python-modules/heatzypy { }; helpdev = callPackage ../development/python-modules/helpdev { }; @@ -4442,6 +4358,8 @@ in { hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hydrus-api = callPackage ../development/python-modules/hydrus-api { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hypercorn = callPackage ../development/python-modules/hypercorn { }; @@ -4488,6 +4406,8 @@ in { ibm-watson = callPackage ../development/python-modules/ibm-watson { }; + ical = callPackage ../development/python-modules/ical { }; + icalendar = callPackage ../development/python-modules/icalendar { }; icecream = callPackage ../development/python-modules/icecream { }; @@ -4500,6 +4420,8 @@ in { idasen = callPackage ../development/python-modules/idasen { }; + icoextract = callPackage ../development/python-modules/icoextract { }; + icontract = callPackage ../development/python-modules/icontract { }; identify = callPackage ../development/python-modules/identify { }; @@ -4646,6 +4568,8 @@ in { intreehooks = callPackage ../development/python-modules/intreehooks { }; + invisible-watermark = callPackage ../development/python-modules/invisible-watermark { }; + invocations = callPackage ../development/python-modules/invocations { }; invoke = callPackage ../development/python-modules/invoke { }; @@ -4752,6 +4676,8 @@ in { jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + jamo = callPackage ../development/python-modules/jamo { }; + janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; @@ -4835,7 +4761,7 @@ in { jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; - jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + jinja2-time = callPackage ../development/python-modules/jinja2-time { }; jira = callPackage ../development/python-modules/jira { }; @@ -5014,7 +4940,7 @@ in { jxmlease = callPackage ../development/python-modules/jxmlease { }; k5test = callPackage ../development/python-modules/k5test { - inherit (pkgs) krb5Full findutils which; + inherit (pkgs) krb5 findutils which; }; kaa-base = callPackage ../development/python-modules/kaa-base { }; @@ -5154,6 +5080,8 @@ in { latexcodec = callPackage ../development/python-modules/latexcodec { }; + latexify-py = callPackage ../development/python-modules/latexify-py { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; laundrify-aio = callPackage ../development/python-modules/laundrify-aio { }; @@ -5174,6 +5102,8 @@ in { lc7001 = callPackage ../development/python-modules/lc7001 { }; + lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -5483,7 +5413,7 @@ in { logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; + logilab-common = callPackage ../development/python-modules/logilab/common.nix { }; logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { }; @@ -5546,6 +5476,8 @@ in { mac_alias = callPackage ../development/python-modules/mac_alias { }; + mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; @@ -5608,6 +5540,10 @@ in { mariadb = callPackage ../development/python-modules/mariadb { }; + marisa = callPackage ../development/python-modules/marisa { + inherit (pkgs) marisa; + }; + marisa-trie = callPackage ../development/python-modules/marisa-trie { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; @@ -5644,6 +5580,8 @@ in { mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; + masky = callPackage ../development/python-modules/masky { }; + mastodon-py = callPackage ../development/python-modules/mastodon-py { }; mat2 = callPackage ../development/python-modules/mat2 { }; @@ -5827,12 +5765,16 @@ in { misaka = callPackage ../development/python-modules/misaka { }; + misoc = callPackage ../development/python-modules/misoc { }; + mistletoe = callPackage ../development/python-modules/mistletoe { }; mistune = callPackage ../development/python-modules/mistune { }; mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { }; + mitogen = callPackage ../development/python-modules/mitogen { }; mixpanel = callPackage ../development/python-modules/mixpanel { }; @@ -6054,6 +5996,10 @@ in { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + myhdl = callPackage ../development/python-modules/myhdl { + inherit (pkgs) ghdl verilog; + }; + myhome = callPackage ../development/python-modules/myhome { }; myjwt = callPackage ../development/python-modules/myjwt { }; @@ -6118,6 +6064,8 @@ in { napari-svg = callPackage ../development/python-modules/napari-svg { }; + nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { }; + nats-py = callPackage ../development/python-modules/nats-py { }; nats-python = callPackage ../development/python-modules/nats-python { }; @@ -6198,9 +6146,9 @@ in { networkx = callPackage ../development/python-modules/networkx { }; - neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; + neuron-mpi = toPythonModule (pkgs.neuron-mpi.override { inherit python; }); - neuron = pkgs.neuron.override { inherit python; }; + neuron = toPythonModule (pkgs.neuron.override { inherit python; }); neuronpy = callPackage ../development/python-modules/neuronpy { }; @@ -6228,12 +6176,16 @@ in { enablePython = true; # ... and its Python bindings })).python; + niaaml = callPackage ../development/python-modules/niaaml { }; + niaarm = callPackage ../development/python-modules/niaarm { }; niapy = callPackage ../development/python-modules/niapy { }; nibabel = callPackage ../development/python-modules/nibabel { }; + nibe = callPackage ../development/python-modules/nibe { }; + nidaqmx = callPackage ../development/python-modules/nidaqmx { }; Nikola = callPackage ../development/python-modules/Nikola { }; @@ -6404,6 +6356,8 @@ in { nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { }; + nsz = callPackage ../development/python-modules/nsz { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -6593,6 +6547,10 @@ in { opuslib = callPackage ../development/python-modules/opuslib { }; + opytimark = callPackage ../development/python-modules/opytimark { }; + + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -7042,6 +7000,8 @@ in { ppdeep = callPackage ../development/python-modules/ppdeep { }; + prodict = callPackage ../development/python-modules/prodict { }; + proxy_tools = callPackage ../development/python-modules/proxy_tools { }; py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; @@ -7078,6 +7038,8 @@ in { pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; + pylddwrap = callPackage ../development/python-modules/pylddwrap { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; @@ -7126,6 +7088,8 @@ in { pysyncthru = callPackage ../development/python-modules/pysyncthru { }; + pytest-mockito = callPackage ../development/python-modules/pytest-mockito { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; @@ -7214,6 +7178,8 @@ in { plone-testing = callPackage ../development/python-modules/plone-testing { }; + plotext = callPackage ../development/python-modules/plotext { }; + plotly = callPackage ../development/python-modules/plotly { }; plotnine = callPackage ../development/python-modules/plotnine { }; @@ -7395,18 +7361,22 @@ in { proto-plus = callPackage ../development/python-modules/proto-plus { }; + # Protobuf 4.x protobuf = callPackage ../development/python-modules/protobuf { - disabled = isPyPy; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - doCheck = !isPy3k; inherit (pkgs) protobuf; }; + # Protobuf 3.x + protobuf3 = callPackage ../development/python-modules/protobuf { + protobuf = pkgs.protobuf3_20; + }; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; proton-client = callPackage ../development/python-modules/proton-client { }; - protonup = callPackage ../development/python-modules/protonup { }; + protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { pkgs-systemd = pkgs.systemd; @@ -7608,7 +7578,7 @@ in { pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - pyblock = callPackage ../development/python-modules/pyblock { }; + pyblock = toPythonModule (callPackage ../development/python-modules/pyblock { }); pybluez = callPackage ../development/python-modules/pybluez { inherit (pkgs) bluez; @@ -7662,8 +7632,6 @@ in { pychart = callPackage ../development/python-modules/pychart { }; - pychef = callPackage ../development/python-modules/pychef { }; - pychm = callPackage ../development/python-modules/pychm { }; PyChromecast = callPackage ../development/python-modules/pychromecast { }; @@ -7852,8 +7820,6 @@ in { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - pyext = callPackage ../development/python-modules/pyext { }; - pyezviz = callPackage ../development/python-modules/pyezviz { }; pyface = callPackage ../development/python-modules/pyface { }; @@ -8105,16 +8071,18 @@ in { pylink-square = callPackage ../development/python-modules/pylink-square { }; + pylint = callPackage ../development/python-modules/pylint { }; + pylint-celery = callPackage ../development/python-modules/pylint-celery { }; pylint-django = callPackage ../development/python-modules/pylint-django { }; pylint-flask = callPackage ../development/python-modules/pylint-flask { }; - pylint = callPackage ../development/python-modules/pylint { }; - pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + pylint-venv = callPackage ../development/python-modules/pylint-venv { }; + pylitterbot = callPackage ../development/python-modules/pylitterbot { }; py-libzfs = callPackage ../development/python-modules/py-libzfs { }; @@ -8125,6 +8093,8 @@ in { pylru = callPackage ../development/python-modules/pylru { }; + pylsqpack = callPackage ../development/python-modules/pylsqpack { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; @@ -8137,6 +8107,8 @@ in { pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; + pylpsd = callPackage ../development/python-modules/pylpsd { }; + PyLTI = callPackage ../development/python-modules/pylti { }; pylutron = callPackage ../development/python-modules/pylutron { }; @@ -8205,6 +8177,8 @@ in { pymicrobot = callPackage ../development/python-modules/pymicrobot { }; + pymilter = callPackage ../development/python-modules/pymilter { }; + pymitv = callPackage ../development/python-modules/pymitv { }; pymfy = callPackage ../development/python-modules/pymfy { }; @@ -8295,6 +8269,8 @@ in { pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyocd = callPackage ../development/python-modules/pyocd { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -8345,10 +8321,10 @@ in { pyowm = callPackage ../development/python-modules/pyowm { }; - pypamtest = pkgs.libpam-wrapper.override { + pypamtest = toPythonModule (pkgs.libpam-wrapper.override { enablePython = true; inherit python; - }; + }); pypandoc = callPackage ../development/python-modules/pypandoc { }; @@ -8685,6 +8661,8 @@ in { pysnooper = callPackage ../development/python-modules/pysnooper { }; + pysnooz = callPackage ../development/python-modules/pysnooz { }; + pysnow = callPackage ../development/python-modules/pysnow { }; pysocks = callPackage ../development/python-modules/pysocks { }; @@ -8707,6 +8685,8 @@ in { pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { }; + pyspellchecker = callPackage ../development/python-modules/pyspellchecker { }; + pyspf = callPackage ../development/python-modules/pyspf { }; pyspice = callPackage ../development/python-modules/pyspice { }; @@ -8749,6 +8729,8 @@ in { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; + pyswitchbee = callPackage ../development/python-modules/pyswitchbee { }; + pyswitchbot = callPackage ../development/python-modules/pyswitchbot { }; pysychonaut = callPackage ../development/python-modules/pysychonaut { }; @@ -8856,6 +8838,8 @@ in { pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + pytest-golden = callPackage ../development/python-modules/pytest-golden { }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; pytest-html = callPackage ../development/python-modules/pytest-html { }; @@ -8898,6 +8882,8 @@ in { pytest-param-files = callPackage ../development/python-modules/pytest-param-files { }; + pytest-plt = callPackage ../development/python-modules/pytest-plt { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-qt = callPackage ../development/python-modules/pytest-qt { }; @@ -8992,6 +8978,8 @@ in { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-arango = callPackage ../development/python-modules/python-arango { }; + python-awair = callPackage ../development/python-modules/python-awair { }; python3-saml = callPackage ../development/python-modules/python3-saml { }; @@ -9012,6 +9000,8 @@ in { python-box = callPackage ../development/python-modules/python-box { }; + python-bsblan = callPackage ../development/python-modules/python-bsblan { }; + python-cinderclient = callPackage ../development/python-modules/python-cinderclient { }; python-constraint = callPackage ../development/python-modules/python-constraint { }; @@ -9127,16 +9117,17 @@ in { python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; - python-mapnik = let - boost = pkgs.boost175.override { + python-mapnik = callPackage ../development/python-modules/python-mapnik rec { + inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib; + boost = pkgs.boost.override { enablePython = true; inherit python; }; - in callPackage ../development/python-modules/python-mapnik { - inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib; - inherit boost; + harfbuzz = pkgs.harfbuzz.override { + withIcu = true; + }; mapnik = pkgs.mapnik.override { - inherit python boost; + inherit boost harfbuzz; }; }; @@ -9363,7 +9354,7 @@ in { inherit (pkgs) udev; }; - pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + pyunbound = toPythonModule (callPackage ../tools/networking/unbound/python.nix { }); pyunifi = callPackage ../development/python-modules/pyunifi { }; @@ -9666,6 +9657,8 @@ in { recordlinkage = callPackage ../development/python-modules/recordlinkage { }; + recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { }; + redbaron = callPackage ../development/python-modules/redbaron { }; redis = callPackage ../development/python-modules/redis { }; @@ -9704,6 +9697,8 @@ in { reparser = callPackage ../development/python-modules/reparser { }; + repeated-test = callPackage ../development/python-modules/repeated-test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { }; @@ -9860,6 +9855,8 @@ in { robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; + robotframework-pythonlibcore = callPackage ../development/python-modules/robotframework-pythonlibcore { }; + robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; @@ -9966,6 +9963,8 @@ in { runway-python = callPackage ../development/python-modules/runway-python { }; + ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { }; + ruyaml = callPackage ../development/python-modules/ruyaml { }; rx = callPackage ../development/python-modules/rx { }; @@ -9992,8 +9991,6 @@ in { safe = callPackage ../development/python-modules/safe { }; - safeeyes = callPackage ../applications/misc/safeeyes { }; - safeio = callPackage ../development/python-modules/safeio { }; safety = callPackage ../development/python-modules/safety { }; @@ -10185,6 +10182,8 @@ in { pythonSupport = true; })); + serialio = callPackage ../development/python-modules/serialio { }; + serpent = callPackage ../development/python-modules/serpent { }; serpy = callPackage ../development/python-modules/serpy { }; @@ -10263,6 +10262,8 @@ in { sievelib = callPackage ../development/python-modules/sievelib { }; + signalslot = callPackage ../development/python-modules/signalslot { }; + signedjson = callPackage ../development/python-modules/signedjson { }; sigrok = callPackage ../development/python-modules/sigrok { }; @@ -10449,6 +10450,8 @@ in { socid-extractor = callPackage ../development/python-modules/socid-extractor { }; + sockio = callPackage ../development/python-modules/sockio { }; + sockjs = callPackage ../development/python-modules/sockjs { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; @@ -10813,6 +10816,8 @@ in { structlog = callPackage ../development/python-modules/structlog { }; + stubserver = callPackage ../development/python-modules/stubserver { }; + stumpy = callPackage ../development/python-modules/stumpy { }; stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; @@ -11035,6 +11040,8 @@ in { termcolor = callPackage ../development/python-modules/termcolor { }; + termgraph = callPackage ../development/python-modules/termgraph { }; + terminado = callPackage ../development/python-modules/terminado { }; terminaltables = callPackage ../development/python-modules/terminaltables { }; @@ -11065,6 +11072,8 @@ in { textual = callPackage ../development/python-modules/textual { }; + testbook = callPackage ../development/python-modules/testbook { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; @@ -11284,6 +11293,8 @@ in { tox = callPackage ../development/python-modules/tox { }; + tplink-omada-client = callPackage ../development/python-modules/tplink-omada-client { }; + tpm2-pytss = callPackage ../development/python-modules/tpm2-pytss { }; tqdm = callPackage ../development/python-modules/tqdm { }; @@ -11294,6 +11305,8 @@ in { trackpy = callPackage ../development/python-modules/trackpy { }; + trainer = callPackage ../development/python-modules/trainer {}; + traitlets = callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { }; @@ -11346,6 +11359,8 @@ in { trio-websocket = callPackage ../development/python-modules/trio-websocket { }; + troposphere = callPackage ../development/python-modules/troposphere { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; @@ -11364,10 +11379,6 @@ in { tubeup = callPackage ../development/python-modules/tubeup { }; - tumpa = callPackage ../development/python-modules/tumpa { - inherit (pkgs.libsForQt5) wrapQtAppsHook; - }; - turnt = callPackage ../development/python-modules/turnt { }; tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { }; @@ -11464,6 +11475,8 @@ in { types-protobuf = callPackage ../development/python-modules/types-protobuf { }; + types-psutil = callPackage ../development/python-modules/types-psutil { }; + types-python-dateutil = callPackage ../development/python-modules/types-python-dateutil { }; types-pytz = callPackage ../development/python-modules/types-pytz { }; @@ -11553,6 +11566,8 @@ in { umap-learn = callPackage ../development/python-modules/umap-learn { }; + umodbus = callPackage ../development/python-modules/umodbus { }; + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; unasync = callPackage ../development/python-modules/unasync { }; @@ -11659,6 +11674,8 @@ in { urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + usb-devices = callPackage ../development/python-modules/usb-devices { }; + usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { }; usbtmc = callPackage ../development/python-modules/usbtmc { }; @@ -11834,7 +11851,7 @@ in { wallbox = callPackage ../development/python-modules/wallbox { }; - Wand = callPackage ../development/python-modules/Wand { }; + wand = callPackage ../development/python-modules/wand { }; wandb = callPackage ../development/python-modules/wandb { }; @@ -12032,14 +12049,13 @@ in { wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { - withGtk2 = false; withWebKit = true; }; }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit; - wxGTK = pkgs.wxGTK31-gtk3.override { + wxGTK = pkgs.wxGTK31.override { withWebKit = true; }; }; @@ -12050,6 +12066,7 @@ in { }; }; + x-wr-timezone = callPackage ../development/python-modules/x-wr-timezone { }; x11_hash = callPackage ../development/python-modules/x11_hash { }; @@ -12060,6 +12077,7 @@ in { }; xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs.buildPackages) meson; inherit (pkgs) gtk3 gobject-introspection polkit; inherit (pkgs.cinnamon) xapp; }; @@ -12156,8 +12174,6 @@ in { inherit (pkgs.xorg) xorgserver; }; - xxh = callPackage ../tools/networking/xxh { }; - xxhash = callPackage ../development/python-modules/xxhash { }; yabadaba = callPackage ../development/python-modules/yabadaba { }; @@ -12250,8 +12266,6 @@ in { yubico-client = callPackage ../development/python-modules/yubico-client { }; - yutto = callPackage ../tools/misc/yutto { }; - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; z3 = (toPythonModule (pkgs.z3.override { @@ -12262,6 +12276,8 @@ in { zake = callPackage ../development/python-modules/zake { }; + zamg = callPackage ../development/python-modules/zamg { }; + zarr = callPackage ../development/python-modules/zarr { }; zc-buildout = callPackage ../development/python-modules/buildout { }; @@ -12393,4 +12409,6 @@ in { zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; + + zxing_cpp = callPackage ../development/python-modules/zxing_cpp { }; } diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index f0faf2b1cd1f5..507935b0d5c2c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -7,7 +7,7 @@ self: super: with self; with super; { attrs = callPackage ../development/python2-modules/attrs { }; - bootstrapped-pip = callPackage ../development/python2-modules/bootstrapped-pip { }; + bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); boto3 = callPackage ../development/python2-modules/boto3 {}; @@ -17,12 +17,8 @@ with self; with super; { chardet = callPackage ../development/python2-modules/chardet { }; - cheetah = callPackage ../development/python2-modules/cheetah { }; - configparser = callPackage ../development/python2-modules/configparser { }; - construct = callPackage ../development/python2-modules/construct { }; - contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; coverage = callPackage ../development/python2-modules/coverage { }; @@ -37,8 +33,6 @@ with self; with super; { gtkme = callPackage ../development/python2-modules/gtkme { }; - httpretty = callPackage ../development/python2-modules/httpretty { }; - hypothesis = callPackage ../development/python2-modules/hypothesis { }; idna = callPackage ../development/python2-modules/idna { }; @@ -51,31 +45,18 @@ with self; with super; { inherit (pkgs) marisa; }; - markdown = callPackage ../development/python2-modules/markdown { }; - markupsafe = callPackage ../development/python2-modules/markupsafe { }; mock = callPackage ../development/python2-modules/mock { }; more-itertools = callPackage ../development/python2-modules/more-itertools { }; - mutagen = callPackage ../development/python2-modules/mutagen { }; - - numpy = callPackage ../development/python2-modules/numpy { }; - packaging = callPackage ../development/python2-modules/packaging { }; - pillow = callPackage ../development/python2-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - }; - pip = callPackage ../development/python2-modules/pip { }; pluggy = callPackage ../development/python2-modules/pluggy { }; - prettytable = callPackage ../development/python2-modules/prettytable { }; - protobuf = callPackage ../development/python2-modules/protobuf { disabled = isPyPy; protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 @@ -113,10 +94,6 @@ with self; with super; { pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; - pyyaml = callPackage ../development/python2-modules/pyyaml { }; - - qpid-python = callPackage ../development/python2-modules/qpid-python { }; - recoll = disabled super.recoll; rivet = disabled super.rivet; @@ -137,8 +114,6 @@ with self; with super; { sphinx = callPackage ../development/python2-modules/sphinx { }; - TurboCheetah = callPackage ../development/python2-modules/TurboCheetah { }; - typing = callPackage ../development/python2-modules/typing { }; zeek = disabled super.zeek; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6d66eda3c3562..116ad216e025a 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -174,11 +174,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; - # Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2 - qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { - openssl = pkgs.openssl_1_1; - }; - qcoro = callPackage ../development/libraries/qcoro { }; qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; @@ -225,6 +220,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; + soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 3320ff4ee2042..e566a8af758c1 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -28,8 +28,12 @@ in inherit (kdeFrameworks) kcoreaddons; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; + quazip = callPackage ../development/libraries/quazip { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; + poppler = callPackage ../development/libraries/poppler { lcms = pkgs.lcms2; qt6Support = true; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 61e577bb31aa1..5f18d36f29f03 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -53,7 +53,9 @@ let ghc8107 ghc902 ghc924 + ghc925 ghc942 + ghc943 ]; # packagePlatforms applied to `haskell.packages.*` @@ -178,6 +180,7 @@ let dhall-nix diagrams-builder elm2nix + emanote fffuu futhark ghcid @@ -202,7 +205,7 @@ let hlint hpack # hyper-haskell # depends on electron-10.4.7 which is marked as insecure - hyper-haskell-server-with-packages + # hyper-haskell-server-with-packages # hyper-haskell-server is broken icepeak idris ihaskell @@ -334,7 +337,7 @@ let }; haskell.packages.native-bignum.ghc924 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) hello lens random @@ -366,6 +369,7 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 # https://github.com/ndmitchell/hlint/issues/1413 ]; hpack = released; @@ -393,6 +397,11 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 + ]; + purescript = [ + compilerNames.ghc924 + compilerNames.ghc925 ]; purescript-cst = [ compilerNames.ghc8107 @@ -467,10 +476,12 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 + jobs.pkgsMusl.haskell.compiler.ghc925 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 45874d33b0f22..38e6f8072776c 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -27,6 +27,7 @@ rec { pkgs_x86_64_linux = packageSet' { system = "x86_64-linux"; }; pkgs_i686_linux = packageSet' { system = "i686-linux"; }; pkgs_aarch64_linux = packageSet' { system = "aarch64-linux"; }; + pkgs_riscv64_linux = packageSet' { system = "riscv64-linux"; }; pkgs_aarch64_darwin = packageSet' { system = "aarch64-darwin"; }; pkgs_armv6l_linux = packageSet' { system = "armv6l-linux"; }; pkgs_armv7l_linux = packageSet' { system = "armv7l-linux"; }; @@ -40,6 +41,7 @@ rec { if system == "x86_64-linux" then pkgs_x86_64_linux else if system == "i686-linux" then pkgs_i686_linux else if system == "aarch64-linux" then pkgs_aarch64_linux + else if system == "riscv64-linux" then pkgs_riscv64_linux else if system == "aarch64-darwin" then pkgs_aarch64_darwin else if system == "armv6l-linux" then pkgs_armv6l_linux else if system == "armv7l-linux" then pkgs_armv7l_linux diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index ec444cce32ffa..d702c04dac156 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -824,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b3rfqy87yiv9xmh260nyddxxjqj0vy32xvajvyn5jnjx96jwa24"; + sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx"; type = "gem"; }; - version = "0.93.0"; + version = "0.93.1"; }; execjs = { groups = ["default"]; @@ -1007,6 +1007,17 @@ }; version = "3.4.3"; }; + git = { + dependencies = ["addressable" "rchardet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l6mvn60qa215rjy0zjymvjb0vcgnbi4vj9d80v4qq1n6b9ld9xy"; + type = "gem"; + }; + version = "1.12.0"; + }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"]; groups = ["default"]; @@ -1089,10 +1100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19ynyc7wzl71hn7jw467xr188v0az679l54167slm3jh5mx6rijf"; + sha256 = "03qiz6kbk260v3613z4wrk8iy1mi06j631fglcskfxyhf18lpy05"; type = "gem"; }; - version = "6.0.7"; + version = "6.0.8"; }; hashie = { groups = ["default"]; @@ -1155,6 +1166,16 @@ }; version = "2.14.3"; }; + htmlbeautifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y55dx25l3wwc025mwl6jsbcsqrm30gs2d2pxnaxg07yh22ckq4x"; + type = "gem"; + }; + version = "1.4.2"; + }; http-accept = { groups = ["default"]; platforms = []; @@ -1186,6 +1207,17 @@ }; version = "0.8.0"; }; + httparty = { + dependencies = ["multi_xml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q42553gp8brkkrn97m7ah4yr6bqs7fsn8lg84yzx6dr6y02bj5i"; + type = "gem"; + }; + version = "0.15.7"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -1227,6 +1259,16 @@ }; version = "0.1.4"; }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; + type = "gem"; + }; + version = "1.2.4"; + }; jaro_winkler = { groups = ["default"]; platforms = []; @@ -1314,6 +1356,17 @@ }; version = "0.1.4"; }; + jekyll-favicon = { + dependencies = ["jekyll" "mini_magick" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dyksm4i11n0qshd7wh6dvk8d0fc70dd32ir2dxs6igxq0gd6hi1"; + type = "gem"; + }; + version = "1.1.0"; + }; jekyll-feed = { dependencies = ["jekyll"]; groups = ["default"]; @@ -1642,6 +1695,17 @@ }; version = "2.2.1"; }; + jekyll-webmention_io = { + dependencies = ["htmlbeautifier" "jekyll" "json" "openssl" "string_inflection" "uglifier" "webmention"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "141bj7v068s6sdz3syhzrka47w3r6r9r69a6mhfxrzfyrkwqq8a1"; + type = "gem"; + }; + version = "3.3.6"; + }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; groups = ["default"]; @@ -1741,10 +1805,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsgvdyh828k6bz95b4391ydv6710d4dsdrrfr684glks7599ldf"; + sha256 = "1jbqw7hkx08i5dj74fwfdc16980hsj3mhrxp4mmjxsdzw1kndrvp"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.4"; + }; + link_header = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"; + type = "gem"; + }; + version = "0.0.8"; }; liquid = { groups = ["default"]; @@ -1932,6 +2006,16 @@ }; version = "1.15.0"; }; + multi_xml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; mustermann = { dependencies = ["ruby2_keywords"]; groups = ["default"]; @@ -1999,10 +2083,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; type = "gem"; }; - version = "1.2.1"; + version = "4.0.0"; }; net-ssh = { groups = ["default"]; @@ -2040,10 +2124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2056,6 +2140,17 @@ }; version = "4.25.1"; }; + openssl = { + dependencies = ["ipaddr"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + type = "gem"; + }; + version = "2.2.2"; + }; optimist = { groups = ["default"]; platforms = []; @@ -2240,10 +2335,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080469yh9k1va9v6ws2y0bwg9k1mnfs4rl7871q8aak74x6mrv9p"; + sha256 = "1l5pk6w63bj7cxy4y9mqvpclw6r0pcm7xa44c33vx3f960px8wk8"; type = "gem"; }; - version = "0.1.0"; + version = "1.0.2"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2424,15 +2519,25 @@ }; version = "2.7.0"; }; + rchardet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; re2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; + sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; red-colors = { dependencies = ["matrix"]; @@ -2577,10 +2682,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -2588,10 +2693,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2599,10 +2704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; + sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2610,20 +2715,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2631,10 +2736,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; + sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1"; type = "gem"; }; - version = "1.36.0"; + version = "1.37.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2642,10 +2747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2983,16 +3088,26 @@ }; version = "1.5.3"; }; + string_inflection = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag"; + type = "gem"; + }; + version = "0.1.2"; + }; syntax_tree = { dependencies = ["prettier_print"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mp0b13gbkfz2chgn48ak28611yhgykdmx53p0yzby5j6ifsdirf"; + sha256 = "1im3kskcrmwa12q4pxilps7dyf9jlc82saasp6lkn5q7zqi7ilfh"; type = "gem"; }; - version = "3.6.3"; + version = "4.3.0"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; @@ -3000,10 +3115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "137v6pwkqv6dcm9r7fl3i3l8hpalilr61vy08zx3ybb1bzp2fckb"; + sha256 = "0n2ag309fzz9qvj634aibv2khfc45vvsg1sra227ssn3xwcvx4vq"; type = "gem"; }; - version = "1.3.2"; + version = "2.0.0"; }; syntax_tree-rbs = { dependencies = ["prettier_print" "rbs" "syntax_tree"]; @@ -3031,10 +3146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + sha256 = "1kzp8c08jl137v62rafmr81b7hg01q3d1q70fr5y5cmmranfpml1"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.1"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -3161,6 +3276,17 @@ }; version = "1.2.10"; }; + uglifier = { + dependencies = ["execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.0"; + }; unf = { dependencies = ["unf_ext"]; groups = ["default"]; @@ -3202,6 +3328,17 @@ }; version = "0.2.0"; }; + webmention = { + dependencies = ["httparty" "json" "link_header" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s3p572rp1aifk7xxhnwvnpxwvn9sx8hx5zm0mz0ff4lgb2y4yq4"; + type = "gem"; + }; + version = "0.1.6"; + }; webrick = { groups = ["default"]; platforms = []; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 459baaca2e636..2bf15252f9ada 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -8,16 +8,9 @@ # The solution is to splice the package sets together as we do below, so every # `callPackage`d expression in fact gets both versions. Each# derivation (and # each derivation's outputs) consists of the run-time version, augmented with a -# `nativeDrv` field for the build-time version, and `crossDrv` field for the +# `__spliced.buildHost` field for the build-time version, and `__spliced.hostTarget` field for the # run-time version. # -# We could have used any names we want for the disambiguated versions, but -# `crossDrv` and `nativeDrv` were somewhat similarly used for the old -# cross-compiling infrastructure. The names are mostly invisible as -# `mkDerivation` knows how to pull out the right ones for `buildDepends` and -# friends, but a few packages use them directly, so it seemed efficient (to -# @Ericson2314) to reuse those names, at least initially, to minimize breakage. -# # For performance reasons, rather than uniformally splice in all cases, we only # do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice` # parameter there the boolean value of that equality check. @@ -46,14 +39,16 @@ let valueHostTarget = pkgsHostTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue - # TODO(@Ericson2314): Stop using old names after transition period - // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; }) - // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; }) + # TODO(@Artturin): remove before release 23.05 and only have __spliced. + // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; }) + // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; }) // { __spliced = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) + // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) + // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; }) // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; }); }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e78197bd0363c..3669b622e7156 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -232,6 +232,18 @@ let }; } else throw "i686 Linux package set can only be used with the x86 family."; + # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages + pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then nixpkgsFun { + overlays = [ (self': super': { + pkgsx86_64Darwin = super'; + })] ++ overlays; + localSystem = { + parsed = stdenv.hostPlatform.parsed // { + cpu = lib.systems.parse.cpuTypes.x86_64; + }; + }; + } else throw "x86_64 Darwin package set can only be used on Darwin systems."; + # Extend the package set with zero or more overlays. This preserves # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index d50b979fdcec0..c133e1472ebc0 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -12,8 +12,7 @@ rec { fontconfigSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux; openglSupport = true; - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. - vulkanSupport = stdenv.isLinux; + vulkanSupport = true; tlsSupport = true; cupsSupport = true; dbusSupport = stdenv.isLinux; @@ -41,7 +40,6 @@ rec { gphoto2Support = true; krb5Support = true; ldapSupport = true; - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. vkd3dSupport = stdenv.isLinux; embedInstallers = true; }; |