diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-08 06:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 06:00:55 +0000 |
| commit | 1287e59c065d7cc330201e5cfe0825cc289bb5da (patch) | |
| tree | 30d96b4d743581d4bc11eed309c0f75f4100927c /pkgs/top-level | |
| parent | 728281e1ea12eace7da07830ef9f9d5e58f9ba1f (diff) | |
| parent | 26117abbca9b30e96c001d3aaf2eab79c8b3b808 (diff) | |
| download | nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar.gz nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar.bz2 nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar.lz nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar.xz nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.tar.zst nixlib-1287e59c065d7cc330201e5cfe0825cc289bb5da.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e3b949f4240..4ff7701131f0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -221,7 +221,11 @@ mapAliases ({ elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs + emacs28NativeComp = emacs28; # Added 2022-06-08 + emacs28Packages = emacs28.pkgs; # Added 2021-10-04 + emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsMacport = emacs-macport; # Added 2023-08-10 + emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e173c4513a6b..df51595b5a07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -822,6 +822,10 @@ with pkgs; sea-orm-cli = callPackage ../development/tools/sea-orm-cli { }; + vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { + fmt = fmt_10; + }; + r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -31338,17 +31342,22 @@ with pkgs; em = callPackage ../applications/editors/em { }; inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) + emacs28 + emacs28-gtk2 + emacs28-gtk3 + emacs28-nox emacs29 emacs29-gtk3 emacs29-nox emacs29-pgtk + emacs28-macport emacs29-macport ; - emacs-macport = emacs29-macport; - emacs = emacs29; - emacs-gtk = emacs29-gtk3; - emacs-nox = emacs29-nox; + emacs-macport = emacs28-macport; + emacs = emacs28; + emacs-gtk = emacs28-gtk3; + emacs-nox = emacs28-nox; emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; |