Commit a29984eb authored by Artturin's avatar Artturin
Browse files

androidndkPkgs_23: get rid of the unneeded `b` in the name 

It was also failing because `targetAndroidndkPkgs` did not have the `b`
after `majorVersion`
parent 8d709fa3

pkgs/development/androidndk-pkgs/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, androidenv, buildPackages, pkgs, targetPackages

{ lib, androidenv, buildPackages, pkgs, targetPackages, androidndkPkgs_23, config

}:



let
@@ -38,7 +38,7 @@ in 


{

  "21" = makeNdkPkgs "21.0.6113669" pkgs.llvmPackages_14; # "9"

  "23b" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12"

  "23" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12"

  # Versions below 24 use a version not available in nixpkgs/old version which could be removed in the near future so use 14 for them as this is only used to get the hardening flags.

  "24" = makeNdkPkgs "24.0.8215888" pkgs.llvmPackages_14;

  "25" = makeNdkPkgs "25.2.9519653" pkgs.llvmPackages_14;

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ mapAliases ({ 
  ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16

  ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30

  ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11

  androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21

  apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12

  apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12

  apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -4039,7 +4039,7 @@ with pkgs; 














  androidndkPkgs = androidndkPkgs_26;















  androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";













  androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";













  androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs {})."23";















  androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";















  androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25";















  androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26";