Merge master into staging-next

11 files changed, 243 insertions, 110 deletions

diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix
new file mode 100644
index 0000000000000..6f5dddf7b5dfa
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf";
+  version = "1.18";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf";
+    rev = "refs/tags/version-${lib.replaceChars ["."] ["-"] finalAttrs.version}";
+    hash = "sha256-WZ/191iEDd5VK1bnV9JZx2BZfACUeAUhAqrlyx+ZvA4=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd context doc generic latex plain $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf";
+    description = "A Portable Graphic Format for TeX - version ${finalAttrs.version}";
+    branch = lib.versions.major version;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix
new file mode 100644
index 0000000000000..e823d0a4c4d93
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf";
+  version = "2.10";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-AA+XFhEkJifODJb6SppnxhR4lMlMNaH+k10UF6QisJ8=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd context doc generic latex plain $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf";
+    description = "A Portable Graphic Format for TeX - version ${version}";
+    branch = lib.versions.major version;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix
new file mode 100644
index 0000000000000..c40e54a413326
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf";
+  version = "3.1.9a";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-7FBaDEaCpiiLMcHWGv5AnUNc5AFqtm5o/R9bJePIomk=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd doc source tex/{context,generic,latex,plain} $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf";
+    description = "A Portable Graphic Format for TeX - version ${finalAttrs.version}";
+    branch = lib.versions.major version;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix
new file mode 100644
index 0000000000000..4c8bf800e4620
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf-pie";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf-pie";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-tAUv35AMgJW5JI2KIXxxXFihqdB7qbMmNpAYhpDbAxs=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd doc tex/latex $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf-pie";
+    description = "Some LaTeX macros for pie charts using the PGF/TikZ package";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix
new file mode 100644
index 0000000000000..293fa6b52e377
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf-umlcd";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf-umlcd";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-92bfBcQfnalYoVxlVRjbRXhWt+CbS8PtiMmFIqbgo7A=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd doc tex/latex $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf-umlcd";
+    description = "Some LaTeX macros for UML Class Diagrams";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix
new file mode 100644
index 0000000000000..fe08d68233965
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pgf-umlcd";
+  version = "unstable-2020-05-28";
+
+  src = fetchFromGitHub {
+    owner = "pgf-tikz";
+    repo = "pgf-umlsd";
+    rev = "8766cc18596dbfa66202ceca01c62cab1c3ed6a2";
+    hash = "sha256-gSBO7uDPMer9XyHfs0rr+2lricN5Nb4cOlShCsk0cPc=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/texmf-nix
+    cp -prd doc tex/latex $out/share/texmf-nix/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pgf-tikz/pgf-umlsd";
+    description = "Some LaTeX macros for UML Sequence Diagrams";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+})
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/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
deleted file mode 100644
index 618f936d8bf85..0000000000000
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "pgf";
-  version = "1.18";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
-    sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
-  };
-
-  dontBuild = true;
-
-  installPhase = "
-    mkdir -p $out/share/texmf-nix
-    cp -prd * $out/share/texmf-nix
-  ";
-
-  meta = with lib; {
-    branch = "1";
-    platforms = platforms.unix;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
deleted file mode 100644
index b8a3f2f636602..0000000000000
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "pgf";
-  version = "2.00";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
-    sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
-  };
-
-  dontBuild = true;
-
-  installPhase = "
-    mkdir -p $out/share/texmf-nix
-    cp -prd * $out/share/texmf-nix
-  ";
-
-  meta = with lib; {
-    branch = "2";
-    platforms = platforms.unix;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
deleted file mode 100644
index 9af41ff1f43f9..0000000000000
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  pname = "pgf";
-  version = "3.0.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/pgf/pgf/version%20${version}/pgf_${version}.tds.zip";
-    sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  # Multiple files problem
-  unpackPhase = ''
-    mkdir pgf
-    cd pgf
-    unzip $src
-  '';
-
-  dontBuild = true;
-
-  installPhase = "
-    mkdir -p $out/share/texmf-nix
-    cp -prd * $out/share/texmf-nix
-  ";
-
-  meta = with lib; {
-    branch = "3";
-    platforms = platforms.unix;
-    license = licenses.gpl2;
-  };
-}
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;
-  };
-}