pgfplots: 1.5.1 -> 1.18.1

3 files changed, 34 insertions, 30 deletions

diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix
new file mode 100644
index 0000000000000..1e4c5c2d2fa59
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgfplots";
+  version = "1.18.1";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgfplots";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-cTfOMasBptm0lydKeNHPnjdEyFjEb88awYPn8S2m73c=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd doc tex/{context,generic,latex,plain} $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "http://pgfplots.sourceforge.net";
+    description = "TeX package to draw plots directly in TeX in two and three dimensions";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix
deleted file mode 100644
index 0a2667f284e9d..0000000000000
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{lib, stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation rec {
-  pname = "pgfplots";
-  version = "1.5.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/pgfplots/pgfplots_${version}.tds.zip";
-    sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  unpackPhase = "unzip $src";
-
-  dontBuild = true;
-
-  installPhase = "
-    mkdir -p $out/share/texmf-nix
-    cp -prd * $out/share/texmf-nix
-  ";
-
-  meta = with lib; {
-    description = "TeX package to draw plots directly in TeX in two and three dimensions";
-    homepage = "http://pgfplots.sourceforge.net";
-    platforms = platforms.unix;
-    license = licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0b0a766dc561..0a4e2fa734f38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4051,7 +4051,7 @@ with pkgs;
 
   pgf = pgf2;
 
-  pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
+  pgfplots = callPackage ../tools/typesetting/tex/pgf-tikz/pgfplots.nix { };
 
   pplatex = callPackage ../tools/typesetting/tex/pplatex { };