Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'

v#	modified:   nixpkgs/pkgs/tools/networking/dhcpcd/default.nix

1 files changed, 22 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 3a721b733907..4a9af9d329cc 100644
--- a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
@@ -1,13 +1,24 @@
-  # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
-{ fetchFromGitHub, lib } : fetchFromGitHub {
-  owner = "WordPress";
-  repo = "WordPress";
-  rev = "5.0.2";
-  sha256 = "1r8y62mdv6ji82hcn94gngi68mwilxh69gpx8r83k0cy08s99sln";
-  meta = {
-    homepage = https://wordpress.org;
-    description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.basvandijk ];
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "wordpress";
+  version = "5.2.2";
+
+  src = fetchurl {
+    url = "https://wordpress.org/${pname}-${version}.tar.gz";
+    sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/wordpress
+    cp -r . $out/share/wordpress
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wordpress.org";
+    description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
+    license = [ licenses.gpl2 ];
+    maintainers = [ maintainers.basvandijk ];
+    platforms = platforms.all;
   };
 }