diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
commit | 4c5a71f777769b1f2516096532424cd42531aa1f (patch) | |
tree | a5eb1c36a9363911ce264c7ed573b2f3cc6a7798 /pkgs/tools/typesetting | |
parent | e8394e3f8c7d464bc27a344a982648c20a08a6d7 (diff) | |
parent | 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 (diff) | |
download | nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.gz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.bz2 nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.lz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.xz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.zst nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.zip |
Merge master into x-updates
Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/lhs2tex/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/auctex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/pgf/1.x.nix | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 723741b2c836..8a5eb6ad759e 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + hydraPlatforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ec1c9021522f..ade7fd202d53 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 3a8b41da6609..b3c09952e43f 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.85"; + version = "11.87"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; + sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 91948f995a0e..032d9b5520e7 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pgf-1.10"; + name = "pgf-1.18"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-1.10.tar.gz; - sha256 = "1y605wmjxryphh0y5zgzvdq6xjxb2bjb95j36d4wg1a7n93ksswl"; + url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; + sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; buildPhase = "true"; |