Commit graph

386 commits

Author SHA1 Message Date
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 91a3920b1d asciidoc: Works on Darwin
D'oh! Plain 'asciidoc' works, but 'asciidoc-full' doesn't, so my scripts
changed it to 'linux' in
21f17d69f6
2016-08-02 22:49:43 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen 1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Lluís Batlle i Rossell e412f2199a Fix psutils licence. 2016-07-27 10:29:30 +02:00
Lluís Batlle i Rossell 03f368ca93 Adding psutils.
Have we lived without psnup so many years? Incredible.
2016-07-27 10:26:15 +02:00
Peter Hoeg 2ea24072ae pdf2odt: init at 2014-12-17
We also apply a patch to create the temporary directory securely
2016-07-27 09:40:35 +08:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas 227bf69b00 Merge pull request #16597 from jokogr/biber-2.5
biber: 2.4 -> 2.5
2016-07-21 01:27:35 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Ioannis Koutras a3e6044e9c biber: 2.4 -> 2.5 2016-07-13 10:53:12 +03:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Nikolay Amiantov 25ae14aa38 Merge pull request #15874 from abbradar/texlive-argv0
texlive-bin: remove detecting of local directory from mktex*
2016-06-23 07:48:26 +04:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Nikolay Amiantov d51ec20a50 biber: 1.9 -> 2.4 2016-06-22 04:57:57 +03:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Vladimír Čunát 7a6ec0a0ee texlive: add xindy binary
Fixes #16207.
2016-06-16 12:53:51 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Vladimír Čunát bd458e56b6 Merge #14356: docbook updates 2016-06-09 13:11:53 +02:00
obadz ab70ae2edf Merge pull request #15647 from layus/auctex
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
FlorentBecker d7de8bc6e9 patoline: remove (source is unavailable) (#15918) 2016-06-06 10:49:00 +02:00
Guillaume Maudoux f3a753829d auctex: enable preview 2016-06-05 18:45:09 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Nikolay Amiantov 4adc660fc5 texlive-bin: remove detecting of local directory from mktex* 2016-05-31 23:54:18 +03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Roman Naumann 7abe192b05 texlive-new: update obsolete hashes
This commits mitigates https://github.com/NixOS/nixpkgs/issues/10026.
Thanks to @namore for contributing most of the update!
2016-05-11 13:33:16 +02:00
Nikolay Amiantov 49de0c32bd texlive: restore back exports of TeX paths
Credits for the fix to jraygauthier.
See https://github.com/NixOS/nixpkgs/pull/12768#issuecomment-218050187
2016-05-10 06:33:55 +03:00
Raymond Gauthier 8a4b670a2f texlive.combine: fix build
Recent merge of pull request #14681 broke
the build of some texlive components (e.g.: `xetex`)
that do not include the `./share/texmf/web2c/texmf.cnf`.
This fix should allow these component to build
as before by operating on this file only when
it exits.
2016-05-09 19:29:05 -04:00
zimbatm 9cc724e570 Merge pull request #14681 from jraygauthier/jrg/fix_context_by_patching_luascript_rebased
texlive.combine: also patch `texmfcnf.lua`
2016-05-09 14:37:33 +01:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Yacine Hmito 863ba5c7e0 asciidoctor: Bumped yanked dependency
asciidoctor-latex: 1.5.0.6.dev -> 1.5.0.8.dev
See NixOS/nixpkgs/pull/15135#issuecomment-216984749
This optional dependency may be removed if this happens too often
2016-05-05 12:18:24 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Yacine Hmito d3421435e0 asciidoctor: Init at 1.5.4 2016-05-04 13:23:22 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Peter Simons 00ac3ac6ce texlive (old): mark build as broken
Reported in https://github.com/NixOS/nixpkgs/issues/14807. It's probably
about time to convert to the new texlive code, which is *much* nicer.
See http://nixos.org/nixpkgs/manual/#sec-language-texlive for details.
2016-04-20 23:13:40 +02:00
Peter Simons c9e300b458 texlive (old): un-break syntax highlighting in Emacs (cosmetic) 2016-04-20 23:13:05 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Eelco Dolstra be8fc33164 texlive-new: Export source tarballs via an attribute
This allows them to be found by find-tarballs.nix (which can only see
fetchurl dependencies if they are attributes, not if they're part of a
string context).
2016-04-18 15:18:21 +02:00
Raymond Gauthier 954f381972 texlive.combine: also patch texmfcnf.lua
Fixes #14463.
2016-04-14 01:15:16 -04:00
Nikolay Amiantov 0435ac8894 texlive.combine: patch paths into texmf.cnf
...instead of environment variables. Close #12768.

(cherry picked from commit acf664814e)
2016-04-14 01:14:53 -04:00