From 2673e76492e52d27f779dfb55038b009d83d6675 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:34:01 +0200 Subject: [PATCH 1/2] wordpress: 6.5.5 -> 6.6.1 --- pkgs/servers/web-apps/wordpress/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index aab023ce4baf..efe867f5c14d 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,5 +1,5 @@ { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec { - wordpress = wordpress6_5; + wordpress = wordpress_6_6; wordpress6_3 = { version = "6.3.4"; hash = "sha256-Z94B2PQ/wl2N1MPMH15CToI3taKDHFRnbAl/Nt9jB+I="; @@ -12,4 +12,8 @@ version = "6.5.5"; hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; + wordpress_6_6 = { + version = "6.6.1"; + hash = "sha256-YW6BhlP48okxLrpsJwPgynSHpbdRqyMoXaq9IBd8TlU="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543c60b3298e..56f7a620f80d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39641,7 +39641,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_3 wordpress6_4 wordpress6_5; + wordpress wordpress6_3 wordpress6_4 wordpress6_5 wordpress_6_6; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; From bedb9b2d649b5d3954edfe520b53e174db20b08a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:34:41 +0200 Subject: [PATCH 2/2] wordpress: drop old versions --- pkgs/servers/web-apps/wordpress/default.nix | 10 +--------- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index efe867f5c14d..08a9eb2da05a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,14 +1,6 @@ { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress_6_6; - wordpress6_3 = { - version = "6.3.4"; - hash = "sha256-Z94B2PQ/wl2N1MPMH15CToI3taKDHFRnbAl/Nt9jB+I="; - }; - wordpress6_4 = { - version = "6.4.4"; - hash = "sha256-aLOO/XgjI3d/+1BpHDT2pGR697oceghjzOId1MjC+wQ="; - }; - wordpress6_5 = { + wordpress_6_5 = { version = "6.5.5"; hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0b4ad43fbe1..55a1e343d4c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1548,6 +1548,9 @@ mapAliases ({ wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release 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 + wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03 + wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03 + wordpress6_5 = wordpress_6_5; # Added 2024-08-03 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wpa_supplicant_ro_ssids = lib.trivial.warn "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56f7a620f80d..c1e59ed9a949 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39641,7 +39641,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_3 wordpress6_4 wordpress6_5 wordpress_6_6; + wordpress wordpress_6_5 wordpress_6_6; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;