diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/top-level')
19 files changed, 2142 insertions, 875 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix b/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix index 3e9cdc8e87e9..8009208739a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix @@ -41,12 +41,14 @@ mapAliases ({ ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 + amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 - asterisk_15 = throw "Asterisk 15 is end of life and has been removed."; # added 2020-10-07 + asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 avldrums-lv2 = x42-avldrums; # added 2020-03-29 @@ -64,6 +66,7 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 @@ -76,7 +79,7 @@ mapAliases ({ cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 - cide = throw "deprecated in 2019-09-11: abandoned by upstream"; + cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 ckb = ckb-next; # added 2018-10-21 @@ -88,9 +91,10 @@ mapAliases ({ conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 coprthr = throw "coprthr has been removed."; # added 2019-12-08 - corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; - coredumper = throw "coredumper has been removed: Abandoned by upstream."; # added 2019-11-16 - cryptol = throw "cryptol was remove for prolonged broken build"; # added 2020-08-21 + corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; + coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 + cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 @@ -99,7 +103,7 @@ mapAliases ({ d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 dat = nodePackages.dat; - dbvisualizer = throw "dbvisualizer has been remove from nixpkgs, as it's unmaintained"; # added 2020-09-20 + dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 dbus_libs = dbus; # added 2018-04-25 @@ -119,6 +123,7 @@ mapAliases ({ double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 + dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -140,6 +145,7 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 + flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 font-awesome-ttf = font-awesome; # 2018-02-25 # 2019-10-31 @@ -183,13 +189,17 @@ mapAliases ({ gnuradio-limesdr = gr-limesdr; # added 2019-05-27 gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 + # added 20-10-2020 + gnuradio-with-packages = gnuradio3_7.override { + extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ]; + }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 - gometalinter = throw "Abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 + gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 @@ -207,7 +217,7 @@ mapAliases ({ gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 - hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11 + hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 @@ -218,10 +228,14 @@ mapAliases ({ inotifyTools = inotify-tools; jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune; # added 2018-09-09 - jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; + jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 + julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 + julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 + kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 @@ -253,7 +267,7 @@ mapAliases ({ libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 - libGL_driver = mesa.drivers; + libGL_driver = mesa.drivers; # added 2019-05-28 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 @@ -265,8 +279,8 @@ mapAliases ({ librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 - libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; - libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 @@ -299,8 +313,10 @@ mapAliases ({ mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 - mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 @@ -316,7 +332,7 @@ mapAliases ({ mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; module_init_tools = kmod; # added 2016-04-22 - mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream."; + mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream."; mozart = mozart2-binary; # added 2019-09-23 mozart-binary = mozart2-binary; # added 2019-09-23 mpich2 = mpich; # added 2018-08-06 @@ -345,7 +361,7 @@ mapAliases ({ nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 - nylas-mail-bin = throw "deprecated in 2019-09-11: abandoned by upstream"; + nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 @@ -353,6 +369,7 @@ mapAliases ({ openjpeg_2_1 = openjpeg_2; # added 2018-10-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 osquery = throw "osquery has been removed."; # added 2019-11-24 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 @@ -360,6 +377,7 @@ mapAliases ({ parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 pgp-tools = signing-party; # added 2017-03-26 @@ -427,7 +445,7 @@ mapAliases ({ poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; - postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; + postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead"; # postgresql plugins pgjwt = postgresqlPackages.pgjwt; pg_repack = postgresqlPackages.pg_repack; @@ -449,46 +467,52 @@ mapAliases ({ pinentry_qt5 = pinentry-qt; # added 2020-02-11 postgis = postgresqlPackages.postgis; # end - ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; + ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream."; processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 pygmentex = texlive.bin.pygmentex; # added 2019-12-15 pyo3-pack = maturin; pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 - phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon-backend-vlc = throw "Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 + phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 + phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 + phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 + pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 - qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 + qtcurve = libsForQt5.qtcurve; # added 2020-11-07 + qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 - rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; + rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rssglx = rss-glx; #added 2015-03-25 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 + retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 + riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 - ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_3_6 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_3 = throw "deprecated 2019-09-06: use a newer version of ruby"; - ruby_2_4_3 = throw "deprecated 2018-0213: use a newer version of ruby"; - ruby_2_4 = throw "deprecated 2019-12: use a newer version of ruby"; - ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby"; - rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead"; - rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; + ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; + ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; + ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby"; + ruby_2_3_6 = throw "ruby_2_3_6 was deprecated on 2018-02-13: use a newer version of ruby"; + ruby_2_3 = throw "ruby_2_3 was deprecated on 2019-09-06: use a newer version of ruby"; + ruby_2_4_3 = throw "ruby_2_4_3 was deprecated on 2018-02-13: use a newer version of ruby"; + ruby_2_4 = throw "ruby_2_4 was deprecated in 2019-12: use a newer version of ruby"; + ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby"; + rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead"; + rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; + rubyMinimal = throw "rubyMinimal was removed due to being unused"; rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 @@ -507,12 +531,12 @@ mapAliases ({ sam = deadpixi-sam; # added 2018-04-25 samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 - sambaMaster = throw "removed 2019-09-13: outdated and no longer needed"; + sambaMaster = throw "sambaMaster was removed in 2019-09-13: outdated and no longer needed"; samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 - sapic = throw "deprecated 2019-1-19: sapic is bundled with 'tamarin-prover' now"; + sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now"; scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 @@ -522,6 +546,7 @@ mapAliases ({ skrooge2 = skrooge; # added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 + skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 slic3r-prusa3d = prusa-slicer; # added 2019-05-21 @@ -529,9 +554,10 @@ mapAliases ({ slurm-llnl-full = slurm-full; # renamed July 2017 slurm-full = slurm; # added 2018-05-1 smbclient = samba; # added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 - sundials_3 = throw "removed 2020-02. outdated and no longer needed"; + sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; # added 2020-02-10 sourceHanSansPackages = { @@ -568,13 +594,13 @@ mapAliases ({ sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 - suil-qt5 = suil; # added 2018-05-01 + stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 surf-webkit2 = surf; # added 2017-04-02 - sup = throw "deprecated in 2019-09-10: abandoned by upstream"; + sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 - systemd_with_lvm2 = throw "obsolete, enabled by default via the lvm module"; # added 2020-07-12 + systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 tangogps = foxtrotgps; # added 2020-01-26 @@ -595,7 +621,7 @@ mapAliases ({ terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tesseract_4 = tesseract4; # added 2018-12-19 - testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13 + testdisk-photorec = throw "testdisk-photorec: This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 @@ -621,13 +647,16 @@ mapAliases ({ ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 + unicorn-emu = unicorn; # added 2020-10-29 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 + utillinux = util-linux; # added 2020-11-24 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; v4l_utils = v4l-utils; # added 2019-08-07 - v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages"; - valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38"; + v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; + valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 @@ -662,7 +691,7 @@ mapAliases ({ xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 - ytop = throw "Abandoned by upstream. Consider switching to bottom instead"; + ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell @@ -697,7 +726,7 @@ mapAliases ({ murmur_git = pkgs.murmur; # added 2020-08-17 - zabbix44 = throw "Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; @@ -725,12 +754,12 @@ mapAliases ({ # added 2019-04-13 # *-polly pointed to llvmPackages_latest - llvm-polly = throw "clang is now built with polly-plugin by default"; - clang-polly = throw "clang is now built with polly-plugin by default"; + llvm-polly = throw "llvm-polly: clang is now built with polly-plugin by default"; + clang-polly = throw "clang-polly: clang is now built with polly-plugin by default"; /* Cleanup before 20.09 */ oraclejdk8psu = throw '' - The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! + oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! ''; oraclejre8psu = oraclejdk8psu; oraclejdk8psu_distro = oraclejdk8psu; @@ -738,7 +767,7 @@ mapAliases ({ dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; /* Cleanup before 21.03 */ riot-desktop = throw "riot-desktop is now element-desktop!"; @@ -746,4 +775,60 @@ mapAliases ({ ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + /* If these are in the scope of all-packages.nix, they cause collisions + between mixed versions of qt. See: + https://github.com/NixOS/nixpkgs/pull/101369 */ + + inherit (kdeFrameworks) breeze-icons oxygen-icons5; + inherit (kdeApplications) + akonadi akregator ark + bomber bovo + dolphin dragon + elisa + ffmpegthumbs filelight + granatier gwenview + k3b + kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond + keditbookmarks + kfind kfloppy + kget kgpg + khelpcenter + kig kigo killbots kitinerary + kleopatra klettres klines + kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights + kollision kolourpaint kompare konsole kontact korganizer + kpkpass + krdc kreversi krfb + kshisen ksquares ksystemlog + kteatime ktimer ktouch kturtle + kwalletmanager kwave + marble minuet + okular + picmi + spectacle + yakuake + ; + inherit (plasma5) + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover + kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 + kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard + kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration + plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm + systemsettings user-manager xdg-desktop-portal-kde + ; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite + ; + inherit (libsForQt5) + sddm + ; + }) diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix index 78b8abba55a6..39e0ad322197 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix @@ -94,6 +94,8 @@ in genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; + nix-update-script = callPackage ../common-updater/nix-update.nix { }; ### Push NixOS tests inside the fixed point @@ -140,10 +142,14 @@ in alda = callPackage ../development/interpreters/alda { }; + among-sus = callPackage ../games/among-sus { }; + ankisyncd = callPackage ../servers/ankisyncd { }; avro-tools = callPackage ../development/tools/avro-tools { }; + bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -188,6 +194,8 @@ in comedilib = callPackage ../development/libraries/comedilib { }; + cp437 = callPackage ../tools/misc/cp437 { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -202,7 +210,7 @@ in hobbes = callPackage ../development/tools/hobbes { }; - html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; @@ -222,6 +230,8 @@ in device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + devour = callPackage ../tools/X11/devour {}; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -230,10 +240,12 @@ in digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + gretl = callPackage ../applications/science/math/gretl { }; + grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { - writePython3 = writers.writePython3; + writePython3 = buildPackages.writers.writePython3; }; snapTools = callPackage ../build-support/snap { }; @@ -317,6 +329,8 @@ in fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + find-cursor = callPackage ../tools/X11/find-cursor { }; + prefer-remote-fetch = import ../build-support/prefer-remote-fetch; global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; @@ -351,6 +365,8 @@ in fetchhg = callPackage ../build-support/fetchhg { }; + fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {}; + # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform then buildPackages.fetchurl # No need to do special overrides twice, @@ -449,6 +465,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -471,6 +489,9 @@ in ociTools = callPackage ../build-support/oci-tools { }; + octant = callPackage ../applications/networking/cluster/octant { }; + starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } @@ -525,6 +546,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; @@ -593,6 +616,8 @@ in adlplug = callPackage ../applications/audio/adlplug { }; + arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; + tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; opnplug = callPackage ../applications/audio/adlplug { @@ -669,11 +694,116 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; - alacritty = callPackage ../applications/misc/alacritty { + ### APPLICATIONS/TERMINAL-EMULATORS + + alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + aminal = callPackage ../applications/terminal-emulators/aminal { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; + }; + + archi = callPackage ../tools/misc/archi { }; + + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + + eterm = callPackage ../applications/terminal-emulators/eterm { }; + + evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); + + foot = callPackage ../applications/terminal-emulators/foot { }; + + guake = callPackage ../applications/terminal-emulators/guake { }; + + havoc = callPackage ../applications/terminal-emulators/havoc { }; + + hyper = callPackage ../applications/terminal-emulators/hyper { }; + + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + + kitty = callPackage ../applications/terminal-emulators/kitty { + harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; + }; + + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { + inherit (gnome2) vte; + gtk = gtk2; + flavour = "stable"; + }; + + lilyterm-git = lilyterm.override { + flavour = "git"; + }; + + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; + + microcom = callPackage ../applications/terminal-emulators/microcom { }; + + mlterm = callPackage ../applications/terminal-emulators/mlterm { + libssh2 = null; + openssl = null; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + + mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; + + nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; + + rxvt = callPackage ../applications/terminal-emulators/rxvt { }; + + rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; + + rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + + sakura = callPackage ../applications/terminal-emulators/sakura { }; + + st = callPackage ../applications/terminal-emulators/st { + conf = config.st.conf or null; + patches = config.st.patches or []; + extraLibs = config.st.extraLibs or []; + }; + xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; + + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { + gtk = gtk3; + }; + + terminator = callPackage ../applications/terminal-emulators/terminator { }; + + terminus = callPackage ../applications/terminal-emulators/terminus { }; + + termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { + termite = termite-unwrapped; + }; + termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; + + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { + inherit (haskellPackages) ghcWithPackages; + }; + + tilda = callPackage ../applications/terminal-emulators/tilda { + gtk = gtk3; + }; + + tilix = callPackage ../applications/terminal-emulators/tilix { }; + + wayst = callPackage ../applications/terminal-emulators/wayst { }; + + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; + + xterm = callPackage ../applications/terminal-emulators/xterm { }; + + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + + yaft = callPackage ../applications/terminal-emulators/yaft { }; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -682,8 +812,6 @@ in amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; - amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; - amber = callPackage ../tools/text/amber { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -701,6 +829,8 @@ in analog = callPackage ../tools/admin/analog {}; + angle-grinder = callPackage ../tools/text/angle-grinder {}; + ansifilter = callPackage ../tools/text/ansifilter {}; antora = callPackage ../development/tools/documentation/antora {}; @@ -729,6 +859,8 @@ in archivemount = callPackage ../tools/filesystems/archivemount { }; + archivy = python3Packages.callPackage ../applications/misc/archivy { }; + arandr = callPackage ../tools/X11/arandr { }; inherit (callPackages ../servers/nosql/arangodb { @@ -818,13 +950,13 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; aws-vault = callPackage ../tools/admin/aws-vault { }; iamy = callPackage ../tools/admin/iamy { }; - azure-cli = callPackage ../tools/admin/azure-cli { python = python37; }; + azure-cli = callPackage ../tools/admin/azure-cli { }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; @@ -844,6 +976,10 @@ in charm = callPackage ../applications/misc/charm { }; + chars = callPackage ../tools/text/chars { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -941,6 +1077,8 @@ in container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; + fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { }; ccextractor = callPackage ../applications/video/ccextractor { }; @@ -955,6 +1093,8 @@ in cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + coconut = with python3Packages; toPythonApplication coconut; + cod = callPackage ../tools/misc/cod { }; codespell = with python3Packages; toPythonApplication codespell; @@ -1038,6 +1178,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flood = nodePackages.flood; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genpass = callPackage ../tools/security/genpass { @@ -1048,8 +1190,6 @@ in gaia = callPackage ../development/libraries/gaia { }; - gama = callPackage ../applications/science/geometry/gama { }; - gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gammy = qt5.callPackage ../tools/misc/gammy { }; @@ -1108,6 +1248,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hostctl = callPackage ../tools/system/hostctl { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -1132,6 +1274,11 @@ in pass = callPackage ../tools/security/pass { }; + pass-nodmenu = callPackage ../tools/security/pass { + dmenuSupport = false; + pass = pass-nodmenu; + }; + pass-wayland = callPackage ../tools/security/pass { waylandSupport = true; pass = pass-wayland; @@ -1224,10 +1371,12 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; }; aria = aria2; + as-tree = callPackage ../tools/misc/as-tree { }; + asmfmt = callPackage ../development/tools/asmfmt { }; aspcud = callPackage ../tools/misc/aspcud { }; @@ -1360,7 +1509,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1389,7 +1538,7 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_10_0; @@ -1402,7 +1551,7 @@ in libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { inherit (linuxPackages) nvidia_x11; - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; @@ -1470,6 +1619,8 @@ in bsod = callPackage ../misc/emulators/bsod { }; + simh = callPackage ../misc/emulators/simh { }; + btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrbk = callPackage ../tools/backup/btrbk { @@ -1547,7 +1698,8 @@ in candle = libsForQt5.callPackage ../applications/misc/candle { }; capstone = callPackage ../development/libraries/capstone { }; - unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; + + keystone = callPackage ../development/libraries/keystone { }; casync = callPackage ../applications/networking/sync/casync { sphinx = python3Packages.sphinx; @@ -1745,6 +1897,8 @@ in dapr-cli = callPackage ../development/tools/dapr/cli {}; + dasel = callPackage ../applications/misc/dasel { }; + dasher = callPackage ../applications/accessibility/dasher { }; datamash = callPackage ../tools/misc/datamash { }; @@ -1887,6 +2041,8 @@ in dyncall = callPackage ../development/libraries/dyncall { }; + dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earlyoom = callPackage ../os-specific/linux/earlyoom { }; EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; @@ -1999,6 +2155,8 @@ in futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + inherit (nodePackages) fx; + tllist = callPackage ../development/libraries/tllist { }; fcft = callPackage ../development/libraries/fcft { }; @@ -2027,6 +2185,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; + go-rice = callPackage ../tools/misc/go.rice {}; go-2fa = callPackage ../tools/security/2fa {}; @@ -2106,9 +2266,7 @@ in gringo = callPackage ../tools/misc/gringo { }; - grobi = callPackage ../tools/X11/grobi { - buildGoModule = buildGo114Module; - }; + grobi = callPackage ../tools/X11/grobi { }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; @@ -2218,6 +2376,8 @@ in mapproxy = callPackage ../applications/misc/mapproxy { }; + marl = callPackage ../development/libraries/marl {}; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; masscan = callPackage ../tools/security/masscan { @@ -2230,7 +2390,7 @@ in medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt514.callPackage ../applications/misc/megasync { }; + megasync = libsForQt515.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2322,8 +2482,6 @@ in oneshot = callPackage ../tools/networking/oneshot { }; - onnxruntime = callPackage ../development/libraries/onnxruntime { }; - xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; @@ -2340,6 +2498,10 @@ in patdiff = callPackage ../tools/misc/patdiff { }; + patool = with python3Packages; toPythonApplication patool; + + pbgopy = callPackage ../tools/text/pbgopy { }; + pbpst = callPackage ../applications/misc/pbpst { }; pbzx = callPackage ../tools/compression/pbzx { }; @@ -2350,22 +2512,28 @@ in pev = callPackage ../development/tools/analysis/pev { }; + phd2 = callPackage ../applications/science/astronomy/phd2 { }; + phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; photon = callPackage ../tools/networking/photon { }; + piglit = callPackage ../tools/graphics/piglit { }; + playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { python3 = python37; }; + precice = callPackage ../development/libraries/precice { }; pueue = callPackage ../applications/misc/pueue { }; pixiecore = callPackage ../tools/networking/pixiecore {}; + waitron = callPackage ../tools/networking/waitron {}; + pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyrit = callPackage ../tools/security/pyrit {}; @@ -2402,6 +2570,8 @@ in socklog = callPackage ../tools/system/socklog { }; + ssmsh = callPackage ../tools/admin/ssmsh { }; + stagit = callPackage ../development/tools/stagit { }; starboard = callPackage ../applications/networking/cluster/starboard { }; @@ -2502,7 +2672,7 @@ in mstflint = callPackage ../tools/misc/mstflint { }; mcelog = callPackage ../os-specific/linux/mcelog { - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; }; sqlint = callPackage ../development/tools/sqlint { }; @@ -2557,7 +2727,9 @@ in inherit (llvmPackages) openmp; }; - bacula = callPackage ../tools/backup/bacula { }; + bacula = callPackage ../tools/backup/bacula { + inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; + }; bareos = callPackage ../tools/backup/bareos { }; @@ -2622,6 +2794,8 @@ in inherit (pythonPackages) gyp; }; + bumpver = callPackage ../applications/version-management/bumpver { }; + bup = callPackage ../tools/backup/bup { }; burp = callPackage ../tools/backup/burp { }; @@ -2734,7 +2908,7 @@ in clementineUnfree = clementine.unfree; - mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { }; + mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -2742,16 +2916,13 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_09_0; + citrix_workspace = citrix_workspace_20_10_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_19_6_0 - citrix_workspace_19_8_0 - citrix_workspace_19_10_0 - citrix_workspace_19_12_0 citrix_workspace_20_04_0 citrix_workspace_20_06_0 citrix_workspace_20_09_0 + citrix_workspace_20_10_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2868,14 +3039,17 @@ in libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; + libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - python = python2; - inherit (python2Packages) gyp; + stdenv = clangStdenv; protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { @@ -2962,14 +3136,18 @@ in console-bridge = callPackage ../development/libraries/console-bridge { }; + convbin = callPackage ../tools/misc/convbin { }; + + convimg = callPackage ../tools/misc/convimg { }; + + convfont = callPackage ../tools/misc/convfont { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; cpcfs = callPackage ../tools/filesystems/cpcfs { }; - cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; - coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; @@ -3228,6 +3406,10 @@ in dog = callPackage ../tools/system/dog { }; + dogdns = callPackage ../tools/networking/dogdns { + inherit (darwin.apple_sdk.frameworks) Security; + }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; @@ -3269,7 +3451,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -3363,8 +3545,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + pax = callPackage ../tools/archivers/pax { }; + rage = callPackage ../tools/security/rage { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Foundation Security; }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; @@ -3375,7 +3559,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; @@ -3409,7 +3593,7 @@ in uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3427,12 +3611,18 @@ in wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; + wlsunset = callPackage ../tools/wayland/wlsunset { }; + wob = callPackage ../tools/misc/wob { }; wtype = callPackage ../tools/wayland/wtype { }; wrangler = callPackage ../development/tools/wrangler { }; + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + + wsl-open = callPackage ../tools/misc/wsl-open { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -3477,21 +3667,21 @@ in elk7Version = "7.5.1"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; @@ -3536,6 +3726,8 @@ in entr = callPackage ../tools/misc/entr { }; + envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -3576,6 +3768,8 @@ in exif = callPackage ../tools/graphics/exif { }; + exifprobe = callPackage ../tools/graphics/exifprobe { }; + exiftags = callPackage ../tools/graphics/exiftags { }; exiftool = perlPackages.ImageExifTool; @@ -3661,6 +3855,8 @@ in feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; + fend = callPackage ../tools/misc/fend { }; + ferm = callPackage ../tools/networking/ferm { }; ffsend = callPackage ../tools/misc/ffsend { }; @@ -3769,8 +3965,6 @@ in flips = callPackage ../tools/compression/flips { }; - flvtool2 = callPackage ../tools/video/flvtool2 { }; - fmbt = callPackage ../development/tools/fmbt { python = python2; }; @@ -3899,7 +4093,7 @@ in galen = callPackage ../development/tools/galen {}; - gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; gandi-cli = callPackage ../tools/networking/gandi-cli { }; @@ -3993,16 +4187,27 @@ in gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { }; - gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; }; + gitlab = callPackage ../applications/version-management/gitlab { + ruby = ruby_2_7; + }; + gitlab-ee = callPackage ../applications/version-management/gitlab { + ruby = ruby_2_7; + gitlabEnterprise = true; + }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; + gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { + ruby = ruby_2_7; + }; + + gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { + ruby = ruby_2_7; + }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -4122,14 +4327,16 @@ in google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { + python = python3; + }; google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; google-fonts = callPackage ../data/fonts/google-fonts { }; google-clasp = callPackage ../development/misc/google-clasp { }; - google-compute-engine = python2.pkgs.google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; @@ -4141,6 +4348,8 @@ in gopro = callPackage ../tools/video/gopro { }; + goreleaser = callPackage ../tools/misc/goreleaser { }; + goreplay = callPackage ../tools/networking/goreplay { }; gource = callPackage ../applications/version-management/gource { }; @@ -4197,6 +4406,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ucg = callPackage ../tools/text/ucg { }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -4376,7 +4587,9 @@ in halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { }; + halide = callPackage ../development/compilers/halide { + llvmPackages = llvmPackages_9; + }; ham = pkgs.perlPackages.ham; @@ -4432,7 +4645,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4550,7 +4763,9 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { + inherit (darwin) IOKit; + }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; @@ -4561,6 +4776,8 @@ in irods irods-icommands; + igmpproxy = callPackage ../tools/networking/igmpproxy { }; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ghcWithPackages; @@ -4796,10 +5013,12 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; - wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; + wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; - kakoune = wrapKakoune kakoune-unwrapped { }; + kakoune = wrapKakoune kakoune-unwrapped { + plugins = [ ]; # override with the list of desired plugins + }; kak-lsp = callPackage ../tools/misc/kak-lsp { }; @@ -4821,6 +5040,8 @@ in kexpand = callPackage ../development/tools/kexpand { }; + kent = callPackage ../applications/science/biology/kent { }; + keybase = callPackage ../tools/security/keybase { # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox @@ -4863,25 +5084,25 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt514.callPackage ../applications/misc/krename { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt514.callPackage ../tools/misc/peruse { }; + peruse = libsForQt5.callPackage ../tools/misc/peruse { }; ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; @@ -4973,6 +5194,8 @@ in ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; + lunar-client = callPackage ../games/lunar-client {}; + lvmsync = callPackage ../tools/backup/lvmsync { }; kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; @@ -5044,6 +5267,8 @@ in mmv = callPackage ../tools/misc/mmv { }; + mmv-go = callPackage ../tools/misc/mmv-go { }; + most = callPackage ../tools/misc/most { }; motion = callPackage ../applications/video/motion { }; @@ -5062,6 +5287,8 @@ in nbench = callPackage ../tools/misc/nbench { }; + ncrack = callPackage ../tools/security/ncrack { }; + netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -5073,7 +5300,7 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; - next = callPackage ../applications/networking/browsers/next { }; + nyxt = callPackage ../applications/networking/browsers/nyxt { }; nfpm = callPackage ../tools/package-management/nfpm { }; @@ -5083,9 +5310,9 @@ in nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; - nodejs = hiPrio nodejs-12_x; + nodejs = hiPrio nodejs-14_x; - nodejs-slim = nodejs-slim-12_x; + nodejs-slim = nodejs-slim-14_x; nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; @@ -5100,10 +5327,13 @@ in nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false; }; - + nodejs-15_x = callPackage ../development/web/nodejs/v15.nix { }; + nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-14_x; - nodejs-slim_latest = nodejs-slim-14_x; + nodejs_latest = nodejs-15_x; + nodejs-slim_latest = nodejs-slim-15_x; nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { nodejs = pkgs.nodejs_latest; @@ -5153,6 +5383,8 @@ in libck = callPackage ../development/libraries/libck { }; + libcork = callPackage ../development/libraries/libcork { }; + libconfig = callPackage ../development/libraries/libconfig { }; libcmis = callPackage ../development/libraries/libcmis { }; @@ -5179,6 +5411,9 @@ in libhandy = callPackage ../development/libraries/libhandy { }; + # Needed for apps that still depend on the unstable verison of the library (not libhandy-1) + libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { }; + libgumath = callPackage ../development/libraries/libgumath { }; libinsane = callPackage ../development/libraries/libinsane { }; @@ -5233,6 +5468,8 @@ in libngspice = callPackage ../development/libraries/libngspice { }; + libnixxml = callPackage ../development/libraries/libnixxml { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; @@ -5356,13 +5593,13 @@ in mailnagWithPlugins = mailnag.withPlugins( builtins.attrValues mailnag.availablePlugins ); + bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; mailsend = callPackage ../tools/networking/mailsend { }; mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; mailutils = callPackage ../tools/networking/mailutils { - guile = guile_2_0; # compilation fails with guile 2.2 sasl = gsasl; }; @@ -5462,8 +5699,6 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; - microcom = callPackage ../applications/misc/microcom { }; - microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -5529,6 +5764,8 @@ in mmake = callPackage ../tools/misc/mmake { }; + mmixware = callPackage ../development/tools/mmixware { }; + modemmanager = callPackage ../tools/networking/modem-manager {}; modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; @@ -5723,6 +5960,8 @@ in networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { }; + networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { }; + networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; libnma = callPackage ../tools/networking/network-manager/libnma { }; @@ -5762,7 +6001,8 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_11; + nomad = nomad_0_12; + # 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. @@ -5813,8 +6053,6 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nimmm = callPackage ../applications/misc/nimmm { }; - nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -5887,6 +6125,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; + nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { }; nyancat = callPackage ../tools/misc/nyancat { }; @@ -6028,7 +6268,9 @@ in opentsdb = callPackage ../tools/misc/opentsdb {}; - openvpn = callPackage ../tools/networking/openvpn {}; + inherit (callPackages ../tools/networking/openvpn {}) + openvpn_24 + openvpn; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -6046,6 +6288,8 @@ in update-dotdee = with python3Packages; toPythonApplication update-dotdee; + update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; @@ -6104,8 +6348,6 @@ in packagekit = callPackage ../tools/package-management/packagekit { }; - packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { }; - packetdrill = callPackage ../tools/networking/packetdrill { }; pacman = callPackage ../tools/package-management/pacman { }; @@ -6128,7 +6370,7 @@ in paperless = callPackage ../applications/office/paperless { }; - paperwork = callPackage ../applications/office/paperwork { }; + paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; papertrail = callPackage ../tools/text/papertrail { }; @@ -6210,8 +6452,6 @@ in pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; - pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; - pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { }; @@ -6269,12 +6509,14 @@ in pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = callPackage ../tools/graphics/pfstools { }; + pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; phodav = callPackage ../tools/networking/phodav { }; + pim6sd = callPackage ../servers/pim6sd { }; + pinentry = libsForQt5.callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; }; @@ -6326,7 +6568,7 @@ in tab = callPackage ../tools/text/tab { }; - tautulli = callPackage ../servers/tautulli { python = python2; }; + tautulli = python3Packages.callPackage ../servers/tautulli { }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; @@ -6520,7 +6762,7 @@ in qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; qnial = callPackage ../development/interpreters/qnial { }; @@ -6568,6 +6810,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; @@ -6602,6 +6846,8 @@ in rc = callPackage ../shells/rc { }; + rcon = callPackage ../tools/networking/rcon { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; rdma-core = callPackage ../os-specific/linux/rdma-core { }; @@ -6709,7 +6955,7 @@ in rkrlv2 = callPackage ../applications/audio/rkrlv2 {}; rmlint = callPackage ../tools/misc/rmlint { - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; }; rng-tools = callPackage ../tools/security/rng-tools { }; @@ -6762,7 +7008,9 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + + rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; @@ -6776,6 +7024,8 @@ in rubocop = callPackage ../development/tools/rubocop { }; + ruffle = callPackage ../misc/emulators/ruffle { }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -6788,7 +7038,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - rustscan = callPackage ../tools/security/rustscan { }; + rustscan = callPackage ../tools/security/rustscan { + inherit (darwin.apple_sdk.frameworks) Security; + }; rw = callPackage ../tools/misc/rw { }; @@ -6904,6 +7156,8 @@ in skim = callPackage ../tools/misc/skim { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; @@ -6928,6 +7182,8 @@ in sewer = callPackage ../tools/admin/sewer { }; + sftpman = callPackage ../tools/filesystems/sftpman { }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; @@ -6982,7 +7238,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt514.callPackage ../applications/editors/sigil { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -7060,11 +7316,11 @@ in smu = callPackage ../tools/text/smu { }; - smugline = python3Packages.smugline; - sn0int = callPackage ../tools/security/sn0int { }; - snabb = callPackage ../tools/networking/snabb { } ; + snabb = callPackage ../tools/networking/snabb { }; + + snallygaster = callPackage ../tools/security/snallygaster { }; snapcast = callPackage ../applications/audio/snapcast { }; @@ -7101,6 +7357,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { }; + solr = callPackage ../servers/search/solr { }; solr_7 = solr; solr_8 = solr; @@ -7272,6 +7530,8 @@ in swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; + swapview = callPackage ../os-specific/linux/swapview/default.nix { }; + swec = callPackage ../tools/networking/swec { }; svnfs = callPackage ../tools/filesystems/svnfs { }; @@ -7324,6 +7584,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tarssh = callPackage ../servers/tarssh { }; + tartube = callPackage ../applications/video/tartube { }; tayga = callPackage ../tools/networking/tayga { }; @@ -7340,7 +7602,9 @@ in tcpkali = callPackage ../applications/networking/tcpkali { }; - tcpreplay = callPackage ../tools/networking/tcpreplay { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; + }; tdns-cli = callPackage ../tools/networking/tdns-cli { }; @@ -7369,7 +7633,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; tex = texlive.combined.scheme-small; extraFonts = true; - } else callPackage ../applications/editors/texmacs { + } else libsForQt5.callPackage ../applications/editors/texmacs { tex = texlive.combined.scheme-small; extraFonts = true; }; @@ -7378,7 +7642,9 @@ in texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; + textadept = callPackage ../applications/editors/textadept/10 { }; + + textadept11 = callPackage ../applications/editors/textadept/11 { }; texworks = libsForQt514.callPackage ../applications/editors/texworks { }; @@ -7410,6 +7676,8 @@ in timetable = callPackage ../applications/office/timetable { }; + timekeeper = callPackage ../applications/office/timekeeper { }; + timezonemap = callPackage ../development/libraries/timezonemap { }; tzupdate = callPackage ../applications/misc/tzupdate { }; @@ -7420,8 +7688,6 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tilix = callPackage ../applications/misc/tilix { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -7432,12 +7698,16 @@ in tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; + tiv = callPackage ../applications/misc/tiv { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -7592,6 +7862,8 @@ in twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twtxt = callPackage ../applications/networking/twtxt { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -7676,6 +7948,8 @@ in usync = callPackage ../applications/misc/usync { }; + uwc = callPackage ../tools/text/uwc { }; + uwsgi = callPackage ../servers/uwsgi { }; v2ray = callPackage ../tools/networking/v2ray { }; @@ -7714,6 +7988,8 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; + versus = callPackage ../applications/networking/versus { }; + vgrep = callPackage ../tools/text/vgrep { }; vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; @@ -7749,6 +8025,8 @@ in viu = callPackage ../tools/graphics/viu { }; + vix = callPackage ../tools/misc/vix { }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; @@ -7935,8 +8213,6 @@ in udunits = callPackage ../development/libraries/udunits { }; - uemacs = callPackage ../applications/editors/uemacs { }; - uftp = callPackage ../servers/uftp {}; uhttpmock = callPackage ../development/libraries/uhttpmock { }; @@ -7949,7 +8225,13 @@ in unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound { }; + unbound = callPackage ../tools/networking/unbound {}; + + unbound-with-systemd = unbound.override { + withSystemd = true; + }; + + unicorn = callPackage ../development/libraries/unicorn { }; units = callPackage ../tools/misc/units { enableCurrenciesUpdater = true; @@ -8000,8 +8282,6 @@ in unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; - unarj = callPackage ../tools/archivers/unarj { }; - unp = callPackage ../tools/archivers/unp { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -8133,8 +8413,6 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; - x3270 = callPackage ../applications/misc/x3270 { }; - xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -8221,8 +8499,6 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yaft = callPackage ../applications/misc/yaft { }; - yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; @@ -8298,6 +8574,8 @@ in zplug = callPackage ../shells/zsh/zplug { }; + zplugin = callPackage ../shells/zsh/zplugin {} ; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-bd = callPackage ../shells/zsh/zsh-bd { }; @@ -8329,9 +8607,7 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = buildPackages.cmake.override { - libarchive = buildPackages.libarchive.override { zstd = null; }; - }; + cmake = buildPackages.cmakeMinimal; }; zsync = callPackage ../tools/compression/zsync { }; @@ -8415,11 +8691,49 @@ in ### DEVELOPMENT / COMPILERS + _4th = callPackage ../development/compilers/4th { }; + abcl = callPackage ../development/compilers/abcl { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; + adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + + adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; + + adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix; + adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + + adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; @@ -8487,6 +8801,8 @@ in arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; + asciigraph = callPackage ../tools/text/asciigraph { }; + asn1c = callPackage ../development/compilers/asn1c { }; aspectj = callPackage ../development/compilers/aspectj { }; @@ -8505,7 +8821,9 @@ in binaryen = callPackage ../development/compilers/binaryen { }; - bluespec = callPackage ../development/compilers/bluespec { }; + bluespec = callPackage ../development/compilers/bluespec { + gmp-static = gmp.override { withStatic = true; }; + }; ciao = callPackage ../development/compilers/ciao { }; @@ -8524,6 +8842,8 @@ in chicken egg2nix; + cc65 = callPackage ../development/compilers/cc65 { }; + ccl = callPackage ../development/compilers/ccl { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -8612,12 +8932,13 @@ in copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - inherit (llvmPackages_10) stdenv clang llvm; + llvmPackages = llvmPackages_10; }) crystal_0_31 crystal_0_32 crystal_0_33 crystal_0_34 + crystal_0_35 crystal crystal2nix; @@ -8635,8 +8956,6 @@ in dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; - drumstick = callPackage ../development/libraries/drumstick { }; - ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; @@ -8655,11 +8974,15 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; + fasmg = callPackage ../development/compilers/fasmg { }; + flyctl = callPackage ../development/web/flyctl { }; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + flutter-beta = flutterPackages.beta; + flutter-dev = flutterPackages.dev; fpc = callPackage ../development/compilers/fpc { }; @@ -8760,7 +9083,7 @@ in inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; # just for stage static crossStageStatic = true; @@ -8853,7 +9176,7 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; })); gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { @@ -8867,7 +9190,7 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; })); gcc_latest = gcc10; @@ -9039,7 +9362,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc884; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102; inherit (haskellPackages) ghc; @@ -9259,10 +9582,19 @@ in /* default JDK */ jdk = jdk14; - # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + + # Since the introduction of the Java Platform Module System in Java 9, Java + # no longer ships a separate JRE package. + # + # If you are building a 'minimal' system/image, you are encouraged to use + # '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 = jdk14; jre_headless = jdk14_headless; + jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; + openjdk = openjdk14; openjdk_headless = openjdk14_headless; @@ -9274,22 +9606,15 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; + inherit (callPackages ../development/compilers/graalvm/community-edition.nix { }) + graalvm8-ce + graalvm11-ce; + inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee graalvm11-ee; - openshot-qt = let - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9325,31 +9650,30 @@ in javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - julia_07 = callPackage ../development/compilers/julia/0.7.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + libgit2 = libgit2_0_27; }; - julia_11 = callPackage ../development/compilers/julia/1.1.nix { + julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia_13 = callPackage ../development/compilers/julia/1.3.nix { - gmp = gmp6; + julia_15 = callPackage ../development/compilers/julia/1.5.nix { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_1 = julia_10; - julia = julia_1; + julia = julia_15; jwasm = callPackage ../development/compilers/jwasm { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { + asciidoc = asciidoc-full; + }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kimg = callPackage ../development/tools/knightos/kimg { @@ -9471,7 +9795,7 @@ in stdenv = gcc7Stdenv; }); - llvmPackages_latest = llvmPackages_10; + llvmPackages_latest = llvmPackages_11; llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; @@ -9545,14 +9869,17 @@ in mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; + muon = callPackage ../development/compilers/muon { }; + nim = callPackage ../development/compilers/nim { }; nim-unwrapped = nim.unwrapped; + nimble-unwrapped = nim.nimble-unwrapped; nrpl = callPackage ../development/tools/nrpl { }; neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr { + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -9576,7 +9903,7 @@ in inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 - ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_15_0; + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0; orc = callPackage ../development/compilers/orc { }; @@ -9593,7 +9920,7 @@ in ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_03; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -9667,17 +9994,17 @@ in # So this commit doesn't remove the 1.45.2 release. rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust_1_46 = callPackage ../development/compilers/rust/1_46.nix { + rust_1_48 = callPackage ../development/compilers/rust/1_48.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; }; - rust = rust_1_46; + rust = rust_1_48; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_46 = rust_1_46.packages.stable; - rustPackages = rustPackages_1_46; + rustPackages_1_48 = rust_1_48.packages.stable; + rustPackages = rustPackages_1_48; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -9775,6 +10102,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + crate2nix = callPackage ../development/tools/rust/crate2nix { }; + maturin = callPackage ../development/tools/rust/maturin { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; @@ -9797,13 +10126,15 @@ in sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - sbcl_2_0_2 = callPackage ../development/compilers/sbcl {}; - sbcl = callPackage ../development/compilers/sbcl/2.0.0.nix {}; + sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; + sbcl = callPackage ../development/compilers/sbcl {}; + + inherit (callPackage ../development/compilers/scala/2.x.nix { jre = jre8; }) + scala_2_10 + scala_2_11 + scala_2_12 + scala_2_13; - scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; - scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; - scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; }; - scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; metal = callPackage ../development/libraries/metal { }; @@ -9831,6 +10162,8 @@ in souffle = callPackage ../development/compilers/souffle { }; + spasm-ng = callPackage ../development/compilers/spasm-ng { }; + spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; sqldeveloper = callPackage ../development/tools/database/sqldeveloper { @@ -9991,6 +10324,8 @@ in ceptre = callPackage ../development/interpreters/ceptre { }; + cling = callPackage ../development/interpreters/cling { }; + clips = callPackage ../development/interpreters/clips { }; clisp = callPackage ../development/interpreters/clisp { }; @@ -10004,14 +10339,16 @@ in dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; - dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; - dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash; - dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs; dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + + dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; + dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; dhallPackages = callPackages ./dhall-packages.nix { }; @@ -10027,7 +10364,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 @@ -10178,19 +10515,34 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php74; + # PHP interpreters, packages and extensions. + # + # Set default PHP interpreter, extensions and packages + php = php74; + phpExtensions = php74Extensions; phpPackages = php74Packages; - php73Packages = recurseIntoAttrs php73.packages; - php74Packages = recurseIntoAttrs php74.packages; - phpExtensions = php74Extensions; - php73Extensions = recurseIntoAttrs php73.extensions; + php80 = callPackage ../development/interpreters/php/8.0.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + php80Extensions = recurseIntoAttrs php80.extensions; + php80Packages = recurseIntoAttrs php80.packages; + + # Import PHP74 interpreter, extensions and packages + php74 = callPackage ../development/interpreters/php/7.4.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; php74Extensions = recurseIntoAttrs php74.extensions; + php74Packages = recurseIntoAttrs php74.packages; - inherit (callPackage ../development/interpreters/php { + # Import PHP73 interpreter, extensions and packages + php73 = callPackage ../development/interpreters/php/7.3.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73; + }; + php73Extensions = recurseIntoAttrs php73.extensions; + php73Packages = recurseIntoAttrs php73.packages; + picoc = callPackage ../development/interpreters/picoc {}; @@ -10260,20 +10612,16 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python { - # Overrides that apply to all Python interpreters and their packages - # Generally, this should be avoided. - pkgs = pkgs.extend (final: _: { - }); - }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; + pythonInterpreters = callPackage ./../development/interpreters/python { }; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; # Python package sets. - python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); + python27Packages = python27.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; - python39Packages = python39.pkgs; + python39Packages = recurseIntoAttrs python39.pkgs; + python310Packages = python310.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -10366,6 +10714,8 @@ in solargraph = callPackage ../development/ruby-modules/solargraph { }; + rbenv = callPackage ../development/ruby-modules/rbenv { }; + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -10375,19 +10725,6 @@ in ruby_2_6 ruby_2_7; - rubyMinimal = ruby.override { - # gem support is minimal overhead - rubygemsSupport = true; - useRailsExpress = false; - zlibSupport = false; - opensslSupport = false; - gdbmSupport = false; - cursesSupport = false; - docSupport = false; - yamlSupport = false; - fiddleSupport = false; - }; - ruby = ruby_2_6; rubyPackages = rubyPackages_2_6; @@ -10420,7 +10757,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -10507,6 +10844,8 @@ in vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; resim = callPackage ../misc/emulators/resim {}; + or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; + rappel = callPackage ../development/misc/rappel/default.nix { }; pharo-vms = callPackage ../development/pharo/vm { }; @@ -10564,10 +10903,11 @@ in }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - antlr4 = antlr4_7; + + antlr4 = antlr4_8; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; @@ -10601,7 +10941,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -10723,6 +11063,8 @@ in }; }); + bisoncpp = callPackage ../development/tools/parsing/bisonc++ { }; + black = with python3Packages; toPythonApplication black; blackfire = callPackage ../development/tools/misc/blackfire { }; @@ -10749,6 +11091,8 @@ in buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; + bump = callPackage ../development/tools/github/bump { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; bpftool = callPackage ../os-specific/linux/bpftool { }; @@ -10765,7 +11109,9 @@ in cc-tool = callPackage ../development/tools/misc/cc-tool { }; - ccache = callPackage ../development/tools/misc/ccache { }; + ccache = callPackage ../development/tools/misc/ccache { + asciidoc = asciidoc-full; + }; # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: @@ -10787,12 +11133,25 @@ in # }; # You can use a different directory, but whichever directory you choose # should be owned by user root, group nixbld with permissions 0770. - ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }: - cc.override { cc = ccache.links { + ccacheWrapper = makeOverridable ({ extraConfig, cc }: + cc.override { + cc = ccache.links { + inherit extraConfig; + unwrappedCC = cc.cc; + }; + }) { + extraConfig = ""; + inherit (stdenv) cc; + }; + + ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }: + overrideCC stdenv (buildPackages.ccacheWrapper.override { inherit extraConfig; - unwrappedCC = cc.cc; - }; }) {}; - ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); + inherit (stdenv) cc; + })) { + extraConfig = ""; + inherit stdenv; + }); cccc = callPackage ../development/tools/analysis/cccc { }; @@ -10852,6 +11211,10 @@ in cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { + isBootstrap = true; + }; + cmakeCurses = cmake.override { useNcurses = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; }; @@ -11001,11 +11364,11 @@ in dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { - qt4 = null; + qt5 = null; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); + doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); drake = callPackage ../development/tools/build-managers/drake { }; @@ -11163,7 +11526,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_6; + gradle_6 = res.gradleGen.gradle_6_7; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -11335,7 +11698,7 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { @@ -11528,7 +11891,7 @@ in lua = lua5; } // (config.radare or {}))) radare2 r2-for-cutter; - radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; @@ -11578,6 +11941,8 @@ in rr = callPackage ../development/tools/analysis/rr { }; rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details. + rufo = callPackage ../development/tools/rufo { }; + samurai = callPackage ../development/tools/build-managers/samurai { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -11617,7 +11982,10 @@ in shallot = callPackage ../tools/misc/shallot { }; - shards = callPackage ../development/tools/build-managers/shards { }; + inherit (callPackage ../development/tools/build-managers/shards { }) + shards_0_11 + shards_0_12 + shards; shellcheck = callPackage ../development/tools/shellcheck {}; @@ -11677,6 +12045,8 @@ in sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; + sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; + sqlite-web = callPackage ../development/tools/database/sqlite-web { }; sqlmap = with python3Packages; toPythonApplication sqlmap; @@ -11759,7 +12129,9 @@ in travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = callPackage ../development/tools/parsing/tree-sitter { }; + tree-sitter = callPackage ../development/tools/parsing/tree-sitter { + inherit (darwin.apple_sdk.frameworks) Security; + }; trellis = callPackage ../development/tools/trellis { }; @@ -11785,6 +12157,8 @@ in vagrant = callPackage ../development/tools/vagrant {}; + vala-language-server = callPackage ../development/tools/vala-language-server {}; + bashdb = callPackage ../development/tools/misc/bashdb { }; gdb = callPackage ../development/tools/misc/gdb { @@ -11866,6 +12240,8 @@ in yq-go = callPackage ../development/tools/yq-go { }; + ytt = callPackage ../development/tools/ytt {}; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -11964,8 +12340,6 @@ in aspell = aspell.override { searchNixProfiles = false; }; }; - attica = callPackage ../development/libraries/attica { }; - attr = callPackage ../development/libraries/attr { }; at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; @@ -12051,7 +12425,9 @@ in boost170 = callPackage ../development/libraries/boost/1.70.nix { }; boost171 = callPackage ../development/libraries/boost/1.71.nix { }; boost172 = callPackage ../development/libraries/boost/1.72.nix { }; - boost17x = boost172; + boost173 = callPackage ../development/libraries/boost/1.73.nix { }; + boost174 = callPackage ../development/libraries/boost/1.74.nix { }; + boost17x = boost174; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -12242,7 +12618,7 @@ in cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; - cxxtest = callPackage ../development/libraries/cxxtest { }; + cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; @@ -12274,9 +12650,9 @@ in dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - makeDBusConf = { suidHelper, serviceDirectories }: + makeDBusConf = { suidHelper, serviceDirectories, apparmor }: callPackage ../development/libraries/dbus/make-dbus-conf.nix { - inherit suidHelper serviceDirectories; + inherit suidHelper serviceDirectories apparmor; }; dee = callPackage ../development/libraries/dee { }; @@ -12414,18 +12790,12 @@ in ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin - frei0r = if stdenv.isDarwin then null else frei0r; - game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - rav1e = null; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; - x265 = if stdenv.isDarwin then null else x265; - xavs = if stdenv.isDarwin then null else xavs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; @@ -12464,7 +12834,9 @@ in flyway = callPackage ../development/tools/flyway { }; - fmt = callPackage ../development/libraries/fmt/default.nix { }; + inherit (callPackages ../development/libraries/fmt { }) fmt_7; + + fmt = fmt_7; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; @@ -12671,6 +13043,7 @@ in else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib + else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -12797,7 +13170,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; - utillinux = utillinuxMinimal; # break the cyclic dependency + util-linux = util-linuxMinimal; # break the cyclic dependency }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { @@ -12812,6 +13185,8 @@ in pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {}; + pgweb = callPackage ../development/tools/database/pgweb { }; + gpgstats = callPackage ../tools/security/gpgstats { }; gpshell = callPackage ../development/tools/misc/gpshell { }; @@ -12999,7 +13374,10 @@ in herqq = libsForQt514.callPackage ../development/libraries/herqq { }; - hidapi = callPackage ../development/libraries/hidapi { }; + hidapi = callPackage ../development/libraries/hidapi { + # TODO: remove once `udev` is `systemdMinimal` everywhere. + udev = systemdMinimal; + }; highfive = callPackage ../development/libraries/highfive { }; @@ -13038,7 +13416,7 @@ in hwloc = callPackage ../development/libraries/hwloc {}; inherit (callPackage ../development/tools/misc/hydra { }) - hydra-migration hydra-unstable; + hydra-unstable; hydra-flakes = throw '' Flakes support has been merged into Hydra's master. Please use @@ -13201,6 +13579,8 @@ in jsonnet = callPackage ../development/compilers/jsonnet { }; + jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; @@ -13217,7 +13597,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - libsForQt5 = libsForQt514; + inherit libsForQt5; inherit lib fetchurl; }; in @@ -13232,8 +13612,6 @@ in automake = automake111x; }; - kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -13253,6 +13631,8 @@ in lasso = callPackage ../development/libraries/lasso { }; + LAStools = callPackage ../development/libraries/LAStools { }; + LASzip = callPackage ../development/libraries/LASzip { }; LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; @@ -13475,6 +13855,8 @@ in libdap = callPackage ../development/libraries/libdap { }; + libdatrie = callPackage ../development/libraries/libdatrie { }; + libdazzle = callPackage ../development/libraries/libdazzle { }; libdbi = callPackage ../development/libraries/libdbi { }; @@ -13576,7 +13958,9 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { }; + libfido2 = callPackage ../development/libraries/libfido2 { + udev = systemdMinimal; + }; libfilezilla = callPackage ../development/libraries/libfilezilla { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -13692,6 +14076,8 @@ in libfixposix = callPackage ../development/libraries/libfixposix {}; + libff = callPackage ../development/libraries/libff { }; + libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; @@ -13932,7 +14318,18 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin { + # cmake 3.19.1 has a bug. So far only noticed with this package. + # https://github.com/NixOS/nixpkgs/issues/105854 + cmake = cmake.overrideAttrs(oldAttrs: { + patches = oldAttrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch"; + sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU="; + }) + ]; + }); + }); libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; @@ -13973,7 +14370,9 @@ in libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; + libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; + libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd = libmicrohttpd_0_9_71; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -14019,6 +14418,8 @@ in libndctl = callPackage ../development/libraries/libndctl { }; + libnest2d = callPackage ../development/libraries/libnest2d { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { }; @@ -14191,6 +14592,8 @@ in libtcod = callPackage ../development/libraries/libtcod { }; + libthai = callPackage ../development/libraries/libthai { }; + libtheora = callPackage ../development/libraries/libtheora { }; libthreadar = callPackage ../development/libraries/libthreadar { }; @@ -14265,6 +14668,8 @@ in libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; + # TODO: remove once `udev` is `systemdMinimal` everywhere. + udev = systemdMinimal; }; libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; @@ -14531,6 +14936,8 @@ in withGUI = false; }; + mlc = callPackage ../tools/system/mlc { }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -14599,6 +15006,8 @@ in nanomsg = callPackage ../development/libraries/nanomsg { }; + nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; + ndpi = callPackage ../development/libraries/ndpi { }; nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; @@ -14657,6 +15066,9 @@ in nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { }); nssTools = nss.tools; + # required for stable thunderbird and firefox-esr-78 + nss_3_53 = lowPrio (callPackage ../development/libraries/nss/3.53.nix { }); + nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; nsss = skawarePackages.nsss; @@ -14667,6 +15079,8 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nuraft = callPackage ../development/libraries/nuraft { }; + nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; @@ -14717,7 +15131,6 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -14776,7 +15189,9 @@ in opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; - openscenegraph = callPackage ../development/libraries/openscenegraph { }; + openscenegraph = callPackage ../development/libraries/openscenegraph { + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; + }; openslp = callPackage ../development/libraries/openslp {}; @@ -14925,8 +15340,9 @@ in python = python37; }; - protobuf = protobuf3_13; + protobuf = protobuf3_14; + protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; @@ -15022,8 +15438,6 @@ in inherit llvmPackages_5; }); - libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; @@ -15054,6 +15468,8 @@ in inherit llvmPackages_5; }); + libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); @@ -15080,17 +15496,41 @@ in kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose - kcontacts kquickcharts kdoctools kapidox; + kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration + kdewebkit breeze-icons + ; ### KDE PLASMA 5 inherit (plasma5.override { libsForQt5 = self; }) - kdecoration khotkeys libkscreen libksysguard; + kdecoration khotkeys libkscreen libksysguard bluedevil + breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd + kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit + kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration + kwin kwrited milou oxygen plasma-browser-integration plasma-desktop + plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm + systemsettings user-manager xdg-desktop-portal-kde + ; + + inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) + plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite + ; ### KDE APPLICATIONS inherit (kdeApplications.override { libsForQt5 = self; }) - libkdcraw libkexiv2 libkipi libkomparediff2 libksane; + libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts + akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface + kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight + granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter + kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer + kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle + kwalletmanager kwave marble minuet okular picmi spectacle yakuake + ; ### LIBRARIES @@ -15102,18 +15542,28 @@ in dxflib = callPackage ../development/libraries/dxflib {}; + drumstick = callPackage ../development/libraries/drumstick { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; + qtcurve = callPackage ../data/themes/qtcurve {}; + + herqq = callPackage ../development/libraries/herqq { }; + kdb = callPackage ../development/libraries/kdb { }; + kde2-decoration = callPackage ../data/themes/kde2 { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; + kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kproperty = callPackage ../development/libraries/kproperty { }; kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; @@ -15134,7 +15584,11 @@ in libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; - libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; + + libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Foundation; + }; libqglviewer = callPackage ../development/libraries/libqglviewer { inherit (darwin.apple_sdk.frameworks) AGL; @@ -15168,6 +15622,8 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; @@ -15204,6 +15660,9 @@ in qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; + # Not a library, but we do want it to be built for every qt version there + # is, to allow users to choose the right build if needed. + sddm = callPackage ../applications/display-managers/sddm { }; }; qtEnv = qt5.env; @@ -15219,6 +15678,8 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qwt = callPackage ../development/libraries/qwt {}; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { @@ -15293,7 +15754,13 @@ in qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; + qradiolink = callPackage ../applications/radio/qradiolink { + # 3.8 support is not ready yet: + # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573 + # The non minimal build is used because the 'qtgui' component is needed. + # gr-osmosdr is using the same gnuradio as of now. + gnuradio = gnuradio3_7-unwrapped; + }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -15472,6 +15939,8 @@ in snappy = callPackage ../development/libraries/snappy { }; + snow = callPackage ../tools/security/snow { }; + soapyairspy = callPackage ../applications/radio/soapyairspy { }; soapybladerf = callPackage ../applications/radio/soapybladerf { }; @@ -15502,7 +15971,9 @@ in sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soil = callPackage ../development/libraries/soil { }; + soil = callPackage ../development/libraries/soil { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; sonic = callPackage ../development/libraries/sonic { }; @@ -15515,6 +15986,7 @@ in soundtouch = callPackage ../development/libraries/soundtouch {}; spandsp = callPackage ../development/libraries/spandsp {}; + spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; @@ -15546,6 +16018,8 @@ in spice-up = callPackage ../applications/office/spice-up { }; + spicetify-cli = callPackage ../applications/misc/spicetify-cli { }; + spirv-cross = callPackage ../tools/graphics/spirv-cross { }; sratom = callPackage ../development/libraries/audio/sratom { }; @@ -15666,9 +16140,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - python = buildPackages.python3; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {}; @@ -15877,9 +16349,11 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; + vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vtkWithQt5 = vtk.override { qtLib = qt514; }; @@ -15889,6 +16363,8 @@ in stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 }; + waffle = callPackage ../development/libraries/waffle { }; + wally-cli = callPackage ../development/tools/wally-cli { }; wavpack = callPackage ../development/libraries/wavpack { }; @@ -16241,8 +16717,8 @@ in inherit clwrapper; }; - lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 // - lispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; })); + lispPackages = recurseIntoAttrs (quicklispPackages // + (lispPackagesFor (wrapLisp sbcl))); quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix { inherit clwrapper; @@ -16250,8 +16726,6 @@ in quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp)); quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl)); quicklispPackages = quicklispPackagesSBCL; - quicklispPackages_asdf_3_1 = quicklispPackagesFor - ((wrapLisp sbcl).override { asdf = asdf_3_1; }); ### DEVELOPMENT / PERL MODULES @@ -16396,7 +16870,7 @@ in inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_13 asterisk_16 asterisk_17; + asterisk_13 asterisk_16 asterisk_17 asterisk_18; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; @@ -16419,8 +16893,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # clickhouse doesn't build on llvm8. - inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; + # upstream requires llvm10 as of v20.11.4.13 + inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -16520,8 +16994,6 @@ in frab = callPackage ../servers/web-apps/frab { }; - freepops = callPackage ../servers/mail/freepops { }; - freeradius = callPackage ../servers/freeradius { }; freeswitch = callPackage ../servers/sip/freeswitch { @@ -16542,13 +17014,11 @@ in grafana = callPackage ../servers/monitoring/grafana { }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoPackage = buildGo114Package; - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gerbera = callPackage ../servers/gerbera { }; + gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { }; @@ -16589,6 +17059,8 @@ in imgproxy = callPackage ../servers/imgproxy { }; + ircdog = callPackage ../applications/networking/irc/ircdog { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -16622,6 +17094,8 @@ in labelImg = callPackage ../applications/science/machine-learning/labelimg { }; + mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; + mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; mailman-rss = callPackage ../development/python-modules/mailman-rss { }; @@ -16646,6 +17120,8 @@ in minio = callPackage ../servers/minio { }; + mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; + # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; @@ -16740,8 +17216,10 @@ in openbgpd = callPackage ../servers/openbgpd { }; - openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; + openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; }; + # Current stable release; don't backport release updates! + openafs = openafs_1_8; openresty = callPackage ../servers/http/openresty { withPerl = false; @@ -16785,6 +17263,12 @@ in # PulseAudio daemons + hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { }; + + pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; + }; + pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -16825,6 +17309,8 @@ in tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; + pg_featureserv = callPackage ../servers/pg_featureserv { }; + pg_tileserv = callPackage ../servers/pg_tileserv { }; pies = callPackage ../servers/pies { }; @@ -16890,17 +17376,8 @@ in erlang = erlang_basho_R16B02; }; - riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - erlang = erlang_basho_R16B02; - }; - - stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - erlang = erlang_basho_R16B02; - }; - influxdb = callPackage ../servers/nosql/influxdb { }; + influxdb2 = callPackage ../servers/nosql/influxdb2 { }; mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix { inherit (darwin) cctools developer_cmds; @@ -16939,7 +17416,7 @@ in checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; - pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { }; + check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; neo4j = callPackage ../servers/nosql/neo4j { }; @@ -17008,10 +17485,7 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo114Package; - go = go_1_14; - }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -17045,7 +17519,9 @@ in prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; + prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; + prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; @@ -17244,8 +17720,6 @@ in shaarli = callPackage ../servers/web-apps/shaarli { }; - shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { }; inherit (callPackages ../servers/web-apps/matomo {}) @@ -17256,7 +17730,8 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable; + unifiStable + unifiBeta; unifi = unifiStable; urserver = callPackage ../servers/urserver { }; @@ -17281,6 +17756,8 @@ in webmetro = callPackage ../servers/webmetro { }; + wsdd = callPackage ../servers/wsdd { }; + webhook = callPackage ../servers/http/webhook { }; winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; @@ -17484,6 +17961,8 @@ in crda = callPackage ../os-specific/linux/crda { }; + cshatag = callPackage ../os-specific/linux/cshatag { }; + # Darwin package set # # Even though this is a set of packages not single package, use `callPackage` @@ -17528,7 +18007,7 @@ in libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = if stdenv.isLinux - then utillinuxMinimal + then util-linuxMinimal else null; light = callPackage ../os-specific/linux/light { }; @@ -17561,7 +18040,7 @@ in }; fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; }); fuse = lowPrio fusePackages.fuse_2; fuse3 = fusePackages.fuse_3; @@ -17722,18 +18201,11 @@ in linux_mptcp = linux_mptcp_95; - linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; + linux_mptcp_5_9 = linux_5_9.override { + structuredExtraConfig = with lib.kernel; { + MPTCP = yes; + MPTCP_IPV6 = yes; + }; }; linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { @@ -17893,11 +18365,19 @@ in inherit kernel; inherit (kernel) stdenv; # in particular, use the same compiler by default + # to help determine module compatibility + inherit (kernel) isXen isZen isHardened isLibre; + inherit (kernel) kernelOlder kernelAtLeast; + # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 acpi_call = callPackage ../os-specific/linux/acpi-call {}; + akvcam = callPackage ../os-specific/linux/akvcam { + inherit (qt5) qmake; + }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; @@ -17935,6 +18415,8 @@ in fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; @@ -17996,8 +18478,10 @@ in rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; - openafs = callPackage ../servers/openafs/1.6/module.nix { }; openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; + openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; + # Current stable release; don't backport release updates! + openafs = openafs_1_8; facetimehd = callPackage ../os-specific/linux/facetimehd { }; @@ -18144,7 +18628,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_8; + linux_latest_for_hardened = pkgs.linux_5_9; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -18156,6 +18640,7 @@ in kernelPatches.hardened.${kernel.meta.branch} ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; + isHardened = true; }); linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); @@ -18217,9 +18702,7 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; - libselinux = callPackage ../os-specific/linux/libselinux { - python = python37; - }; + libselinux = callPackage ../os-specific/linux/libselinux { }; libsemanage = callPackage ../os-specific/linux/libsemanage { python = python3; @@ -18275,7 +18758,7 @@ in # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. - udev = udev.override { cryptsetup = null; }; + udev = systemdMinimal; }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; @@ -18514,8 +18997,6 @@ in # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; }); - qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; }); qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); @@ -18530,6 +19011,8 @@ in raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; + raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; + raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -18540,6 +19023,8 @@ in roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; + rtsp-simple-server = callPackage ../servers/rtsp-simple-server { }; + rtkit = callPackage ../os-specific/linux/rtkit { }; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; @@ -18599,6 +19084,8 @@ in sysprof = callPackage ../development/tools/profiling/sysprof { }; + libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { }; + sysklogd = callPackage ../os-specific/linux/sysklogd { }; syslinux = callPackage ../os-specific/linux/syslinux { }; @@ -18607,7 +19094,7 @@ in systemd = callPackage ../os-specific/linux/systemd { # break some cyclic dependencies - utillinux = utillinuxMinimal; + util-linux = util-linuxMinimal; # provide a super minimal gnupg used for systemd-machined gnupg = callPackage ../tools/security/gnupg/22.nix { enableMinimal = true; @@ -18624,8 +19111,40 @@ in bzip2 = null; }; }; + systemdMinimal = systemd.override { + pname = "systemd-minimal"; + withAnalyze = false; + withApparmor = false; + withCompression = false; + withCoredump = false; + withCryptsetup = false; + withDocumentation = false; + withEfi = false; + withHostnamed = false; + withHwdb = false; + withImportd = false; + withLocaled = false; + withLogind = false; + withMachined = false; + withNetworkd = false; + withNss = false; + withPCRE2 = false; + withPolkit = false; + withRemote = false; + withResolved = false; + withShellCompletions = false; + withTimedated = false; + withTimesyncd = false; + withUserDb = false; + glib = null; + libgcrypt = null; + lvm2 = null; + libfido2 = null; + p11-kit = null; + }; + - udev = systemd; # TODO: move to aliases.nix + udev = systemd; # TODO: change to systemdMinimal systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -18680,6 +19199,7 @@ in ubootRaspberryPi3_64bit ubootRaspberryPiZero ubootRock64 + ubootRockPi4 ubootRockPro64 ubootROCPCRK3399 ubootSheevaplug @@ -18694,7 +19214,7 @@ in stdenv = crossLibcStdenv; }; - eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; }; + eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; @@ -18704,6 +19224,8 @@ in udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; + ugtrain = callPackage ../tools/misc/ugtrain { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; @@ -18718,17 +19240,17 @@ in usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } - else unixtools.utillinux; + util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } + else unixtools.util-linux; - utillinuxCurses = utillinux; + util-linuxCurses = util-linux; - utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override { + util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { minimal = true; ncurses = null; perl = null; systemd = null; - }) else utillinux; + }) else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -18843,8 +19365,6 @@ in brise = callPackage ../data/misc/brise { }; - inherit (kdeFrameworks) breeze-icons; - cacert = callPackage ../data/misc/cacert { }; caladea = callPackage ../data/fonts/caladea {}; @@ -19010,12 +19530,16 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { }; + flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; + fraunces = callPackage ../data/fonts/fraunces { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; @@ -19105,8 +19629,6 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -19169,9 +19691,11 @@ in luculent = callPackage ../data/fonts/luculent { }; - luna-icons = callPackage ../data/icons/luna-icons { }; + luna-icons = callPackage ../data/icons/luna-icons { + inherit (kdeFrameworks) breeze-icons; + }; - maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; + maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -19252,6 +19776,8 @@ in inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + nuclear = callPackage ../applications/audio/nuclear { }; + nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; @@ -19290,15 +19816,17 @@ in oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; - inherit (kdeFrameworks) oxygen-icons5; - paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; - papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; - papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; papis = with python3Packages; toPythonApplication papis; @@ -19328,7 +19856,9 @@ in pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; @@ -19353,8 +19883,6 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; - redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; route159 = callPackage ../data/fonts/route159 { }; @@ -19383,7 +19911,9 @@ in shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; - scheherazade = callPackage ../data/fonts/scheherazade { }; + scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; }; + + scheherazade-new = callPackage ../data/fonts/scheherazade { }; signwriting = callPackage ../data/fonts/signwriting { }; @@ -19526,6 +20056,8 @@ in ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; }; @@ -19608,7 +20140,9 @@ in yaru-theme = callPackage ../data/themes/yaru {}; - zafiro-icons = callPackage ../data/icons/zafiro-icons { }; + zafiro-icons = callPackage ../data/icons/zafiro-icons { + inherit (kdeFrameworks) breeze-icons; + }; zeal = libsForQt514.callPackage ../data/documentation/zeal { }; @@ -19678,7 +20212,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt514.callPackage ../applications/audio/amarok { }; + amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -19776,22 +20310,14 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = let - # Use Qt 5.14 consistently - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; milkytracker = callPackage ../applications/audio/milkytracker { }; + ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; + schismtracker = callPackage ../applications/audio/schismtracker { }; jnetmap = callPackage ../applications/networking/jnetmap {}; @@ -19836,9 +20362,9 @@ in backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; + backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; - backintime = backintime-qt4; + backintime = backintime-qt; balsa = callPackage ../applications/networking/mailreaders/balsa { }; @@ -19930,6 +20456,8 @@ in blugon = callPackage ../applications/misc/blugon { }; + bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -19989,9 +20517,12 @@ in calibre = calibre-py3; calligra = libsForQt514.callPackage ../applications/office/calligra { - inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; - poppler = poppler_0_61; + poppler = poppler_0_61.override { + qt5Support = true; + # Must be using the same qt version as calligra itself. + qtbase = qt514.qtbase; + }; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -20006,6 +20537,8 @@ in castor = callPackage ../applications/networking/browsers/castor { }; + catfs = callPackage ../os-specific/linux/catfs { }; + catimg = callPackage ../tools/misc/catimg { }; catt = callPackage ../applications/video/catt { }; @@ -20076,7 +20609,9 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; + + clipcat = callPackage ../applications/misc/clipcat { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -20103,12 +20638,14 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; copyq = libsForQt514.callPackage ../applications/misc/copyq { }; + corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; + coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; }; @@ -20124,7 +20661,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; }; @@ -20153,8 +20690,6 @@ in python3Packages = python37Packages; }; - cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; - crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { }; @@ -20169,7 +20704,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; @@ -20300,10 +20835,12 @@ in buildServerGui = false; }; - droopy = python37Packages.callPackage ../applications/networking/droopy { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; + dsf2flac = callPackage ../applications/audio/dsf2flac { }; + dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { }; @@ -20312,8 +20849,6 @@ in denemo = callPackage ../applications/audio/denemo { }; - dvb_apps = callPackage ../applications/video/dvb-apps { }; - dvdauthor = callPackage ../applications/video/dvdauthor { }; dvdbackup = callPackage ../applications/video/dvdbackup { }; @@ -20369,6 +20904,8 @@ in elementary-planner = callPackage ../applications/office/elementary-planner { }; + elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; @@ -20489,24 +21026,26 @@ in esniper = callPackage ../applications/networking/esniper { }; - eterm = callPackage ../applications/misc/eterm { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; + go-motion = callPackage ../development/tools/go-motion { }; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + jdk = jetbrains.jdk; + }; + gspeech = callPackage ../applications/audio/gspeech { }; icesl = callPackage ../applications/misc/icesl { }; @@ -20515,6 +21054,8 @@ in keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; + keeweb = callPackage ../applications/misc/keeweb { }; + inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; @@ -20601,15 +21142,13 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - foot = callPackage ../applications/misc/foot { }; - fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -20638,34 +21177,80 @@ in gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { + boost = boost166; + gnuradio = gnuradio3_7-unwrapped; + }; - gnuradio = callPackage ../applications/radio/gnuradio { - inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; + gnuradio-unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; - fftw = fftwFloat; - qwt = qwt6_qt4; + python = python3; }; - - gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { - inherit (python2Packages) python; - extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] - ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradioMinimal = gnuradio-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + sphinx = false; + doxygen = false; + }; + }; + gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio-unwrapped; + }; + gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python2; + }; + # A build without gui components and other utilites not needed if gnuradio is + # used as a c++ library. + gnuradio3_7Minimal = gnuradio3_7-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + gr-qtgui = false; + gr-utils = false; + sphinx = false; + doxygen = false; + gr-wxgui = false; + }; + }; + gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio3_7-unwrapped; }; grandorgue = callPackage ../applications/audio/grandorgue { }; - gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; @@ -20704,7 +21289,14 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { + gnuradio = gnuradio3_7Minimal; + # Use the same gnuradio for gr-osmosdr as well + gr-osmosdr = gr-osmosdr.override { + gnuradio = gnuradio3_7Minimal; + pythonSupport = false; + }; + }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -20740,7 +21332,7 @@ in gradio = callPackage ../applications/audio/gradio { }; - puddletag = callPackage ../applications/audio/puddletag { }; + puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; @@ -20829,7 +21421,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); @@ -20856,11 +21448,6 @@ in freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { - mpi = openmpi; - opencascade-occt = opencascade-occt730; - python3Packages = python37Packages; - }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -20881,7 +21468,6 @@ in xrdp = callPackage ../applications/networking/remote/xrdp { }; freerdp = callPackage ../applications/networking/remote/freerdp { - inherit libpulseaudio; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; @@ -20899,8 +21485,6 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; - havoc = callPackage ../applications/misc/havoc { }; - vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -20941,7 +21525,7 @@ in git-quick-stats = callPackage ../development/tools/git-quick-stats {}; - git-review = callPackage ../applications/version-management/git-review { }; + git-review = python3Packages.callPackage ../applications/version-management/git-review { }; github-cli = gitAndTools.gh; @@ -20957,6 +21541,11 @@ in goffice = callPackage ../development/libraries/goffice { }; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { + inherit miniupnpc_2 swftools; + inherit (qt5) wrapQtAppsHook; + }; + jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; }) // { @@ -20977,8 +21566,8 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = python37Packages.callPackage ../applications/video/manim { - opencv = python37Packages.opencv3; + manim = python3Packages.callPackage ../applications/video/manim { + opencv = python3Packages.opencv3; }; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; @@ -21113,8 +21702,6 @@ in gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - guake = callPackage ../applications/misc/guake { }; - guardian-agent = callPackage ../tools/networking/guardian-agent { }; guitone = callPackage ../applications/version-management/guitone { @@ -21192,6 +21779,8 @@ in howl = callPackage ../applications/editors/howl { }; + hdl-dump = callPackage ../tools/misc/hdl-dump { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; @@ -21217,8 +21806,6 @@ in hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper = callPackage ../applications/misc/hyper { }; - hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; packages = self: with self; []; @@ -21243,8 +21830,14 @@ in lwm = callPackage ../applications/window-managers/lwm { }; + marker = callPackage ../applications/editors/marker { }; + musikcube = callPackage ../applications/audio/musikcube {}; + pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; + + pinboard = with python3Packages; toPythonApplication pinboard; + pinboard-notes-backup = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" haskellPackages.pinboard-notes-backup) @@ -21272,6 +21865,8 @@ in spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; + spotifyd = callPackage ../applications/audio/spotifyd { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; @@ -21295,7 +21890,7 @@ in swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; - waybar = callPackage ../applications/misc/waybar { }; + waybar = callPackage ../applications/misc/waybar {}; hikari = callPackage ../applications/window-managers/hikari { }; @@ -21305,6 +21900,8 @@ in i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; + i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; @@ -21333,6 +21930,8 @@ in inherit (xorg) xrdb; }; + multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -21355,6 +21954,8 @@ in id3v2 = callPackage ../applications/audio/id3v2 { }; + ideamaker = callPackage ../applications/misc/ideamaker { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -21364,6 +21965,7 @@ in ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { + python = python3; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; @@ -21439,6 +22041,10 @@ in img2pdf = with python3Packages; toPythonApplication img2pdf; + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + typescript = nodePackages.typescript; + }; + imgcat = callPackage ../applications/graphics/imgcat { }; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; @@ -21456,7 +22062,9 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { + gnuradio = gnuradioMinimal; + }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -21506,7 +22114,7 @@ in jackmeter = callPackage ../applications/audio/jackmeter { }; - jackmix = callPackage ../applications/audio/jackmix { }; + jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; @@ -21553,8 +22161,6 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; - kail = callPackage ../tools/networking/kail { }; kanboard = callPackage ../applications/misc/kanboard { }; @@ -21569,53 +22175,16 @@ in let mkApplications = import ../applications/kde; attrs = { - libsForQt5 = libsForQt514; + inherit libsForQt5; inherit lib fetchurl; - inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); - inherit (kdeApplications) - akonadi akregator ark - bomber bovo - dolphin dragon - elisa - ffmpegthumbs filelight - granatier gwenview - k3b - kaddressbook kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget kgpg - khelpcenter - kig kigo killbots kitinerary - kleopatra klettres klines - kmag kmail kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole kontact korganizer - kpkpass - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager kwave - marble minuet - okular - picmi - spectacle - yakuake; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; - - inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -21645,7 +22214,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -21653,18 +22222,13 @@ in kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; - kile = libsForQt514.callPackage ../applications/editors/kile { }; + kile = libsForQt5.callPackage ../applications/editors/kile { }; kino = callPackage ../applications/video/kino { inherit (gnome2) libglade; ffmpeg = ffmpeg_2; }; - kitty = callPackage ../applications/misc/kitty { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; - }; - kiwix = callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -21673,10 +22237,8 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { - inherit (kdeApplications) kidentitymanagement; - inherit (kdeFrameworks) kdewebkit; - }; + # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15 + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { }; kodestudio = callPackage ../applications/editors/kodestudio { }; @@ -21698,7 +22260,7 @@ in ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -21738,6 +22300,8 @@ in kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -21849,6 +22413,8 @@ in ledger-web = callPackage ../applications/office/ledger-web { }; + ledger2beancount = callPackage ../tools/text/ledger2beancount { }; + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; lighthouse = callPackage ../applications/misc/lighthouse { }; @@ -21877,13 +22443,13 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -21894,16 +22460,6 @@ in jftui = callPackage ../applications/video/jftui { }; - lilyterm = callPackage ../applications/misc/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - lime = callPackage ../development/libraries/lime { }; luakit = callPackage ../applications/networking/browsers/luakit { @@ -21943,7 +22499,7 @@ in mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; @@ -21994,6 +22550,8 @@ in mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mcomix3 = callPackage ../applications/graphics/mcomix3 {}; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -22014,6 +22572,7 @@ in meme = callPackage ../applications/graphics/meme { }; + # Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -22029,6 +22588,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + # Needs qtwebkit which is broken on qt5.15 merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -22058,7 +22618,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt514.callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; @@ -22132,8 +22692,7 @@ in mopidy mopidy-gmusic mopidy-iris - mopidy-local-images - mopidy-local-sqlite + mopidy-local mopidy-moped mopidy-mopify mopidy-mpd @@ -22188,6 +22747,9 @@ in ympd = callPackage ../applications/audio/ympd { }; + # a somewhat more maintained fork of ympd + mympd = callPackage ../applications/audio/mympd { }; + nload = callPackage ../applications/networking/nload { }; normalize = callPackage ../applications/audio/normalize { }; @@ -22225,8 +22787,6 @@ in mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - mrxvt = callPackage ../applications/misc/mrxvt { }; - mtpaint = callPackage ../applications/graphics/mtpaint { }; mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; @@ -22265,7 +22825,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt514.callPackage ../applications/audio/musescore { }; + libsForQt5.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -22277,6 +22837,8 @@ in pythonPackages = python3Packages; }; + n8n = callPackage ../applications/networking/n8n {}; + neap = callPackage ../applications/misc/neap { }; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; @@ -22318,11 +22880,10 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { - wireshark = wireshark.override { qt5 = qt514; }; - }; + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; + # Broken with Qt5.15 because qtwebkit is broken with it p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -22341,9 +22902,7 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul { - inherit (llvmPackages) clang libclang; - }; + pijul = callPackage ../applications/version-management/pijul { }; ping = callPackage ../applications/networking/ping { }; @@ -22384,13 +22943,11 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt514.callPackage ../applications/video/shotcut { - libmlt = mlt; - }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { stdenv = gcc8Stdenv; @@ -22470,6 +23027,7 @@ in pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; mupdf = callPackage ../applications/misc/mupdf { }; + mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; mystem = callPackage ../applications/misc/mystem { }; @@ -22555,15 +23113,15 @@ in inherit (gnome2) libglade; }; - obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - - obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; - obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { }; + + obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; - obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obs-ndi = libsForQt5.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obsidian = callPackage ../applications/misc/obsidian { }; @@ -22650,6 +23208,8 @@ in opusfile = callPackage ../applications/audio/opusfile { }; + opustags = callPackage ../applications/audio/opustags { }; + opusTools = callPackage ../applications/audio/opus-tools { }; orpie = callPackage ../applications/misc/orpie { }; @@ -22685,6 +23245,8 @@ in packet = callPackage ../development/tools/packet { }; + packet-sd = callPackage ../development/tools/packet-sd { }; + packet-cli = callPackage ../development/tools/packet-cli { }; pb_cli = callPackage ../tools/misc/pb_cli {}; @@ -22693,12 +23255,14 @@ in pbrt = callPackage ../applications/graphics/pbrt { }; + pcloud = callPackage ../applications/networking/pcloud { }; + pcsxr = callPackage ../misc/emulators/pcsxr { ffmpeg = ffmpeg_2; }; - pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { - wxGTK = pkgsi686Linux.wxGTK30; + pcsx2 = callPackage ../misc/emulators/pcsx2 { + wxGTK = wxGTK30-gtk3; }; pekwm = callPackage ../applications/window-managers/pekwm { }; @@ -22723,12 +23287,20 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; + peach = callPackage ../servers/peach { }; + + peaclock = callPackage ../applications/misc/peaclock { + stdenv = gccStdenv; + }; + peek = callPackage ../applications/video/peek { }; pflask = callPackage ../os-specific/linux/pflask {}; photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; + photoflow = callPackage ../applications/graphics/photoflow { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; @@ -22821,13 +23393,15 @@ in pistol = callPackage ../tools/misc/pistol { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; + plexamp = callPackage ../applications/audio/plexamp { }; plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -22867,7 +23441,7 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; @@ -22875,9 +23449,9 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -22924,19 +23498,8 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - qgis-unwrapped = let - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { - withGrass = false; + qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + withGrass = false; }; qgis = callPackage ../applications/gis/qgis { }; @@ -22951,12 +23514,14 @@ in garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; }; + qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidiarp = callPackage ../applications/audio/qmidiarp {}; @@ -23028,6 +23593,8 @@ in quilter = callPackage ../applications/editors/quilter { }; + quisk = python38Packages.callPackage ../applications/radio/quisk { }; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; @@ -23119,8 +23686,9 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; - retroshare06 = retroshare; + # This package is currently broken with libupnp + # But when unbroken, it should work with the stable Qt5 + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; rgp = libsForQt5.callPackage ../development/tools/rgp { }; @@ -23174,14 +23742,6 @@ in runc = callPackage ../applications/virtualization/runc {}; - rxvt = callPackage ../applications/misc/rxvt { }; - - rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { }; - - rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; - - rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; }; - uade123 = callPackage ../applications/audio/uade123 {}; udevil = callPackage ../applications/misc/udevil {}; @@ -23190,8 +23750,6 @@ in sacc = callPackage ../applications/networking/gopher/sacc { }; - sakura = callPackage ../applications/misc/sakura { }; - sameboy = callPackage ../misc/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -23246,8 +23804,6 @@ in skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; - skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; slmenu = callPackage ../applications/misc/slmenu {}; @@ -23288,10 +23844,6 @@ in ncurses = ncurses5; }; - stupidterm = callPackage ../applications/misc/stupidterm { - gtk = gtk3; - }; - styx = callPackage ../applications/misc/styx { }; tecoc = callPackage ../applications/editors/tecoc { }; @@ -23302,21 +23854,13 @@ in sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; - st = callPackage ../applications/misc/st { - conf = config.st.conf or null; - patches = config.st.patches or []; - extraLibs = config.st.extraLibs or []; - }; - - xst = callPackage ../applications/misc/st/xst.nix { }; - stag = callPackage ../applications/misc/stag { curses = ncurses; }; stella = callPackage ../misc/emulators/stella { }; - linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; + linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -23400,9 +23944,7 @@ in robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; - - skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -23418,11 +23960,11 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -23448,7 +23990,11 @@ in libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); - sourcetrail = callPackage ../development/tools/sourcetrail { }; + sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail { + jdk = jdk8; + llvmPackages = llvmPackages_10; + pythonPackages = python3Packages; + }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -23534,8 +24080,7 @@ in symlinks = callPackage ../tools/system/symlinks { }; - # this can be changed to python3 once pyside2 is updated to support the latest python version - syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; + syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; inherit (callPackages ../applications/networking/syncthing { }) syncthing @@ -23593,7 +24138,7 @@ in teams = callPackage ../applications/networking/instant-messengers/teams { }; - teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; @@ -23616,6 +24161,8 @@ in tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; + telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; @@ -23630,28 +24177,16 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; + tempo = callPackage ../servers/tracing/tempo {}; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { }; - - terminus = callPackage ../applications/misc/terminus { }; - tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - lxterminal = callPackage ../applications/misc/lxterminal { }; - - aminal = callPackage ../applications/misc/aminal { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; - }; - - termite-unwrapped = callPackage ../applications/misc/termite { }; - - termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; - termtosvg = callPackage ../tools/misc/termtosvg { }; inherit (callPackage ../applications/graphics/tesseract {}) @@ -23670,7 +24205,9 @@ in thunderbird = thunderbird-78; thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages) cargo rustc; + # Using older Rust for workaround: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 + inherit (rustPackages_1_45) cargo rustc; libpng = libpng_apng; icu = icu67; libvpx = libvpx_1_8; @@ -23693,11 +24230,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tig = gitAndTools.tig; + tickrs = callPackage ../applications/misc/tickrs { }; - tilda = callPackage ../applications/misc/tilda { - gtk = gtk3; - }; + tig = gitAndTools.tig; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; @@ -23794,9 +24329,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { - inherit (kdeApplications) akonadi-contacts; - }; + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; @@ -23866,16 +24399,12 @@ in vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable; - vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; verbiste = callPackage ../applications/misc/verbiste { inherit (gnome2) libgnomeui; }; - vuescan = callPackage ../applications/graphics/vuescan { }; - vim = callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -23895,6 +24424,8 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; + vimv = callPackage ../tools/misc/vimv/default.nix { }; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { @@ -23903,8 +24434,11 @@ in vimpc = callPackage ../applications/audio/vimpc { }; - wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; - + # this is a lower-level alternative to wrapNeovim conceived to handle + # more usecases when wrapping neovim. The interface is being actively worked on + # so expect breakage. use wrapNeovim instead if you want a stable alternative + wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; + wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { lua = # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 @@ -23912,6 +24446,7 @@ in luajit; }; + neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovim = wrapNeovim neovim-unwrapped { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; @@ -23942,7 +24477,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -24023,7 +24558,7 @@ in onlyLibVLC = true; }; - vmpk = callPackage ../applications/audio/vmpk { }; + vmpk = libsForQt5.callPackage ../applications/audio/vmpk { }; vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; @@ -24104,7 +24639,7 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; @@ -24144,6 +24679,7 @@ in windowlab = callPackage ../applications/window-managers/windowlab { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; + dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { }; wily = callPackage ../applications/editors/wily { }; @@ -24153,16 +24689,8 @@ in write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; - alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; - wllvm = callPackage ../development/tools/wllvm { }; - wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; - - wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; - - wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; - wmname = callPackage ../applications/misc/wmname { }; wmctrl = callPackage ../tools/X11/wmctrl { }; @@ -24171,7 +24699,9 @@ in wofi = callPackage ../applications/misc/wofi { }; - wordnet = callPackage ../applications/misc/wordnet { }; + wordnet = callPackage ../applications/misc/wordnet { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; wordgrinder = callPackage ../applications/office/wordgrinder { }; @@ -24359,18 +24889,14 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + kodiPlain = callPackage ../applications/video/kodi { }; kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiGBM = callPackage ../applications/video/kodi { useGbm = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -24435,9 +24961,6 @@ in xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_8 = xenPackages.xen_4_8-vanilla; - xen_4_8-slim = xenPackages.xen_4_8-slim; - xen_4_8-light = xenPackages.xen_4_8-light; xen_4_10 = xenPackages.xen_4_10-vanilla; xen_4_10-slim = xenPackages.xen_4_10-slim; xen_4_10-light = xenPackages.xen_4_10-light; @@ -24498,6 +25021,8 @@ in xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xlife = callPackage ../applications/graphics/xlife { }; + xmobar = haskellPackages.xmobar; xmonad-log = callPackage ../tools/misc/xmonad-log { }; @@ -24548,19 +25073,6 @@ in xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - xterm = callPackage ../applications/misc/xterm { }; - - mlterm = callPackage ../applications/misc/mlterm { - libssh2 = null; - openssl = null; - }; - - roxterm = callPackage ../applications/misc/roxterm { }; - - termonad-with-packages = callPackage ../applications/misc/termonad { - inherit (haskellPackages) ghcWithPackages; - }; - xtrace = callPackage ../tools/X11/xtrace { }; xtruss = callPackage ../tools/X11/xtruss { }; @@ -24622,8 +25134,6 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt514.callPackage ../applications/office/zanshin { - inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; - inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; }; @@ -24664,9 +25174,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { }; + zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; - zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -24709,12 +25219,6 @@ in bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ../applications/blockchains/btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; @@ -24736,7 +25240,6 @@ in exodus = callPackage ../applications/blockchains/exodus { }; - freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; @@ -24782,6 +25285,8 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; + turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; @@ -24807,6 +25312,8 @@ in ### GAMES + _1oom = callPackage ../games/1oom { }; + _2048-in-terminal = callPackage ../games/2048-in-terminal { }; _20kly = callPackage ../games/20kly { }; @@ -24848,9 +25355,7 @@ in arena = callPackage ../games/arena {}; - arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { - stdenv = gcc6Stdenv; - }; + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; asc = callPackage ../games/asc { lua = lua5_1; @@ -24914,7 +25419,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt514.callPackage ../games/chiaki { }; + chiaki = libsForQt5.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -24966,12 +25471,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam { - inherit (plasma5) oxygen; - inherit (kdeApplications) akonadi-contacts; - inherit (kdeFrameworks) kcalendarcore; - opencv3 = opencv3WithoutCuda; - }; + digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; @@ -25167,6 +25667,10 @@ in instead-launcher = callPackage ../games/instead-launcher { }; + iortcw = callPackage ../games/iortcw { }; + # used as base package for iortcw forks + iortcw_sp = callPackage ../games/iortcw/sp.nix { }; + ivan = callPackage ../games/ivan { }; ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; @@ -25318,6 +25822,12 @@ in openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; + portmod = callPackage ../games/portmod { }; + + tr-patcher = callPackage ../games/tr-patcher { }; + + tes3cmd = callPackage ../games/tes3cmd { }; + openraPackages = import ../games/openra pkgs; openra = openraPackages.engines.release; @@ -25353,7 +25863,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt514.callPackage ../games/pentobi { }; + pentobi = libsForQt5.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; @@ -25438,11 +25948,11 @@ in rrootage = callPackage ../games/rrootage { }; - saga = libsForQt514.callPackage ../applications/gis/saga { + saga = libsForQt5.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; + samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -25478,7 +25988,7 @@ in sfrotz = callPackage ../games/sfrotz { }; - sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; + sgtpuzzles = callPackage ../games/sgt-puzzles { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; @@ -25600,6 +26110,8 @@ in tremulous = callPackage ../games/tremulous { }; + tts = callPackage ../tools/audio/tts { }; + tuxpaint = callPackage ../games/tuxpaint { }; tuxtype = callPackage ../games/tuxtype { }; @@ -25797,13 +26309,13 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; - battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; @@ -25830,6 +26342,8 @@ in mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; }; + gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; + gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -25841,6 +26355,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { + # TODO: Update these to qt515 at some point. When doing it, please remove + # the choice of libsForQt5*.sddm in sddm's module. qt5 = qt514; libsForQt5 = libsForQt514; inherit pkgs; @@ -25879,7 +26395,7 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - libsForQt5 = libsForQt514; + inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; @@ -25887,25 +26403,6 @@ in in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); - inherit (kdeFrameworks) kded kinit frameworkintegration; - - inherit (plasma5) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover - kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 - kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard - kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration - plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde; - - inherit (plasma5.thirdParty) - plasma-applet-caffeine-plus - kwin-dynamic-workspaces - kwin-tiling - krohnkite; - - ### SCIENCE - ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { @@ -25944,6 +26441,10 @@ in ### SCIENCE/GEOMETRY + antiprism = callPackage ../applications/science/geometry/antiprism { }; + + gama = callPackage ../applications/science/geometry/gama { }; + drgeo = callPackage ../applications/science/geometry/drgeo { inherit (gnome2) libglade; guile = guile_1_8; @@ -25960,7 +26461,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -26102,8 +26605,6 @@ in platypus = callPackage ../applications/science/biology/platypus { }; - plink = callPackage ../applications/science/biology/plink { }; - plink-ng = callPackage ../applications/science/biology/plink-ng { }; prodigal = callPackage ../applications/science/biology/prodigal { }; @@ -26357,7 +26858,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING @@ -26472,6 +26973,8 @@ in else smlnj; }; + key = callPackage ../applications/science/logic/key { }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; @@ -26586,7 +27089,7 @@ in adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; + appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. @@ -26595,7 +27098,7 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; @@ -26638,8 +27141,6 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; - qucs = callPackage ../applications/science/electronics/qucs { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; @@ -26668,7 +27169,7 @@ in stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -26754,6 +27255,8 @@ in inherit (pkgs.gnome2) gtkglext; }; + convertall = qt5.callPackage ../applications/science/misc/convertall { }; + cytoscape = callPackage ../applications/science/misc/cytoscape { jre = openjdk11; }; @@ -26780,6 +27283,8 @@ in netlogo = callPackage ../applications/science/misc/netlogo { }; + nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { }; + ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; root = callPackage ../applications/science/misc/root { @@ -26913,7 +27418,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -27215,6 +27720,8 @@ in mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; + inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -27367,6 +27874,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + dnadd = callPackage ../tools/nix/dnadd { }; + nix-doc = callPackage ../tools/package-management/nix-doc { }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; @@ -27453,7 +27962,11 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); + + dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; disnixos = callPackage ../tools/package-management/disnix/disnixos { }; @@ -27494,6 +28007,8 @@ in opkg-utils = callPackage ../tools/package-management/opkg-utils { }; + OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin = callPackage ../applications/misc/pgadmin { @@ -27708,7 +28223,9 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt514.callPackage ../applications/misc/tellico { }; + tagref = callPackage ../tools/misc/tagref { }; + + tellico = libsForQt5.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -27717,6 +28234,7 @@ in terraform_0_11-full terraform_0_12 terraform_0_13 + terraform_0_14 terraform_plugins_test ; @@ -27759,7 +28277,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt514.callPackage ../applications/office/vnote { }; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -27841,7 +28359,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; @@ -27984,6 +28502,8 @@ in yadm = callPackage ../applications/version-management/yadm { }; + yamale = with python3Packages; toPythonApplication yamale; + yamdi = callPackage ../tools/video/yamdi { }; yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; @@ -28072,7 +28592,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -28082,8 +28602,6 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - iterm2 = callPackage ../applications/misc/iterm2 {}; - sccache = callPackage ../development/tools/misc/sccache { }; sequeler = callPackage ../applications/misc/sequeler { }; @@ -28147,8 +28665,6 @@ in houdini = callPackage ../applications/misc/houdini {}; - xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; - openfst = callPackage ../development/libraries/openfst {}; opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; @@ -28207,7 +28723,7 @@ in undervolt = callPackage ../os-specific/linux/undervolt { }; alibuild = callPackage ../development/tools/build-managers/alibuild { - python = python27; + python = python3; }; tsung = callPackage ../applications/networking/tsung {}; @@ -28315,4 +28831,6 @@ in cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {}; psftools = callPackage ../os-specific/linux/psftools {}; + + lc3tools = callPackage ../development/tools/lc3tools {}; } diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/beam-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/beam-packages.nix index 139749e7d39b..14399d7ac954 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/beam-packages.nix @@ -96,8 +96,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use - # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + # `beam.packages.erlangR23.elixir`. + inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/coq-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/coq-packages.nix index fe6cd81f9ea1..605db554363b 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/coq-packages.nix @@ -119,7 +119,7 @@ in rec { version = "8.11.2"; }; coq_8_12 = callPackage ../applications/science/logic/coq { - version = "8.12.0"; + version = "8.12.1"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/darwin-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/darwin-packages.nix index affb4ae92c19..6fafe09438cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -14,7 +14,9 @@ in extraBuildInputs = []; }; - apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; + apple_sdk = callPackage ../os-specific/darwin/apple-sdk { + inherit (darwin) darwin-stubs print-reexports; + }; binutils-unwrapped = callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; @@ -41,6 +43,10 @@ in DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; + darwin-stubs = callPackage ../os-specific/darwin/darwin-stubs { }; + + print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { }; + maloader = callPackage ../os-specific/darwin/maloader { inherit (darwin) opencflite; }; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/dhall-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/dhall-packages.nix index 9d4801e9dc5c..c1c2c5f0e3bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/dhall-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/dhall-packages.nix @@ -8,16 +8,6 @@ let let callPackage = newScope self; - prefer = version: path: - let - packages = callPackage path { }; - - in - packages."${version}".overrideAttrs (_: { - passthru = packages; - } - ); - buildDhallPackage = callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; @@ -34,14 +24,16 @@ let buildDhallDirectoryPackage ; + lib = import ../development/dhall-modules/lib.nix { inherit lib; }; + dhall-kubernetes = - prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix; + callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; dhall-packages = - prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix; + callPackage ../development/dhall-modules/dhall-packages.nix { }; Prelude = - prefer "13.0.0" ../development/dhall-modules/Prelude.nix; + callPackage ../development/dhall-modules/Prelude.nix { }; }; in diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/dotnet-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/dotnet-packages.nix index f14ae3133b8b..9c659e655e93 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -327,14 +327,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Boogie = buildDotnetPackage rec { baseName = "Boogie"; - version = "2019-06-20"; - name = "${baseName}-unstable-${version}"; + version = "2.4.1"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; - rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e"; - sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2"; + rev = "v${version}"; + sha256 = "13f6ifkh6gpy4bvx5zhgwmk3wd5rfxzl9wxwfhcj1c90fdrhwh1b"; }; # emulate `nuget restore Source/Boogie.sln` @@ -379,7 +378,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Dafny = buildDotnetPackage rec { + Dafny = let + z3 = pkgs.z3.overrideAttrs (oldAttrs: rec { + version = "4.8.4"; + name = "z3-${version}"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "z3-${version}"; + sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"; + }; + }); + self' = pkgs.dotnetPackages.override ({ + pkgs = pkgs // { inherit z3; }; + }); + Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie; + in buildDotnetPackage rec { baseName = "Dafny"; version = "2.3.0"; @@ -396,7 +411,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { ''; preBuild = '' - ln -s ${pkgs.z3} Binaries/z3 + ln -s ${z3} Binaries/z3 ''; buildInputs = [ Boogie ]; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/haskell-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/haskell-packages.nix index 693f8fe8276b..2d25ea149a92 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ buildPackages, pkgs, newScope }: +{ buildPackages, pkgs, newScope, stdenv }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -6,6 +6,7 @@ let "ghc822Binary" "ghc865Binary" "ghc8102Binary" + "ghc8102BinaryMinimal" "ghcjs" "ghcjs86" "integer-simple" @@ -54,6 +55,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; + ghc8102BinaryMinimal = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; + minimal = true; + }; + ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -73,7 +79,11 @@ in { llvmPackages = pkgs.llvmPackages_7; }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; @@ -85,7 +95,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; @@ -156,6 +170,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc8102BinaryMinimal = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102BinaryMinimal; + ghc = bh.compiler.ghc8102BinaryMinimal; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/java-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/java-packages.nix index 73ed6bf9162c..7f1bb6e89a7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/java-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/java-packages.nix @@ -89,6 +89,9 @@ in { mavenCommonArtifactFilters_1_3 mavenCommonArtifactFilters_1_4; + inherit (callPackage ../development/java-modules/maven/compiler-plugin.nix { inherit fetchMaven; }) + mavenCompiler_3_2; + inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; }) mavenCore_2_0_1 mavenCore_2_0_6 @@ -243,13 +246,16 @@ in { plexusClassworlds_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; }) - plexusCompilerApi_2_2; + plexusCompilerApi_2_2 + plexusCompilerApi_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-javac.nix { inherit fetchMaven; }) - plexusCompilerJavac_2_2; + plexusCompilerJavac_2_2 + plexusCompilerJavac_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-manager.nix { inherit fetchMaven; }) - plexusCompilerManager_2_2; + plexusCompilerManager_2_2 + plexusCompilerManager_2_4; inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; }) plexusComponentAnnotations_1_5_5; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix index 6af78e8f30d4..6fe157d2ea2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -70,6 +70,8 @@ let bos = callPackage ../development/ocaml-modules/bos { }; + ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; + camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlp4 = @@ -491,7 +493,9 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt = callPackage ../development/ocaml-modules/lwt { }; + lwt = callPackage ../development/ocaml-modules/lwt { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_lwt = lwt; @@ -529,8 +533,12 @@ let metrics = callPackage ../development/ocaml-modules/metrics { }; + metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; + metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { }; + metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { }; + metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; }; @@ -539,10 +547,20 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + mirage = callPackage ../development/ocaml-modules/mirage { }; + + mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; + + mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; + + mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; + mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; + mirage-console = callPackage ../development/ocaml-modules/mirage-console { }; + mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; @@ -559,6 +577,16 @@ let mirage-flow-unix = callPackage ../development/ocaml-modules/mirage-flow/unix.nix { }; + mirage-fs = callPackage ../development/ocaml-modules/mirage-fs { }; + + mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { }; + + mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { }; + + mirage-net = callPackage ../development/ocaml-modules/mirage-net { }; + + mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { }; + mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { }; mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; @@ -571,6 +599,10 @@ let mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { }; + + mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { }; + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; @@ -581,8 +613,6 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; - mstruct = callPackage ../development/ocaml-modules/mstruct { }; - mtime = callPackage ../development/ocaml-modules/mtime { }; mustache = callPackage ../development/ocaml-modules/mustache { }; @@ -636,11 +666,19 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; + ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; + + ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; + + ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; + + ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; @@ -702,6 +740,8 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; + odate = callPackage ../development/ocaml-modules/odate { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; omd = callPackage ../development/ocaml-modules/omd { }; @@ -746,6 +786,8 @@ let ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -784,7 +826,9 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -846,9 +890,7 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { - ppxlib = ppxlib.override { legacy = true; }; - }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -906,6 +948,8 @@ let rpclib = callPackage ../development/ocaml-modules/rpclib { }; + rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; @@ -1019,7 +1063,7 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes dune-configurator janePackage num octavius ppxlib re; + inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith; inherit (pkgs) openssl; } else if lib.versionOlder "4.07" ocaml.version @@ -1048,26 +1092,11 @@ let buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; - ppx_core = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.ppx_core - else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {}; - ppx_optcomp = if lib.versionOlder "4.03" ocaml.version then janeStreet.ppx_optcomp else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; - ppx_driver = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.ppx_driver - else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; - - ppx_type_conv = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.ppx_type_conv - else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; - ppx_compare = if lib.versionOlder "4.03" ocaml.version then janeStreet.ppx_compare @@ -1113,11 +1142,6 @@ let then janeStreet.ppx_enumerate else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; - ppx_fail = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.ppx_fail - else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; - ppx_fields_conv = if lib.versionOlder "4.03" ocaml.version then janeStreet.ppx_fields_conv @@ -1249,6 +1273,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { }); + ocamlPackages_latest = ocamlPackages_4_11; ocamlPackages = ocamlPackages_4_10; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix index 6f6c45a27db0..2c789d4f8bec 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix @@ -332,6 +332,20 @@ let }; }; + AnyEventAIO = buildPerlPackage { + pname ="AnyEvent-AIO"; + version = "1.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-1.1.tar.gz"; + sha256 = "0svh0mlp17g0ypq8bgs3h3axg8v7h0z45hryacgn6q8mcj65n43b"; + }; + propagatedBuildInputs = [ AnyEvent IOAIO ]; + meta = { + description = "Truly asynchronous file and directory I/O"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEventCacheDNS = buildPerlModule { pname = "AnyEvent-CacheDNS"; version = "0.08"; @@ -511,10 +525,10 @@ let buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; preCheck = "rm t/30cluster.t"; # do not run failing tests postInstall = '' - mkdir -p $out/etc/bash_completion.d + mkdir -p $out/share/bash-completion/completions mv $out/bin/clusterssh_bash_completion.dist \ - $out/etc/bash_completion.d/clusterssh_bash_completion - substituteInPlace $out/etc/bash_completion.d/clusterssh_bash_completion \ + $out/share/bash-completion/completions/clusterssh_bash_completion + substituteInPlace $out/share/bash-completion/completions/clusterssh_bash_completion \ --replace '/bin/true' '${pkgs.coreutils}/bin/true' \ --replace 'grep' '${pkgs.gnugrep}/bin/grep' \ --replace 'sed' '${pkgs.gnused}/bin/sed' @@ -582,6 +596,27 @@ let }; }; + Appcpm = buildPerlModule { + pname = "App-cpm"; + version = "0.996"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz"; + sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/cpm + ''; + meta = { + homepage = "https://github.com/skaji/cpm"; + description = "A fast CPAN module installer"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + Applify = buildPerlPackage { pname = "Applify"; version = "0.21"; @@ -847,7 +882,7 @@ let sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9"; }; meta = { - homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master"; + homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master"; description = "Object-oriented interface to FITS HDUs"; license = stdenv.lib.licenses.free; }; @@ -1300,7 +1335,7 @@ let buildInputs = [ FileSlurp ]; propagatedBuildInputs = [ ClassLoad DirSelf FileShareDir ModulePluggable MooseXGetopt namespaceclean ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training"; + homepage = "https://metacpan.org/release/Bot-Training"; description = "Plain text training material for bots like Hailo and AI::MegaHAL"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1316,7 +1351,7 @@ let buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ BotTraining ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training-MegaHAL"; + homepage = "https://metacpan.org/release/Bot-Training-MegaHAL"; description = "Provide megahal.trn via Bot::Training"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1332,7 +1367,7 @@ let buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ BotTraining ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training-StarCraft"; + homepage = "https://metacpan.org/release/Bot-Training-StarCraft"; description = "Provide starcraft.trn via Bot::Training"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1449,6 +1484,20 @@ let }; }; + BytesRandomSecureTiny = buildPerlPackage { + pname = "Bytes-Random-Secure-Tiny"; + version = "1.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-Tiny-1.011.tar.gz"; + sha256 = "03d967b5f82846909137d5ab9984ac570ac10a4401e0c602f3d2208c465ac982"; + }; + meta = { + description = "A tiny Perl extension to generate cryptographically-secure random bytes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CacheCache = buildPerlPackage { pname = "Cache-Cache"; version = "1.08"; @@ -1563,6 +1612,20 @@ let propagatedBuildInputs = [ Cairo Glib ]; }; + CallContext = buildPerlPackage { + pname = "Call-Context"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Call-Context-0.03.tar.gz"; + sha256 = "0ee6bf46bc72755adb7a6b08e79d12e207de5f7809707b3c353b58cb2f0b5a26"; + }; + meta = { + description = "Sanity-check calling context"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + cam_pdf = buildPerlModule { pname = "CAM-PDF"; version = "1.60"; @@ -1758,6 +1821,21 @@ let buildInputs = [ TestWarn ]; }; + CatalystAuthenticationStoreLDAP = buildPerlPackage { + pname = "Catalyst-Authentication-Store-LDAP"; + version = "1.016"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; + sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8"; + }; + propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ]; + buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ]; + meta = { + description= "Authentication from an LDAP Directory"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + CatalystComponentInstancePerContext = buildPerlPackage { pname = "Catalyst-Component-InstancePerContext"; version = "0.001001"; @@ -3105,6 +3183,23 @@ let }; }; + CommandRunner = buildPerlModule { + pname = "Command-Runner"; + version = "0.103"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz"; + sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ]; + meta = { + homepage = "https://github.com/skaji/Command-Runner"; + description = "Run external commands and Perl code refs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + commonsense = buildPerlPackage { pname = "common-sense"; version = "3.75"; @@ -3932,6 +4027,21 @@ let perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; + CryptFormat = buildPerlPackage { + pname = "Crypt-Format"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz"; + sha256 = "89ddc010a6c91d5be7a1874a528eed6eda39f2c401c18e63d80ddfbf7127e2dd"; + }; + buildInputs = [ TestException TestFailWarnings ]; + meta = { + description = "Conversion utilities for encryption applications"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptIDEA = buildPerlPackage { pname = "Crypt-IDEA"; version = "1.10"; @@ -4297,6 +4407,23 @@ let }; }; + CryptPerl = buildPerlPackage { + pname = "Crypt-Perl"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; + sha256 = "0e1cb223df0041f6d9b010f11e6f97a97ab55a118a273938eb4fe85d403f1b11"; + }; + checkInputs = [ pkgs.openssl MathBigIntGMP ]; + buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; + meta = { + description = "Cryptography in pure Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptEd25519 = buildPerlPackage { pname = "Crypt-Ed25519"; version = "1.04"; @@ -8288,10 +8415,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz"; - sha256 = "1h5609wd1m774h8brgm5vinz6pfmdszp2ms6ybxlyhs0p5msp36f"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.46.tar.gz"; + sha256 = "0zx4cabzz5zyzvyvc7mvl0cc7zkslp0jnxsv41yii76dal8blcbq"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { @@ -8300,12 +8427,12 @@ let }; }; - FutureAsyncAwait = buildPerlModule { + FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.44"; + version = "0.47"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.44.tar.gz"; - sha256 = "131825164614ede6a49df4566e730c4cc22e3129796039b9360fa551701413fe"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; + sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -9926,6 +10053,25 @@ let }; }; + IOAIO = buildPerlPackage { + pname = "IO-AIO"; + version = "4.72"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.72.tar.gz"; + sha256 = "17vfbqagpab8lsbf5nmp2frvxw7hvsyy2i87dpid8djzr615wnvf"; + }; + buildInputs = [ CanaryStability ]; + propagatedBuildInputs = [ commonsense ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/treescan + ''; + meta = { + description = "Asynchronous/Advanced Input/Output"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOAll = buildPerlPackage { pname = "IO-All"; version = "0.87"; @@ -9956,6 +10102,22 @@ let }; }; + IOAsyncSSL = buildPerlModule { + pname = "IO-Async-SSL"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz"; + sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21"; + }; + buildInputs = [ TestIdentity ]; + propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; + meta = { + description = "Use SSL/TLS with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + IOCapture = buildPerlPackage { pname = "IO-Capture"; version = "0.05"; @@ -10601,21 +10763,25 @@ let }; }; - LaTeXML = buildPerlPackage { + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; - sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; + url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; + sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; - propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - doCheck = false; # epub test fails - postInstall = '' - shortenPerlShebang $out/bin/latexml - shortenPerlShebang $out/bin/latexmlc - shortenPerlShebang $out/bin/latexmlfind - shortenPerlShebang $out/bin/latexmlmath - shortenPerlShebang $out/bin/latexmlpost + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + preCheck = '' + rm t/931_epub.t # epub test fails + ''; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + # shebangs need to be patched before executables are copied to $out + preBuild = '' + patchShebangs bin/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in bin/*; do + shortenPerlShebang "$file" + done ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; @@ -10968,6 +11134,7 @@ let meta = { description = "Perl extension to detect on which Linux distribution we are running"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -10984,6 +11151,7 @@ let meta = { description = "Linux specific special filehandles"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -10995,6 +11163,12 @@ let sha256 = "0crlxmaa4lsgdjm5p9ib8rdxiy70qj1s68za3q3v57v8ll6s4hfx"; }; propagatedBuildInputs = [ commonsense ]; + + meta = { + description = "Scalable directory/file change notification for Perl on Linux"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; + }; }; ListAllUtils = buildPerlPackage { @@ -12120,6 +12294,22 @@ let }; }; + MathProvablePrime = buildPerlPackage { + pname = "Math-ProvablePrime"; + version = "0.045"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz"; + sha256 = "32dce42861ce065a875a91ec14c6557e89af07df10cc450d1c4ded13dcbe3dd5"; + }; + buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ]; + meta = { + description = "Generate a provable prime number, in pure Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MathRandom = buildPerlPackage { pname = "Math-Random"; version = "0.72"; @@ -13122,10 +13312,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.63"; + version = "8.67"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.63.tar.gz"; - sha256 = "1nw500wi6kdyawc2aq37lnx6zfkpby3sczflh5pjz623i8nw4b66"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz"; + sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v"; }; meta = { homepage = "https://mojolicious.org"; @@ -14546,6 +14736,27 @@ let }; }; + NetAsyncHTTP = buildPerlModule { + pname = "Net-Async-HTTP"; + version = "0.47"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz"; + sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f"; + }; + buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; + propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + # network tests fail on Darwin/sandbox, so disable these + rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t + rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t + ''; + meta = { + description = "Use HTTP with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + NetAsyncPing = buildPerlPackage { pname = "Net-Async-Ping"; version = "0.004001"; @@ -14562,6 +14773,25 @@ let }; }; + NetAsyncWebSocket = buildPerlModule { + pname = "Net-Async-WebSocket"; + version = "0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-WebSocket-0.13.tar.gz"; + sha256 = "000nw7gnj7ks55nib3fiikxx9bfmbla6fimxrbn2z2n7sd187b0d"; + }; + propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ]; + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + # network tests fail on Darwin/sandbox, so disable these + rm -f t/02server.t t/03cross.t + ''; + meta = { + description = "Use WebSockets with IO::Async"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + NetAMQP = buildPerlModule { pname = "Net-AMQP"; version = "0.06"; @@ -14846,6 +15076,47 @@ let }; }; + NetLDAPServer = buildPerlPackage { + pname = "Net-LDAP-Server"; + version = "0.43"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz"; + sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x"; + }; + propagatedBuildInputs = [ NetLDAP ConvertASN1 ]; + meta = { + description = "LDAP server side protocol handling"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + + NetLDAPSID = buildPerlPackage { + pname = "Net-LDAP-SID"; + version = "0.0001"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz"; + sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8"; + }; + meta = { + description= "Active Directory Security Identifier manipulation"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + + NetLDAPServerTest = buildPerlPackage { + pname = "Net-LDAP-Server-Test"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz"; + sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i"; + }; + propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ]; + meta = { + description= "test Net::LDAP code"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + NetNetmask = buildPerlPackage { pname = "Net-Netmask"; version = "1.9104"; @@ -15553,6 +15824,22 @@ let propagatedBuildInputs = [ Moo ]; }; + ParallelPipes = buildPerlModule { + pname = "Parallel-Pipes"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz"; + sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + homepage = "https://github.com/skaji/Parallel-Pipes"; + description = "Parallel processing using pipe(2) for communication and synchronization"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + ParallelPrefork = buildPerlPackage { pname = "Parallel-Prefork"; version = "0.18"; @@ -16163,10 +16450,10 @@ let PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20200110"; + version = "20201001"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20200110.tar.gz"; - sha256 = "c8c13ab88f42409d419993d488b8dc7cf4a02d5034d3037ca859fb93b18e8086"; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-${version}.tar.gz"; + sha256 = "04lsvjhv9h11scq9craky4gzpf2bw2q68wg6p0ppk79302rynwq8"; }; meta = { description = "Indent and reformat perl scripts"; @@ -18630,6 +18917,22 @@ let doCheck = false; # FIXME: 2/293 test failures }; + SymbolGet = buildPerlPackage { + pname = "Symbol-Get"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Symbol-Get-0.10.tar.gz"; + sha256 = "0ee5568c5ae3573ca874e09e4d0524466cfc1ad9a2c24d0bc91d4c7b06f21d9c"; + }; + buildInputs = [ TestDeep TestException ]; + propagatedBuildInputs = [ CallContext ]; + meta = { + description = "Read Perl's symbol table programmatically"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + SymbolGlobalName = buildPerlPackage { pname = "Symbol-Global-Name"; version = "0.05"; @@ -19125,6 +19428,22 @@ let }; }; + TermReadPassword = buildPerlPackage rec { + pname = "Term-ReadPassword"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PH/PHOENIX/${pname}-${version}.tar.gz"; + sha256 = "08s3zdqbr01qf4h8ryc900qq1cjcdlyy2dq0gppzzy9mbcs6da71"; + }; + + outputs = [ "out" ]; + + meta = { + description = "This module lets you ask the user for a password in the traditional way, from the keyboard, without echoing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShell = buildPerlModule { pname = "Term-Shell"; version = "0.11"; @@ -20144,12 +20463,12 @@ let propagatedBuildInputs = [ MCE PerlCritic ]; }; - TestPerlTidy = buildPerlModule { + TestPerlTidy = buildPerlModule rec { pname = "Test-PerlTidy"; - version = "20200412"; + version = "20200930"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz"; - sha256 = "905240447edb1930192000db659556cbf5ad5710f4376bb0a5abcd8716a4592c"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-${version}.tar.gz"; + sha256 = "1djpfi57s1j6mqb0ii2ca1sj3ym7jjab018inp6vdmsyfjcnhvwz"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; meta = { @@ -20911,10 +21230,10 @@ let TextFormat = buildPerlModule { pname = "Text-Format"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; - sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.62.tar.gz"; + sha256 = "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx"; }; meta = { homepage = "https://metacpan.org/release/Text-Format"; @@ -21091,6 +21410,21 @@ let }; }; + TextMultiMarkdown = buildPerlPackage { + pname = "Text-MultiMarkdown"; + version = "1.000035"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-MultiMarkdown-1.000035.tar.gz"; + sha256 = "2467dd13751dc2979d7c880b24e762952130fdf42a1ed3ee04fdf72d4b52646a"; + }; + buildInputs = [ ListMoreUtils TestException ]; + propagatedBuildInputs = [ HTMLParser TextMarkdown ]; + meta = { + description = "Convert MultiMarkdown syntax to (X)HTML"; + license = stdenv.lib.licenses.bsd3; + }; + }; + TestNumberDelta = buildPerlPackage { pname = "Test-Number-Delta"; version = "1.06"; @@ -22341,6 +22675,21 @@ let }; }; + WWWTwilioAPI = buildPerlPackage { + pname = "WWW-Twilio-API"; + version = "0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SC/SCOTTW/WWW-Twilio-API-0.21.tar.gz"; + sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734"; + }; + prePatch = "rm examples.pl"; + propagatedBuildInputs = [ LWPProtocolhttps ]; + meta = { + description = "Accessing Twilio's REST API with Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + WWWYoutubeViewer = callPackage ../development/perl-modules/WWW-YoutubeViewer { }; Want = buildPerlPackage { diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix index d4518b60d24d..d5bebb9bd847 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix @@ -3,7 +3,7 @@ , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit -, readline, rsync, fetchpatch +, readline, rsync, fetchpatch, valgrind }: let @@ -331,7 +331,7 @@ in sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; }); } - { name = "json"; } + { name = "json"; enable = lib.versionOlder php.version "8.0"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; configureFlags = [ @@ -341,7 +341,9 @@ in "LDAP_LIBDIR=${openldap.out}/lib" ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; doCheck = false; } - { name = "mbstring"; buildInputs = [ oniguruma ]; doCheck = false; } + { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + pcre' + ]; doCheck = false; } { name = "mysqli"; internalDeps = [ php.extensions.mysqlnd ]; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; @@ -388,11 +390,13 @@ in # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ]; + buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + valgrind.dev + ]; # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is # included from ZendAccelerator.h, but ZendAccelerator.h is # included after the ifdef... - patches = lib.optional (lib.versionOlder php.version "7.4") [ + patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -456,7 +460,7 @@ in doCheck = false; } # recode (7.3, 7.2) - { name = "session"; } + { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); } { name = "shmop"; } { name = "simplexml"; buildInputs = [ libxml2 pcre' ]; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix index b3d1c5cfe856..c6770420c3ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix @@ -9,19 +9,16 @@ { pkgs , stdenv , python -, overrides ? (self: super: {}) }: with pkgs.lib; -let - packages = ( self: +self: let + inherit (self) callPackage; inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; - callPackage = pkgs.newScope self; - namePrefix = python.libPrefix + "-"; bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; @@ -102,7 +99,7 @@ in { inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; - inherit fetchPypi callPackage; + inherit fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; @@ -150,6 +147,8 @@ in { absl-py = callPackage ../development/python-modules/absl-py { }; + accuweather = callPackage ../development/python-modules/accuweather { }; + accupy = callPackage ../development/python-modules/accupy { }; acebinf = callPackage ../development/python-modules/acebinf { }; @@ -200,6 +199,8 @@ in { aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + aioextensions = callPackage ../development/python-modules/aioextensions { }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; aioftp = callPackage ../development/python-modules/aioftp { }; @@ -320,6 +321,8 @@ in { antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + anyio = callPackage ../development/python-modules/anyio { }; + anyjson = callPackage ../development/python-modules/anyjson { }; anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; @@ -352,6 +355,8 @@ in { apsw = callPackage ../development/python-modules/apsw { }; + arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + area = callPackage ../development/python-modules/area { }; arelle = callPackage ../development/python-modules/arelle { gui = true; }; @@ -424,10 +429,14 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; + asyncpg = callPackage ../development/python-modules/asyncpg { }; asyncssh = callPackage ../development/python-modules/asyncssh { }; + async_stagger = callPackage ../development/python-modules/async_stagger { }; + asynctest = callPackage ../development/python-modules/asynctest { }; async-timeout = callPackage ../development/python-modules/async_timeout { }; @@ -452,6 +461,8 @@ in { attrs = callPackage ../development/python-modules/attrs { }; + aubio = callPackage ../development/python-modules/aubio { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; audioread = callPackage ../development/python-modules/audioread { }; @@ -727,6 +738,8 @@ in { azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; + azure-synapse-artifacts = callPackage ../development/python-modules/azure-synapse-artifacts { }; + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; b2sdk = callPackage ../development/python-modules/b2sdk { }; @@ -770,6 +783,8 @@ in { bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_07.bap; }; + baron = callPackage ../development/python-modules/baron { }; + base58 = callPackage ../development/python-modules/base58 { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -817,6 +832,8 @@ in { bespon = callPackage ../development/python-modules/bespon { }; + betacode = callPackage ../development/python-modules/betacode { }; + betamax = callPackage ../development/python-modules/betamax { }; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -893,12 +910,14 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 block-io = callPackage ../development/python-modules/block-io { }; bluepy = callPackage ../development/python-modules/bluepy { }; + bme680 = callPackage ../development/python-modules/bme680 { }; + bokeh = callPackage ../development/python-modules/bokeh { }; boltons = callPackage ../development/python-modules/boltons { }; @@ -1186,6 +1205,8 @@ in { click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + click-help-colors = callPackage ../development/python-modules/click-help-colors { }; + click-log = callPackage ../development/python-modules/click-log { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; @@ -1194,6 +1215,10 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + cliff = callPackage ../development/python-modules/cliff { }; clifford = callPackage ../development/python-modules/clifford { }; @@ -1206,6 +1231,8 @@ in { clint = callPackage ../development/python-modules/clint { }; + clintermission = callPackage ../development/python-modules/clintermission { }; + clize = callPackage ../development/python-modules/clize { }; clldutils = callPackage ../development/python-modules/clldutils { }; @@ -1232,6 +1259,10 @@ in { cnvkit = callPackage ../development/python-modules/cnvkit { }; + coapthon3 = callPackage ../development/python-modules/coapthon3 { }; + + coconut = callPackage ../development/python-modules/coconut { }; + cocotb = callPackage ../development/python-modules/cocotb { }; codecov = callPackage ../development/python-modules/codecov { }; @@ -1333,6 +1364,8 @@ in { cppy = callPackage ../development/python-modules/cppy { }; + cpyparsing = callPackage ../development/python-modules/cpyparsing { }; + cram = callPackage ../development/python-modules/cram { }; crashtest = callPackage ../development/python-modules/crashtest { }; @@ -1365,6 +1398,8 @@ in { else callPackage ../development/python-modules/cryptography/vectors.nix { }; + crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; cssmin = callPackage ../development/python-modules/cssmin { }; @@ -1421,6 +1456,8 @@ in { daemonize = callPackage ../development/python-modules/daemonize { }; + daemonocle = callPackage ../development/python-modules/daemonocle { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; @@ -1591,7 +1628,13 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django = self.django_2; + + # Current LTS + django_2 = callPackage ../development/python-modules/django/2.nix { }; + + # Current latest + django_3 = callPackage ../development/python-modules/django/3.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -1650,8 +1693,6 @@ in { django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; - django_lts = self.django_2_2; - django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; @@ -1698,8 +1739,6 @@ in { django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; - django = self.django_lts; - django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; @@ -1793,8 +1832,6 @@ in { dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; - dparse = callPackage ../development/python-modules/dparse { }; dpath = callPackage ../development/python-modules/dpath { }; @@ -1880,6 +1917,8 @@ in { emcee = callPackage ../development/python-modules/emcee { }; + emv = callPackage ../development/python-modules/emv { }; + emoji = callPackage ../development/python-modules/emoji { }; enaml = callPackage ../development/python-modules/enaml { }; @@ -1962,6 +2001,8 @@ in { Fabric = callPackage ../development/python-modules/Fabric { }; + fabulous = callPackage ../development/python-modules/fabulous { }; + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; face = callPackage ../development/python-modules/face { }; @@ -1988,6 +2029,8 @@ in { fastdtw = callPackage ../development/python-modules/fastdtw { }; + fastecdsa = callPackage ../development/python-modules/fastecdsa { }; + fasteners = callPackage ../development/python-modules/fasteners { }; fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; @@ -2002,6 +2045,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fastprogress = callPackage ../development/python-modules/fastprogress { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; fasttext = callPackage ../development/python-modules/fasttext { }; @@ -2165,6 +2210,10 @@ in { flask_wtf = callPackage ../development/python-modules/flask-wtf { }; + flatbuffers = callPackage ../development/python-modules/flatbuffers { + inherit (pkgs) flatbuffers; + }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -2225,7 +2274,10 @@ in { freetype-py = callPackage ../development/python-modules/freetype-py { }; - freezegun = callPackage ../development/python-modules/freezegun { }; + freezegun = if isPy27 then + callPackage ../development/python-modules/freezegun/0.3.nix { } + else + callPackage ../development/python-modules/freezegun { }; fritzconnection = callPackage ../development/python-modules/fritzconnection { }; @@ -2334,6 +2386,8 @@ in { getmac = callPackage ../development/python-modules/getmac { }; + getkey = callPackage ../development/python-modules/getkey { }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; @@ -2389,6 +2443,8 @@ in { gmusicapi = callPackage ../development/python-modules/gmusicapi { }; + gntp = callPackage ../development/python-modules/gntp { }; + gnureadline = callPackage ../development/python-modules/gnureadline { }; gnutls = callPackage ../development/python-modules/gnutls { }; @@ -2450,6 +2506,8 @@ in { google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; + google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; @@ -2504,6 +2562,8 @@ in { google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + googlemaps = callPackage ../development/python-modules/googlemaps { }; + google-music = callPackage ../development/python-modules/google-music { }; google-music-proto = callPackage ../development/python-modules/google-music-proto { }; @@ -2538,6 +2598,10 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; + gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + + gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; @@ -2560,7 +2624,7 @@ in { grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; - graspy = callPackage ../development/python-modules/graspy { }; + graspologic = callPackage ../development/python-modules/graspologic { }; greatfet = callPackage ../development/python-modules/greatfet { }; @@ -2702,6 +2766,8 @@ in { hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + hjson = callPackage ../development/python-modules/hjson { }; + hkdf = callPackage ../development/python-modules/hkdf { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { }; @@ -2804,6 +2870,8 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink { }; + hyperopt = callPackage ../development/python-modules/hyperopt { }; + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; # File name is called 2.nix because this one will need to remain for Python 2. @@ -2839,6 +2907,8 @@ in { ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ifcopenshell = callPackage ../development/python-modules/ifcopenshell { }; + ignite = callPackage ../development/python-modules/ignite { }; ihatemoney = callPackage ../development/python-modules/ihatemoney { }; @@ -2857,6 +2927,8 @@ in { imagesize = callPackage ../development/python-modules/imagesize { }; + imantics = callPackage ../development/python-modules/imantics { }; + IMAPClient = callPackage ../development/python-modules/imapclient { }; imaplib2 = callPackage ../development/python-modules/imaplib2 { }; @@ -2866,6 +2938,8 @@ in { else callPackage ../development/python-modules/imbalanced-learn { }; + imdbpy = callPackage ../development/python-modules/imdbpy { }; + img2pdf = callPackage ../development/python-modules/img2pdf { }; imgaug = callPackage ../development/python-modules/imgaug { }; @@ -2901,6 +2975,8 @@ in { infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + inform = callPackage ../development/python-modules/inform { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; inifile = callPackage ../development/python-modules/inifile { }; @@ -2971,6 +3047,12 @@ in { irc = callPackage ../development/python-modules/irc { }; + ircrobots = callPackage ../development/python-modules/ircrobots { }; + + ircstates = callPackage ../development/python-modules/ircstates { }; + + irctokens = callPackage ../development/python-modules/irctokens { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; islpy = callPackage ../development/python-modules/islpy { }; @@ -2983,7 +3065,11 @@ in { isodate = callPackage ../development/python-modules/isodate { }; - isort = callPackage ../development/python-modules/isort { }; + isort = if isPy3k then + callPackage ../development/python-modules/isort { } + else + callPackage ../development/python-modules/isort/4.nix { + }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -3154,6 +3240,8 @@ in { jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; @@ -3298,6 +3386,8 @@ in { leveldb = callPackage ../development/python-modules/leveldb { }; + lexid = callPackage ../development/python-modules/lexid { }; + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; @@ -3382,6 +3472,8 @@ in { librosa = callPackage ../development/python-modules/librosa { }; + libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); + libsavitar = callPackage ../development/python-modules/libsavitar { }; libselinux = pipe pkgs.libselinux [ @@ -3390,13 +3482,13 @@ in { p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + broken = super.meta.broken or isPy27; }; })) (p: p.override { enablePython = true; - inherit python; + python3 = python; }) (p: p.py) ]; @@ -3460,6 +3552,8 @@ in { lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + littleutils = callPackage ../development/python-modules/littleutils { }; + livelossplot = callPackage ../development/python-modules/livelossplot { }; livereload = callPackage ../development/python-modules/livereload { }; @@ -3488,8 +3582,6 @@ in { lockfile = callPackage ../development/python-modules/lockfile { }; - locustio = callPackage ../development/python-modules/locustio { }; - Logbook = callPackage ../development/python-modules/Logbook { }; logfury = callPackage ../development/python-modules/logfury { }; @@ -3524,6 +3616,8 @@ in { lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; + lyricwikia = callPackage ../development/python-modules/lyricwikia { }; + lz4 = self.python-lz4; # alias 2018-12-05 lzstring = callPackage ../development/python-modules/lzstring { }; @@ -3700,6 +3794,8 @@ in { mido = callPackage ../development/python-modules/mido { }; + milc = callPackage ../development/python-modules/milc { }; + milksnake = callPackage ../development/python-modules/milksnake { }; minidb = callPackage ../development/python-modules/minidb { }; @@ -3728,6 +3824,8 @@ in { mlrose = callPackage ../development/python-modules/mlrose { }; + mlxtend = callPackage ../development/python-modules/mlxtend { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; @@ -3964,12 +4062,16 @@ in { ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + ndjson = callPackage ../development/python-modules/ndjson { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; neo = callPackage ../development/python-modules/neo { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; + nestedtext = callPackage ../development/python-modules/nestedtext { }; + netaddr = callPackage ../development/python-modules/netaddr { }; netcdf4 = callPackage ../development/python-modules/netcdf4 { }; @@ -4038,6 +4140,10 @@ in { nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nocasedict = callPackage ../development/python-modules/nocasedict { }; + + nocaselist = callPackage ../development/python-modules/nocaselist { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; node-semver = callPackage ../development/python-modules/node-semver { }; @@ -4088,6 +4194,7 @@ in { notify-py = callPackage ../development/python-modules/notify-py { }; notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; + notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; @@ -4201,6 +4308,8 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -4246,13 +4355,15 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; }); owslib = callPackage ../development/python-modules/owslib { }; oyaml = callPackage ../development/python-modules/oyaml { }; - packaging = callPackage ../development/python-modules/packaging { }; + packaging = if isPy3k + then callPackage ../development/python-modules/packaging { } + else callPackage ../development/python-modules/packaging/2.nix { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -4278,6 +4389,8 @@ in { else callPackage ../development/python-modules/pandas/2.nix { }; + pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; pandocfilters = callPackage ../development/python-modules/pandocfilters { }; @@ -4288,7 +4401,10 @@ in { paperspace = callPackage ../development/python-modules/paperspace { }; - paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; + openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { }; + paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { }; + paperwork-shell = callPackage ../applications/office/paperwork/paperwork-shell.nix { }; papis = callPackage ../development/python-modules/papis { }; @@ -4358,6 +4474,8 @@ in { pathtools = callPackage ../development/python-modules/pathtools { }; + patool = callPackage ../development/python-modules/patool { }; + patsy = callPackage ../development/python-modules/patsy { }; paver = callPackage ../development/python-modules/paver { }; @@ -4386,6 +4504,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; + pecan = callPackage ../development/python-modules/pecan { }; peewee = callPackage ../development/python-modules/peewee { }; @@ -4449,6 +4569,8 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; @@ -4484,6 +4606,8 @@ in { pims = callPackage ../development/python-modules/pims { }; + pinboard = callPackage ../development/python-modules/pinboard { }; + pint = callPackage ../development/python-modules/pint { }; pip = callPackage ../development/python-modules/pip { }; @@ -4508,6 +4632,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-openems = callPackage ../development/python-modules/python-openems { }; @@ -4610,6 +4736,8 @@ in { pproxy = callPackage ../development/python-modules/pproxy { }; + ppscore = callPackage ../development/python-modules/ppscore { }; + pq = callPackage ../development/python-modules/pq { }; prance = callPackage ../development/python-modules/prance { }; @@ -4694,6 +4822,8 @@ in { psycopg2 = callPackage ../development/python-modules/psycopg2 { }; + psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; + ptable = callPackage ../development/python-modules/ptable { }; ptest = callPackage ../development/python-modules/ptest { }; @@ -4736,6 +4866,10 @@ in { pxml = callPackage ../development/python-modules/pxml { }; + py-air-control = callPackage ../development/python-modules/py-air-control { }; + + py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); @@ -4754,6 +4888,8 @@ in { pyaes = callPackage ../development/python-modules/pyaes { }; + pyaftership = callPackage ../development/python-modules/pyaftership { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -4812,7 +4948,7 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; @@ -4844,6 +4980,8 @@ in { pycm = callPackage ../development/python-modules/pycm { }; + pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; pycognito = callPackage ../development/python-modules/pycognito { }; @@ -4885,6 +5023,8 @@ in { pycurl = callPackage ../development/python-modules/pycurl { }; + pycxx = callPackage ../development/python-modules/pycxx { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; @@ -4921,6 +5061,8 @@ in { pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyee = callPackage ../development/python-modules/pyee { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; pyemd = callPackage ../development/python-modules/pyemd { }; @@ -5008,9 +5150,14 @@ in { pygmo = callPackage ../development/python-modules/pygmo { }; + pygmt = callPackage ../development/python-modules/pygmt { }; + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + pygobject3 = if isPy3k then + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + else + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5035,6 +5182,8 @@ in { pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + pygtrie = callPackage ../development/python-modules/pygtrie { }; + pyhamcrest = if isPy3k then callPackage ../development/python-modules/pyhamcrest { } else @@ -5096,7 +5245,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; - pylibacl = callPackage ../development/python-modules/pylibacl { }; + pylibacl = if isPy3k then + callPackage ../development/python-modules/pylibacl { } + else + callPackage ../development/python-modules/pylibacl/0.5.nix { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -5197,6 +5349,8 @@ in { pync = callPackage ../development/python-modules/pync { }; + pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -5226,12 +5380,16 @@ in { pyomo = callPackage ../development/python-modules/pyomo { }; + phonemizer = callPackage ../development/python-modules/phonemizer { }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyosf = callPackage ../development/python-modules/pyosf { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; pyotp = callPackage ../development/python-modules/pyotp { }; @@ -5251,6 +5409,10 @@ in { pyparted = callPackage ../development/python-modules/pyparted { }; + pypass = callPackage ../development/python-modules/pypass { }; + + pypblib = callPackage ../development/python-modules/pypblib { }; + pypcap = callPackage ../development/python-modules/pypcap { }; pypdf2 = callPackage ../development/python-modules/pypdf2 { }; @@ -5273,6 +5435,8 @@ in { pypoppler = callPackage ../development/python-modules/pypoppler { }; + pyppeteer = callPackage ../development/python-modules/pyppeteer { }; + pyprind = callPackage ../development/python-modules/pyprind { }; pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; @@ -5359,6 +5523,8 @@ in { pyroma = callPackage ../development/python-modules/pyroma { }; + pyro-api = callPackage ../development/python-modules/pyro-api { }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; pyroute2 = callPackage ../development/python-modules/pyroute2 { }; @@ -5484,7 +5650,9 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { }; + pysvn = callPackage ../development/python-modules/pysvn { + inherit (pkgs) bash subversion apr aprutil expat neon openssl; + }; pytabix = callPackage ../development/python-modules/pytabix { }; @@ -5499,7 +5667,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_5 else self.pytest_4; + pytest = if isPy3k then self.pytest_6 else self.pytest_4; pytest_4 = callPackage ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle @@ -5667,11 +5835,10 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest_xdist = self.pytest_xdist_1; + pytest_xdist = if isPy27 then + callPackage ../development/python-modules/pytest-xdist/1.nix { } + else + callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; @@ -5687,10 +5854,14 @@ in { python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + python-bidi = callPackage ../development/python-modules/python-bidi { }; + python-binance = callPackage ../development/python-modules/python-binance { }; python-constraint = callPackage ../development/python-modules/python-constraint { }; + python-crontab = callPackage ../development/python-modules/python-crontab { }; + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; python-daemon = callPackage ../development/python-modules/python-daemon { }; @@ -5725,6 +5896,8 @@ in { python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + python-frontmatter = callPackage ../development/python-modules/python-frontmatter { }; + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; python-gnupg = callPackage ../development/python-modules/python-gnupg { }; @@ -5827,6 +6000,8 @@ in { python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + python-sat = callPackage ../development/python-modules/python-sat { }; + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; python_simple_hipchat = self.python-simple-hipchat; @@ -6082,6 +6257,8 @@ in { rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + re-assert = callPackage ../development/python-modules/re-assert { }; + readchar = callPackage ../development/python-modules/readchar { }; readme = callPackage ../development/python-modules/readme { }; @@ -6096,10 +6273,14 @@ in { recommonmark = callPackage ../development/python-modules/recommonmark { }; + redbaron = callPackage ../development/python-modules/redbaron { }; + redis = callPackage ../development/python-modules/redis { }; rednose = callPackage ../development/python-modules/rednose { }; + reedsolo = callPackage ../development/python-modules/reedsolo { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; @@ -6311,6 +6492,8 @@ in { sabyenc = callPackage ../development/python-modules/sabyenc { }; + sacn = callPackage ../development/python-modules/sacn { }; + sacremoses = callPackage ../development/python-modules/sacremoses { }; safe = callPackage ../development/python-modules/safe { }; @@ -6355,6 +6538,8 @@ in { scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; @@ -6379,6 +6564,16 @@ in { disabled = !isPy3k; }); + scipy_1_4 = self.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy"; + }; + doCheck = false; + disabled = !isPy3k; + }); + scipy = let scipy_ = callPackage ../development/python-modules/scipy { }; scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { @@ -6394,6 +6589,8 @@ in { scp = callPackage ../development/python-modules/scp { }; + scramp = callPackage ../development/python-modules/scramp { }; + scrapy = callPackage ../development/python-modules/scrapy { }; scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; @@ -6417,6 +6614,8 @@ in { seabreeze = callPackage ../development/python-modules/seabreeze { }; + seccomp = callPackage ../development/python-modules/seccomp { }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; secretstorage = if isPy3k then @@ -6477,6 +6676,8 @@ in { setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; @@ -6489,6 +6690,8 @@ in { shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; + shap = callPackage ../development/python-modules/shap { }; + shapely = callPackage ../development/python-modules/shapely { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; @@ -6570,6 +6773,8 @@ in { slicedimage = callPackage ../development/python-modules/slicedimage { }; + slicer = callPackage ../development/python-modules/slicer { }; + slicerator = callPackage ../development/python-modules/slicerator { }; slimit = callPackage ../development/python-modules/slimit { }; @@ -6590,15 +6795,15 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; + smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; smpplib = callPackage ../development/python-modules/smpplib { }; - smugline = callPackage ../development/python-modules/smugline { }; - - smugpy = callPackage ../development/python-modules/smugpy { }; + snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); snakebite = callPackage ../development/python-modules/snakebite { }; @@ -6634,6 +6839,8 @@ in { usePython = true; }); + sockjs = callPackage ../development/python-modules/sockjs { }; + sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; @@ -6689,6 +6896,8 @@ in { sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; @@ -6774,6 +6983,8 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; + sqlmap = callPackage ../development/python-modules/sqlmap { }; sqlobject = callPackage ../development/python-modules/sqlobject { }; @@ -6808,6 +7019,8 @@ in { sslyze = callPackage ../development/python-modules/sslyze { }; + stack-data = callPackage ../development/python-modules/stack-data { }; + starlette = callPackage ../development/python-modules/starlette { }; staticjinja = callPackage ../development/python-modules/staticjinja { }; @@ -6870,6 +7083,8 @@ in { sumo = callPackage ../development/python-modules/sumo { }; + sumtypes = callPackage ../development/python-modules/sumtypes { }; + sunpy = callPackage ../development/python-modules/sunpy { }; supervise_api = callPackage ../development/python-modules/supervise_api { }; @@ -6972,6 +7187,7 @@ in { nccl = pkgs.nccl_cudatoolkit_10; openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; + inherit (pkgs) flatbuffers; }; tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { @@ -6981,6 +7197,7 @@ in { nccl = pkgs.nccl_cudatoolkit_11; openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; + inherit (pkgs) flatbuffers; }; tensorflow-build = self.tensorflow-build_1; @@ -7101,6 +7318,8 @@ in { tinydb = callPackage ../development/python-modules/tinydb { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; + tiros = callPackage ../development/python-modules/tiros { }; tissue = callPackage ../development/python-modules/tissue { }; @@ -7133,7 +7352,10 @@ in { tomlkit = callPackage ../development/python-modules/tomlkit { }; - toolz = callPackage ../development/python-modules/toolz { }; + toolz = if isPy3k then + callPackage ../development/python-modules/toolz { } + else + callPackage ../development/python-modules/toolz/2.nix { }; toposort = callPackage ../development/python-modules/toposort { }; @@ -7316,7 +7538,9 @@ in { unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + unicorn = callPackage ../development/python-modules/unicorn { + unicorn-emu = pkgs.unicorn; + }; unidecode = callPackage ../development/python-modules/unidecode { }; @@ -7404,12 +7628,7 @@ in { vdf = callPackage ../development/python-modules/vdf { }; - vdirsyncer = callPackage ../development/python-modules/vdirsyncer { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; - inherit (pkgs) pkg-config openssl rustPlatform; - }; - - vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; vega = callPackage ../development/python-modules/vega { }; @@ -7598,6 +7817,14 @@ in { }; }; + wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK31.override { + withGtk2 = false; + withWebKit = true; + }; + }; + wxPython = self.wxPython30; x11_hash = callPackage ../development/python-modules/x11_hash { }; @@ -7645,6 +7872,8 @@ in { xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + xmljson = callPackage ../development/python-modules/xmljson { }; + xmlschema = callPackage ../development/python-modules/xmlschema { }; xmltodict = callPackage ../development/python-modules/xmltodict { }; @@ -7677,8 +7906,12 @@ in { yahooweather = callPackage ../development/python-modules/yahooweather { }; + yamale = callPackage ../development/python-modules/yamale { }; + yamllint = callPackage ../development/python-modules/yamllint { }; + yamlloader = callPackage ../development/python-modules/yamlloader { }; + yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; yanc = callPackage ../development/python-modules/yanc { }; @@ -7712,6 +7945,8 @@ in { phantomjsSupport = false; }; + youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { }; @@ -7744,7 +7979,7 @@ in { zeep = callPackage ../development/python-modules/zeep { }; - zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; + zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py; zerobin = callPackage ../development/python-modules/zerobin { }; @@ -7772,6 +8007,8 @@ in { zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + zigpy-znp = callPackage ../development/python-modules/zigpy-znp { }; + zimports = callPackage ../development/python-modules/zimports { }; zipfile36 = callPackage ../development/python-modules/zipfile36 { }; @@ -7841,6 +8078,4 @@ in { zxcvbn = callPackage ../development/python-modules/zxcvbn { }; -}); - -in fix' (extends overrides packages) +} diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/release-lib.nix b/infra/libkookie/nixpkgs/pkgs/top-level/release-lib.nix index 1e33c7b0585b..411093186a6c 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/release-lib.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/release-lib.nix @@ -142,15 +142,13 @@ rec { /* Recursively map a (nested) set of derivations to an isomorphic set of meta.platforms values. */ packagePlatforms = mapAttrs (name: value: - let res = builtins.tryEval ( if isDerivation value then value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ]) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else - []); - in if res.success then res.value else [] + [] ); diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/release-small.nix b/infra/libkookie/nixpkgs/pkgs/top-level/release-small.nix index 41aa86a8c463..5e591ec7a857 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/release-small.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/release-small.nix @@ -160,8 +160,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; udev = linux; unzip = all; usbutils = linux; - utillinux = linux; - utillinuxMinimal = linux; + util-linux = linux; + util-linuxMinimal = linux; w3m = all; webkitgtk = linux; wget = all; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/release.nix b/infra/libkookie/nixpkgs/pkgs/top-level/release.nix index 5fc6e91b3118..cacc77fea30d 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/release.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/release.nix @@ -173,8 +173,13 @@ let in { # Lightweight distribution and test inherit (bootstrap) dist test; + # Test a full stdenv bootstrap from the bootstrap tools definition - inherit (bootstrap.test-pkgs) stdenv; + # Temporarily disabled. The darwin bootstrap is transitioning the + # structure of bootstrap tools. The tools that are generated as + # part of the current package set cannot be unpacked in the same + # way as the tools used by the current package set. + # inherit (bootstrap.test-pkgs) stdenv; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/stage.nix b/infra/libkookie/nixpkgs/pkgs/top-level/stage.nix index 58b0300cc79c..8fc460ca5227 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/stage.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/stage.nix @@ -200,6 +200,9 @@ let then self else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); + # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB + # of allocations. DO NOT USE THIS IN NIXPKGS. + # # Extend the package set with a single overlay. This preserves # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/static.nix b/infra/libkookie/nixpkgs/pkgs/top-level/static.nix index 865e5cf2900e..b3851ba20f09 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/static.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/static.nix @@ -286,6 +286,11 @@ in { libexecinfo = super.libexecinfo.override { enableShared = false; }; + tree-sitter = super.tree-sitter.override { + enableShared = false; + enableStatic = true; + }; + xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { libX11 = xorgsuper.libX11.overrideAttrs (attrs: { depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/unix-tools.nix b/infra/libkookie/nixpkgs/pkgs/top-level/unix-tools.nix index cdad9de61f41..b4f708ad5651 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/unix-tools.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/unix-tools.nix @@ -55,15 +55,15 @@ let darwin = pkgs.darwin.network_cmds; }; col = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.text_cmds; }; column = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.netbsd.column; }; eject = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; }; getconf = { linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc @@ -76,19 +76,19 @@ let darwin = pkgs.netbsd.getent; }; getopt = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.getopt; }; fdisk = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; }; fsck = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; }; hexdump = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.shell_cmds; }; hostname = { @@ -108,14 +108,14 @@ let darwin = pkgs.netbsd.locale; }; logger = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; }; more = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = more_compat; }; mount = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; }; netstat = { @@ -139,7 +139,7 @@ let darwin = pkgs.darwin.network_cmds; }; script = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.shell_cmds; }; sysctl = { @@ -151,15 +151,15 @@ let darwin = pkgs.darwin.top; }; umount = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; }; whereis = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.shell_cmds; }; wall = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; }; watch = { linux = pkgs.procps; @@ -169,7 +169,7 @@ let darwin = pkgs.callPackage ../os-specific/linux/procps-ng {}; }; write = { - linux = pkgs.utillinux; + linux = pkgs.util-linux; darwin = pkgs.darwin.basic_cmds; }; xxd = { @@ -188,7 +188,7 @@ let # Provided for old usage of these commands. compat = with bins; lib.mapAttrs makeCompat { procps = [ ps sysctl top watch ]; - utillinux = [ fsck fdisk getopt hexdump mount + util-linux = [ fsck fdisk getopt hexdump mount script umount whereis write col column ]; nettools = [ arp hostname ifconfig netstat route ]; }; |