Vladimír Čunát
77da5efc78
merge the rest of multiple-outputs
...
Conflicts:
pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
pkgs/development/tools/misc/patchelf/default.nix (easy)
pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát
694fa543af
Merge 'staging'
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
2c62a36b77
Merge remote-tracking branch 'origin/staging' into modular-stdenv
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
John Wiegley
28d898ed07
texlive: Fix build for users of Mavericks
2014-08-16 00:13:15 -05:00
Joachim Schiele
6c2763c3bf
Merge pull request #3568 from qknight/pdfgrep
...
pdfgrep: added a nice util to search in pdf files
2014-08-13 20:03:53 +02:00
Joachim Schiele
79617c03eb
pdfgrep: added a nice util to search in pdf files
2014-08-13 20:03:04 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Justin Bedo
befd1289ac
Updated texlive to latest release
2014-08-01 10:19:00 +10:00
Peter Simons
5cc55e9523
Partially revert 7a45996 some more.
...
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons
d0ca8c237e
Fix broken license references.
2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
4f7289eec9
Don't use ensureDir
2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Bjørn Forsman
cd3ba19ec0
asciidoc: add enableExtraPlugins expression argument
...
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
2014-07-20 23:03:27 +02:00
Bjørn Forsman
0ab24ad8c8
Revert "asciidoc: properly differentiate the "-full" variant in meta.description"
...
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.
This reverts commit 9033821c34
2014-07-20 23:03:27 +02:00
Eelco Dolstra
b9d19af3e6
Merge remote-tracking branch 'origin/master' into staging
2014-07-15 12:14:35 +02:00
Peter Simons
5bfb58a8a2
Re-generate Haskell packages with cabal2nix.
2014-07-14 17:33:52 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
John Wiegley
842fcdb4b4
texlive: update package paths, old versions no longer exist
2014-07-13 05:05:36 +00:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
2014-06-30 14:56:10 +02:00
John Wiegley
7c85cef85f
dvju2pdf: corrections to the installPhase and dependencies
2014-06-25 11:18:18 -07:00
John Wiegley
cda3d5d59b
djvu2pdf: new expression
2014-06-25 11:14:53 -07:00
Bjørn Forsman
9033821c34
asciidoc: properly differentiate the "-full" variant in meta.description
2014-06-22 22:22:51 +02:00
John Wiegley
651595c969
texlive: add potrace dependency without qualification
2014-06-10 08:57:52 +00:00
Michael Raskin
a852b53bff
Add potrace to texLive dependencies
2014-06-10 11:25:03 +04:00
John Wiegley
5100a2bbb3
texlive: upgrade to 20140528
2014-06-09 20:52:19 -05:00
John Wiegley
af6c8a33d9
texlive: add note to clarify why dvisvgm fails to work on darwin
2014-06-02 22:58:16 +00:00
John Wiegley
d2f8422683
texlive: enable building xdv2pdf and xdvipdfmx on darwin
2014-06-02 20:50:02 +00:00
John Wiegley
e719f64a05
graphite2: fix #2800 by setting INSTALL_NAME_DIR
2014-06-01 05:54:23 +00:00
John Wiegley
2e2f42f215
texlive: build bibtex-x and xetex on darwin
...
We also no longer need to specify that harfbuzz and icu not be used, and
DYLD_LIBRARY_PATH is properly configured to find graphite2.
2014-05-31 19:39:09 +00:00
John Wiegley
39bd9f8b1b
texLive: handle graphite2 properly on darwin
2014-05-31 12:32:57 +00:00
John Wiegley
369c227973
Update texlive expressions with new tarball versions
...
This is needed because the older tarballs are no longer available for
download.
2014-04-25 00:44:05 -05:00
Jacob Hinkle
65727f92e4
Bump texlive download versions *0215->*0314
2014-03-28 15:56:56 -06:00
Vladimír Čunát
9d4a3f83e8
Merge pull request #1869 from lovek323/texlive-full
...
texLiveFull: fix build on Darwin
2014-03-08 08:12:04 +01:00
Thomas Tuegel
1b3360a28f
Add biber-1.8 and dependencies
2014-03-07 14:49:48 +01:00
Jason "Don" O'Conal
f068044019
texLiveFull: fix build on Darwin
...
Added --with-system-icu=no, --with-system-harfbuzz=no (looks like the
omission of --with-system-icu was not sufficient to force the builder
not to look for system ICU libs).
Disable building bibtex-x: complains about missing ICU directory.
Disable building dvisvgm: a test fails (and I can't work out how to
prevent the tests from running just for this).
Disable building devnag: failing tests.
2014-03-03 21:58:52 +11:00
Jason "Don" O'Conal
30da769098
upgrade texlive-base, texlive-lang
...
Upgraded to 2013.20140215. The old version (2013.20131112) was no longer
available on the debian FTP server, so building from source was
impossible.
2014-03-03 21:58:19 +11:00
Jason "Don" O'Conal
13979ab58c
upgrade texlive-extra to 2013.20140215
...
The old version (2013.20131112) was no longer available on the debian
mirrors, hence building from source was impossible.
2014-03-03 21:58:00 +11:00
Peter Simons
05c7578c3d
lout: update from 3.39 to 3.40
2014-03-03 11:10:25 +01:00
Vladimír Čunát
161d029d7d
preferLocalBuild: set to true for wrappers and fetchers
2014-02-10 21:04:17 +01:00
Karn Kallio
d71ea4a597
texlive: Fix download file names to be current.
2014-02-02 21:37:41 +01:00
Petr Rockai
4124bb9ff5
Adopt more packages.
2014-01-28 18:11:00 +01:00
Nixpkgs Monitor
c31a4c927d
xmlto: update from 0.0.23 to 0.0.25
2014-01-13 18:12:17 +01:00
Eelco Dolstra
6fb27abf33
Merge branch 'java'
2014-01-13 13:16:17 +01:00
Eelco Dolstra
48701a3cef
fop: Drop runtime dependency on the JDK
2014-01-06 14:36:13 +01:00
Thomas Tuegel
17d02b49e3
texlive-beamer: bump to version 3.24
2014-01-05 09:00:25 -06:00
Thomas Tuegel
522a835743
texlive-extra: bump to version 20131219
2014-01-05 09:00:25 -06:00
