Commit graph

437 commits

Author SHA1 Message Date
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
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát b6856521ff texlive: comment on a couple of internal functions 2016-04-08 16:39:20 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
José Romildo Malaquias 67555277e1 xmlto: 0.0.26 -> 0.0.28 2016-04-01 03:19:38 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Vladimír Čunát eb4a9d4d9c Revert "texlive.combine: patch paths into texmf.cnf"
This reverts commit acf664814e.
Let's revert until we catch the bugs in this.
2016-03-28 08:51:39 +02:00
Nikolay Amiantov acf664814e texlive.combine: patch paths into texmf.cnf
...instead of environment variables. Close #12768.
2016-03-27 21:20:11 +02:00
Vladimír Čunát e3da83297f texlive: document in nixpkgs manual
Fixes #13240. It's not really better than source-code comments it replaced,
but it's in a better accessible place.
2016-03-27 14:29:18 +02:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
José Romildo Malaquias b6db54b064 pygmentex: init at 0.8 2016-03-10 22:09:23 -03:00
Sander van der Burg e91b9bede0 runLatex: always include basic texlive stuff (thanks to vcunat) 2016-03-08 10:48:42 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Pascal Wittmann 5ba31560d5 pdf2djvu: 0.9.3 -> 0.9.4 2016-02-29 23:35:32 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm 69ce5cb656 use the sourceforge mirrors everywhere
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster 09a3349a79 tetex: turn off format hardening 2016-02-09 00:08:56 +00:00
Robin Gloster bd2d049750 texlive-core-big: turn off format hardening 2016-02-07 13:09:11 +00:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát 54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Domen Kožar 2c2b9fea66 remove texDisser, it's now part of texlive-new 2016-02-01 22:10:28 +01:00
Tuomas Tynkkynen 9700be4381 treewide: Mass replace 'djvulibre}/bin' to refer the 'bin' output 2016-02-01 20:46:00 +02:00
Franz Pletz 393977d800 Remove qcmm, strategoxt, aterm, bibtextools
These packages are very old and their tarballs or web pages are not
available anymore. Furthermore, they break with recent compilers like
GCC 5.
2016-01-30 16:36:57 +00:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Damien Cassou 59541736f5 Merge pull request #12641 from DamienCassou/new-git-latexdiff
git-latexdiff: init at 1.1.2
2016-01-27 10:39:00 +01:00
Damien Cassou dbc58b6eef git-latexdiff: init at 1.1.2 2016-01-27 10:22:57 +01:00
Tuomas Tynkkynen 619710268d treewide: Mass replace 'poppler}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Jos van den Oever 6e586a32fd odpdown: init at 0.4.1 2016-01-22 17:59:48 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Pascal Wittmann df7139de36 hevea: 2.26 -> 2.28 2016-01-15 21:36:23 +01:00
Tobias Geerinckx-Rice 9e44faab97 latex2html: remove dead package
Broken since Aug 2015, but upstream has been dead for donkey's
years. Only dependent was systemtap. No reasonable way (or indeed
reason) to artificially keep this alive.

Aim for the head.
2016-01-11 01:41:54 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Vladimír Čunát e16d3d0d8a texlive: add xdvi binary part (fixes #11816)
It seems to work fine for me now, after adding dependency on metafont.
2015-12-22 16:55:32 +01:00
Gabriel Ebner 723e693791 djvu2pdf: make work in nix-shell 2015-12-19 09:43:21 +01:00
Pascal Wittmann 80420c3187 hevea: 2.25 -> 2.26 2015-12-12 12:05:19 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Thomas Tuegel 3856e6939f rubber: wrap Python programs 2015-12-09 16:27:49 -06:00
Thomas Tuegel aab20cdc51 rubber: 1.1 -> 1.3
* version upgrade
* minor formatting change
* assign ttuegel as maintainer
2015-12-09 16:24:17 -06:00
John Wiegley 94a7e2b441 emacsPackages.auctex: 11.88 -> 11.89 2015-12-03 13:11:25 -05:00
Eelco Dolstra ec795d3632 texFunctions: Use modular texlive instead of tetex 2015-12-03 17:40:27 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Pascal Wittmann 65c2755126 pdf2djvu: 0.9.2 -> 0.9.3 2015-11-22 13:01:20 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Pascal Wittmann f84a9e60f4 pdf2djvu: 0.9.1 -> 0.9.2 2015-10-28 17:43:41 +01:00
Vladimír Čunát 1d640f029f texlive: avoid huge command lines
/cc #9757.
2015-10-24 12:09:45 +02:00
Vladimír Čunát 17a3f6a6fa icu: split into multiple outputs 2015-10-13 20:18:44 +02:00
Pascal Wittmann bf913a72b1 pdf2djvu: 0.8.2 -> 0.9.1 2015-10-06 13:13:57 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Vladimír Čunát f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát 0cf11036b4 texlive.bin.core: fixup with multiple outputs
There was an interaction with hand-moving the docs.
2015-10-04 11:08:18 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Karn Kallio 5ed03241be texlive: Fix download file names to be current. 2015-09-30 09:21:09 +02:00
Vladimír Čunát 3f06a234f6 texlive: just comment about (not) another mirror 2015-09-24 10:41:17 +02:00
Vladimír Čunát 179218252b tetex: don't build on Hydra anymore
Only asciidoc refers to it now (and broken latex2html).
2015-09-23 21:19:14 +02:00
Vladimír Čunát 9bd0bac311 nixos/manualPDF: use new texlive instead of tetex
This includes updating dblatex and crafting ~100 MB TeX package set
to make our manual compile.
2015-09-23 21:14:16 +02:00
Vladimír Čunát b799be7642 latex2html: mark as broken
I don't see directly how to make it work.
2015-09-17 19:06:42 +02:00
Vladimír Čunát 40c0356dd3 lazylist, polytable: remove as they are in texlive now 2015-09-17 19:06:14 +02:00
Vladimír Čunát 22fd6e1e4c texlive: add a new highly granular version, #287 2015-09-17 19:01:03 +02:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Pascal Wittmann 8f6bfd3fa1 pdf2djvu: 0.8.1 -> 0.8.2 2015-09-11 17:31:24 +02:00
ts468 054be41e04 Revert "ocaml-modules: fix naming: "_" -> "-"" 2015-09-06 21:15:10 +02:00
RoboNickBot 126d8dba96 texlive-moderntimeline: 0.8 (broken) -> 0.9 (close #9612)
The v0.8 build was broken because the CTAN package updated to v0.9 and
CTAN doesn't keep old versions of packages.

Besides bumping the version, this commit changes the src url from the
unversioned CTAN link (which would break the derivation every time a new
version of the package released, as it did yesterday) to the versioned
Github release link.
2015-09-03 12:03:05 +02:00
Nikolay Amiantov 7133fca524 texLiveModerntimeline: fix sha256 checksum
Looks like an upstream update. cc @peti
2015-09-03 12:01:38 +03:00
Thomas Strobel 616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Andreas Wagner bea3ba66bb multimarkdown: init at 4.7.1 2015-09-01 06:52:54 -04:00
Eelco Dolstra 4725d21583 bibtex-tools: Mark as broken
Tarball is missing.
2015-08-31 11:13:12 +02:00
Anders Papitto 6b892be9a8 fix updmap invocation in texLive
Close #9430, fixes #9318.
2015-08-24 22:47:05 +02:00
Pascal Wittmann 53ea7bcbda pdf2djvu: update from 0.8 to 0.8.1 2015-08-21 08:49:49 +02:00
Pascal Wittmann f5c2cd8059 pdf2djvu: update from 0.7.21 to 0.8 2015-08-08 00:08:50 +02:00
Pascal Wittmann 084595f33a hevea: update from 2.23 to 2.25 2015-08-04 12:17:16 +02:00
Bjørn Forsman 0c71406dd3 asciidoc: fix old copy/paste error 2015-07-30 16:36:38 +02:00
Peter Simons 07fd9384f5 texlive: flip the default for the assertion so that normal users can build it 2015-07-20 16:39:39 +02:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Peter Simons 32a81524fe release-lib: rename config option "inHydra" to "allowTexliveBuilds"
Also, take the value of that attribute as an argument to the module so
that Hydra maintainers who don't mind building TexLive have a chance to
do so.
2015-07-17 14:13:40 +02:00
William A. Kennington III ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Eelco Dolstra 7f54f99656 Don't build texLive in Hydra
It's way too big (texlive-core-2014 alone is > 1.5 GB).
2015-06-25 17:34:08 +02:00
Jude Taylor 099f85465c darwin purity: tetex-3.0 2015-06-19 12:56:39 -07:00
Pascal Wittmann 0ed4ad8c63 pdf2djvu: update from 0.7.17 to 0.7.21, adopt it 2015-06-08 16:19:42 +02:00
Pascal Wittmann e0cc3efca2 hevea: update from 1.07 to 2.23
add meta-information and adopt it
2015-05-31 16:30:24 +02:00
Rok Garbas 08b5686cd7 cygwin: tetex patch to make it build on cygwin 2015-05-28 14:15:47 +02:00
Florian Friesdorf 7f7aca4e16 cygwin: asciidoc otherwise tries to install to //nix and fails on cygwin
'//' on cygwin is the beginning of a SAMBA path
2015-05-28 10:53:36 +02:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Michael Raskin 52b47982ff Abandon separate TeXLive-associated PGF package, make it a reference to pgf3 2015-04-26 21:49:21 +03:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Pascal Wittmann d8d4972544 xmlto: update from 0.0.25 to 0.0.26 2015-03-15 14:42:58 +01:00
Vladimír Čunát 263ac41c18 texLiveModerntimeline: fix download by updating
Unfortunately I only see them providing an unversioned tarball :-/
CC #6747.
2015-03-12 20:15:22 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Eric Seidel f272730399 rename <gcc-frontend>.gcc to <gcc-frontend>.cc 2015-01-14 20:59:10 -08:00
Pascal Wittmann 68c4311fee halibut: update from 1.0 to 1.1
and add myself as a maintainer
2015-01-15 00:30:12 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Michael Raskin 641307f553 Drop wrong default.upstream 2014-12-21 11:14:25 +03:00
Domen Kožar d8e89ebd4b xmlroff: 0.3.98 -> 0.6.2 2014-11-24 08:43:43 +01:00
Mateusz Kowalczyk 03655c332a Add meta.branch to a bunch of packages
Gives better results in the monitor
2014-11-19 18:54:58 +00:00
Michael Raskin 1a69d88174 Update pdftk and fix its build 2014-11-16 02:16:42 +04:00
Michael Raskin 17140ebba8 Fix tex4ht build: our new stdenv lacks CC (why, by the way?) so default to gcc if CC empty 2014-11-16 00:12:29 +04:00
Petr Rockai c5b5020681 ConTeXt: Update to a current version & include it in texLiveFull. 2014-11-14 22:49:06 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Eike Kettner c805b29026 update texlive-extra to 2014-10-24 2014-11-09 22:48:24 +01:00
Lengyel Balázs c437ad42ad Updated texlive-base and texlive-lang to 2014-10-24 2014-11-09 14:19:35 +01:00
Vladimir Still 7ade583953 rubber: Disable etex detection.
If etex detection is running it forces LaTeX files using etex package to
be compiled with elatex which is no longer part of current TexLive,
efectivelly making it impossible to simply compile them without hacking
through rubber's commandline option.
I took this fix from fedora .spec for rubber.
2014-11-08 19:53:17 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
John Wiegley 80b0f385f0 emacs24Packages.auctex: 11.87 -> 11.88 2014-11-03 17:30:49 -06:00
Michael Raskin 1042d595c4 Update TeX-disser thesis template for Russian styles 2014-11-03 16:54:38 +03:00
Vladimír Čunát b5ea865f35 texLive-linkdir: work around a failure
It often failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.

CC @7c6f434c, maybe?
2014-10-18 13:52:37 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
John Wiegley 436cdb7e87 texlive: add jwiegley as a maintainer 2014-10-13 17:59:05 -05:00
Jascha Geerds 22c9903e0e texlive: Updated to latest release 2014.20140927 2014-10-13 21:21:23 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Pascal Wittmann 65242d4a74 pdfjam: update from 1.20 to 2.08 2014-10-04 23:13:32 +02:00
AndersonTorres bf560ce496 PGF: "upgrade" to version 3.00
It is not so properly an update, because the old versions will not be
obliterated from Nixpkgs. Hello backwards compatibility, my old friend...
2014-10-03 00:37:43 -03:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Thomas Tuegel fd293c2d88 biber: version bump to 1.9 2014-09-20 13:24:51 -05:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Eric Seidel 0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Longrin Wischnewski a111e7ff08 texlive: Updated to latest release 2014.20140821 2014-08-30 19:14:35 +02:00
William A. Kennington III c063a8d9a5 docbook2x: Add platforms so that it builds on hydra 2014-08-25 14:55:15 +02:00
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
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +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