ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity
52,522 Commits 96 Branches 102 Tags 4.8 GiB
0518ccf5af
Commit Graph

218 Commits

Author SHA1 Message Date
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
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
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
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