Unverified Commit 1cdfe7f5 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #260260 from wegank/wordpress-alias 

wordpress6_1, wordpress6_2: drop
parents b597bff1 7db98366

nixos/tests/wordpress.nix

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ rec { 
      networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];

    };

  }) {} [

    "6_1" "6_2" "6_3"

    "6_3"

  ];



  testScript = ''

pkgs/servers/web-apps/wordpress/default.nix

+0 −8
Original line number Diff line number Diff line
@@ -4,12 +4,4 @@ 
    version = "6.3.1";

    hash = "sha256-HVV7pANMimJN4P1PsuAyIAZFejvYMQESXmVpoxac8X8=";

  };

  wordpress6_2 = {

    version = "6.2.2";

    hash = "sha256-0qpvPauGbeP1MLHmz6gItJf80Erts7E7x28TM9AmAPk=";

  };

  wordpress6_1 = {

    version = "6.1.2";

    hash = "sha256-ozpuCVeni71CUylmUBk8wVo5ygZAKY7IdZ12DKbpSrw=";

  };

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -926,6 +926,8 @@ mapAliases ({ 
  win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16

  win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17

  wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29

  wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10

  wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10

  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name

  wmii_hg = wmii;

  wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -41410,7 +41410,7 @@ with pkgs; 
  wmutils-opt = callPackage ../tools/X11/wmutils-opt { };















  inherit (callPackage ../servers/web-apps/wordpress {})













    wordpress wordpress6_1 wordpress6_2 wordpress6_3;













    wordpress wordpress6_3;





























  wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {















    plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;