diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-12 00:12:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-12 00:12:01 +0000 |
commit | 072b4ff72f2cd222951cd1b3b8d3888b735e107c (patch) | |
tree | 1c0c702a09ec5c048f4bb3d5afb9bb9b1e0350fb /pkgs/top-level | |
parent | 5e9077b453730ca5a43bc7df8ad42e3c3a877070 (diff) | |
parent | bca7aaf8ea4c99c16c257a0e4f2e8384f28fb2cf (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 66 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
4 files changed, 60 insertions, 40 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1cbf0e22fad71..24b60556bfc18 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1114,6 +1114,7 @@ mapAliases ({ nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + noto-fonts-extra = noto-fonts; # Added 2023-04-08 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 211bc0f2cca2a..806f0e9b71c5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1481,6 +1481,8 @@ with pkgs; dwarfs = callPackage ../tools/filesystems/dwarfs { }; + etlegacy = callPackage ../games/etlegacy { lua = lua5_4; }; + copier = callPackage ../tools/misc/copier { }; gamemode = callPackage ../tools/games/gamemode { @@ -1537,6 +1539,8 @@ with pkgs; guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; + fabs = callPackage ../tools/backup/fabs { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; @@ -1559,6 +1563,8 @@ with pkgs; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; + kstart = callPackage ../tools/security/kstart { }; + kubevirt = callPackage ../tools/virtualization/kubevirt { }; license-generator = callPackage ../tools/misc/license-generator { }; @@ -2487,6 +2493,8 @@ with pkgs; spaceFM = callPackage ../applications/file-managers/spacefm { }; + tuifimanager = callPackage ../applications/file-managers/tuifimanager { }; + vifm = callPackage ../applications/file-managers/vifm { }; vifm-full = vifm.override { @@ -3083,10 +3091,8 @@ with pkgs; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; - buildbot = with python3Packages; toPythonApplication buildbot; - buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; - buildbot-full = with python3Packages; toPythonApplication buildbot-full; - buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; + inherit (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot {}) + buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; bunyan-rs = callPackage ../development/tools/bunyan-rs { }; @@ -3577,7 +3583,7 @@ with pkgs; play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - plausible = callPackage ../servers/web-apps/plausible { }; + plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; @@ -6377,6 +6383,8 @@ with pkgs; cask-server = libsForQt5.callPackage ../applications/misc/cask-server { }; + cc2538-bsl = callPackage ../tools/misc/cc2538-bsl { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; @@ -7044,13 +7052,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - enableGui = true; - }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -9748,6 +9751,10 @@ with pkgs; lv = callPackage ../tools/text/lv { }; + lv_img_conv = callPackage ../development/tools/lv_img_conv { + inherit (darwin.apple_sdk.frameworks) CoreText; + }; + lxc = callPackage ../os-specific/linux/lxc { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -12973,6 +12980,8 @@ with pkgs; transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { }; + transifex-cli = callPackage ../applications/misc/transifex-cli { }; + translate-shell = callPackage ../applications/misc/translate-shell { }; translatepy = with python3.pkgs; toPythonApplication translatepy; @@ -19442,13 +19451,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = (haskell.lib.compose.justStaticExecutables haskell.packages.ghc94.cachix).overrideAttrs(o: { - passthru = o.passthru or {} // { - tests = o.passthru.tests or {} // { - inherit hci; - }; - }; - }); + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; calcium = callPackage ../development/libraries/calcium { }; @@ -19902,7 +19905,7 @@ with pkgs; ffmpeg_4-headless = ffmpeg_4.override { ffmpegVariant = "headless"; }; - ffmpeg_4-full = ffmpeg.override { + ffmpeg_4-full = ffmpeg_4.override { ffmpegVariant = "full"; }; @@ -23037,6 +23040,10 @@ with pkgs; pe-parse = callPackage ../development/libraries/pe-parse { }; + phetch = callPackage ../applications/networking/gopher/phetch { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (callPackage ../development/libraries/physfs { inherit (darwin.apple_sdk.frameworks) Foundation; }) @@ -23691,6 +23698,8 @@ with pkgs; spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt { }; + sparrow3d = callPackage ../development/libraries/sparrow3d {}; + spdk = callPackage ../development/libraries/spdk { }; speechd = callPackage ../development/libraries/speechd { }; @@ -25009,9 +25018,7 @@ with pkgs; buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; @@ -26152,6 +26159,7 @@ with pkgs; armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareAllwinnerH616 + armTrustedFirmwareAllwinnerH6 armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 @@ -27349,6 +27357,7 @@ with pkgs; ubootOdroidC2 ubootOdroidXU3 ubootOlimexA64Olinuxino + ubootOrangePi3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -28182,8 +28191,7 @@ with pkgs; noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji - noto-fonts-emoji-blob-bin - noto-fonts-extra; + noto-fonts-emoji-blob-bin; nuclear = callPackage ../applications/audio/nuclear { }; @@ -28373,6 +28381,8 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; + sweet-nova = callPackage ../data/themes/sweet-nova { }; + shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -35629,7 +35639,7 @@ with pkgs; angband = callPackage ../games/angband { }; - anki = python39Packages.callPackage ../games/anki { + anki = callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; @@ -35988,6 +35998,8 @@ with pkgs; harmonist = callPackage ../games/harmonist { }; + hase = callPackage ../games/hase { }; + hedgewars = libsForQt5.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -36172,6 +36184,8 @@ with pkgs; newtonwars = callPackage ../games/newtonwars { }; + nsnake = callPackage ../games/nsnake { }; + nudoku = callPackage ../games/nudoku { }; nxengine-evo = callPackage ../games/nxengine-evo { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 719fb88362ab1..3ed3f3c76ec2a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -48,6 +48,12 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bsblan = python-bsblan; # added 2022-11-04 btchip = btchip-python; # added 2023-03-03 + buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07 + buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07 + buildbot-full = throw "use pkgs.buildbot-full instead"; # added 2022-04-07 + buildbot-plugins = throw "use pkgs.buildbot-plugins instead"; # added 2022-04-07 + buildbot-worker = throw "use pkgs.buildbot-worker instead"; # added 2022-04-07 + buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07 bt_proximity = bt-proximity; # added 2021-07-02 BTrees = btrees; # added 2023-02-19 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 @@ -124,6 +130,7 @@ mapAliases ({ hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 + intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-1017 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c62e970ac92a9..82374abcafb23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1513,18 +1513,6 @@ self: super: with self; { buienradar = callPackage ../development/python-modules/buienradar { }; - buildbot = callPackage ../development/python-modules/buildbot { }; - - buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards badges ]); - - buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; - - buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - - buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - build = callPackage ../development/python-modules/build { }; buildcatrust = callPackage ../development/python-modules/buildcatrust { }; @@ -3259,6 +3247,8 @@ self: super: with self; { expecttest = callPackage ../development/python-modules/expecttest { }; + expiring-dict = callPackage ../development/python-modules/expiring-dict { }; + expiringdict = callPackage ../development/python-modules/expiringdict { }; explorerscript = callPackage ../development/python-modules/explorerscript { }; @@ -4802,8 +4792,6 @@ self: super: with self; { into-dbus-python = callPackage ../development/python-modules/into-dbus-python { }; - intreehooks = callPackage ../development/python-modules/intreehooks { }; - invisible-watermark = callPackage ../development/python-modules/invisible-watermark { }; invocations = callPackage ../development/python-modules/invocations { }; @@ -10830,6 +10818,10 @@ self: super: with self; { simplehound = callPackage ../development/python-modules/simplehound { }; + simpleitk = callPackage ../development/python-modules/simpleitk { + inherit (pkgs) simpleitk; + }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; @@ -11108,6 +11100,8 @@ self: super: with self; { sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { }; + sphinx-intl = callPackage ../development/python-modules/sphinx-intl { }; + sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { }; sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { }; @@ -12121,6 +12115,8 @@ self: super: with self; { types-psutil = callPackage ../development/python-modules/types-psutil { }; + types-pyopenssl = callPackage ../development/python-modules/types-pyopenssl { }; + types-python-dateutil = callPackage ../development/python-modules/types-python-dateutil { }; types-pytz = callPackage ../development/python-modules/types-pytz { }; @@ -12240,6 +12236,8 @@ self: super: with self; { unicorn-emu = pkgs.unicorn; }; + unicurses = callPackage ../development/python-modules/unicurses { }; + unicrypto = callPackage ../development/python-modules/unicrypto { }; unidecode = callPackage ../development/python-modules/unidecode { }; |