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 e22889064f82be3
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 3c6efec2c09, 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