diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-19 06:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 06:01:12 +0000 |
| commit | 8ee0e6664b4d07c288c8c303dcb682ff23bde432 (patch) | |
| tree | 7765f9763ff6cd24d17f884585c95d048e215faf /pkgs/top-level/aliases.nix | |
| parent | 3321e63b12183eadf7f9004aa0c9e79a2c471986 (diff) | |
| parent | 2d5db19dffbb7fd86c8eba10a77deb8b8838ece3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c0dc0b9285c0e..5485040358d20 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -147,6 +147,7 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 + canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 |