diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-12 00:02:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-12 00:02:18 +0000 |
commit | 47157337bf48dcbd7bca4a4cddcc98bc04479ee3 (patch) | |
tree | d277a65a65c9c879c5203bb8a336133966b957ce /pkgs/top-level | |
parent | 4e2c1815ed1a40825c52e30dc993bf3a3c136104 (diff) | |
parent | bca7aaf8ea4c99c16c257a0e4f2e8384f28fb2cf (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 18 |
4 files changed, 32 insertions, 20 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a84c11adbb339..e6e914c82db61 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 1283a449763e9..70112095ea57c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2495,6 +2495,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 { @@ -3080,10 +3082,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 { }; @@ -3574,7 +3574,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 { }; @@ -6374,6 +6374,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; }; @@ -9740,6 +9742,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; }; @@ -12963,6 +12969,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; @@ -23051,6 +23059,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; }) @@ -28198,8 +28210,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 { }; @@ -35654,7 +35665,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; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 35079718420c6..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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 025085d90be39..c81bf4d1e7204 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 { }; @@ -11114,6 +11102,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 { }; @@ -12127,6 +12117,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 { }; @@ -12246,6 +12238,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 { }; |