From b7cba63031427b8c39abbf9d437fbd6bda2e450a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Jun 2013 12:58:21 +0200
Subject: [PATCH] Add moderntimeline extension for moderncv.

---
 .../tex/texlive/moderntimeline.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 17 +++++++-----
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/typesetting/tex/texlive/moderntimeline.nix

diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
new file mode 100644
index 00000000000..6139911623f
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -0,0 +1,26 @@
+args: with args;
+rec {
+  version = "0.7";
+  name = "moderntimeline-${version}";
+  src = fetchurl {
+    url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip";
+    sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876";
+  };
+
+  buildInputs = [texLive unzip];
+  phaseNames = ["doCopy"];
+  doCopy = fullDepEntry (''
+    mkdir -p $out/texmf/tex/latex/moderntimeline $out/texmf/doc/moderntimeline $out/share
+    mv *.dtx *.ins $out/texmf/tex/latex/moderntimeline/
+    mv *.pdf $out/texmf/doc/moderntimeline/
+    ln -s $out/texmf* $out/share/
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+
+  meta = {
+    description = "the moderntimeline extensions for moderncv";
+    maintainers = [ args.lib.maintainers.simons ];
+
+    # Actually, arch-independent..
+    platforms = [] ;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 547f68436ad..afefed468c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2652,8 +2652,8 @@ let
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = callPackage ../development/compilers/mono { 
-    inherit (xlibs) libX11;    
+  mono = callPackage ../development/compilers/mono {
+    inherit (xlibs) libX11;
   };
 
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
@@ -9398,7 +9398,8 @@ let
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ];
+              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
+              texLiveModerntimeline ];
   });
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions
@@ -9446,6 +9447,10 @@ let
     inherit texLive unzip;
   };
 
+  texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) {
+    inherit texLive unzip;
+  };
+
   thinkfan = callPackage ../tools/system/thinkfan { };
 
   vice = callPackage ../misc/emulators/vice { };
@@ -9498,14 +9503,14 @@ let
   PatolineEnv = pack: myEnvFun {
       name = "patoline";
       buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
-                                   pack.ocaml pack.findlib pack.camomile 
-	                           pack.dypgen pack.ocaml_sqlite3 pack.camlzip 
+                                   pack.ocaml pack.findlib pack.camomile
+	                           pack.dypgen pack.ocaml_sqlite3 pack.camlzip
 				   pack.lablgtk pack.camlimages pack.ocaml_cairo
 				   pack.lablgl pack.ocamlnet pack.cryptokit
 				   pack.ocaml_pcre pack.patoline
 				   ];
     # this is to circumvent the bug with libgcc_s.so.1 which is
-    # not found when using thread				   
+    # not found when using thread
     extraCmds = ''
        LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
        export LD_LIBRARY_PATH