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
William A. Kennington III
a9c472d16e
boost: Fix incompatible applications
2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7
boost: Remove boost.lib
2014-11-02 17:22:27 -08:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Domen Kožar
419f15b060
Remove http_proxy/ftp_proxy overrides used in setup hooks.
...
Partially reverts eaa4db148d
. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.
chroot should remove such unpurities.
2014-10-28 23:20:59 +01:00
Alastair Pharo
47dc7990ec
enca: update from 1.15 to 1.16
2014-10-27 07:28:23 +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
Longrin Wischnewski
6e7de2155b
change md5sum to sha256sum for a few packages
2014-10-12 16:13:21 +02:00
Mateusz Kowalczyk
b0258a5d17
Merge pull request #4462 from VShell/discount
...
discount: new package
2014-10-12 12:37:50 +01:00
taku0
08cd49e4e0
peco: update to version 0.2.10
...
Closes #4489
2014-10-12 12:33:16 +01:00
Shell Turner
0b649538b2
discount: Added shell as maintainer
2014-10-12 12:09:07 +01:00
Shell Turner
e56a6c1bec
discount: new package
2014-10-10 16:23:26 +01: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
Aristid Breitkreuz
a8e104f3de
xmlstarlet: update from 1.5.0 to 1.6.1
2014-10-08 20:23:26 +02:00
Francesco Lazzarino
672654f9e9
new: gist – cli for gist.github.com
2014-10-08 07:31:36 -05: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
Eelco Dolstra
a1d9c56389
gnugrep: Fix bootstrap-tools reference
2014-10-06 22:05:55 +02:00
Aristid Breitkreuz
60b174966c
dos2unix: update from 6.0.6 to 7.0
2014-10-06 21:57:59 +02:00
Eelco Dolstra
ae863192e6
gnugrep: Update to 2.20
2014-10-06 20:44:26 +02:00
Pascal Wittmann
494a52306a
dadadodo: adopt and cleanup expression
2014-10-06 11:36:58 +02:00
Eelco Dolstra
03397674c8
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
2014-10-03 16:14:36 +02:00
Eelco Dolstra
d9fbcd12ce
Revert "Upgraded gawk to v4.1.1"
...
This reverts commit e48e994a12
. "make
check" fails with "5 TESTS FAILED".
2014-10-03 16:12:09 +02:00
Eelco Dolstra
8c3ddec416
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
2014-10-03 15:49:20 +02:00
koral
e48e994a12
Upgraded gawk to v4.1.1
2014-10-02 23:09:42 +04:00
Eelco Dolstra
6843fc41c9
Fix evaluation
2014-09-30 00:51:00 +02:00
Eelco Dolstra
dad7623758
wdiff: Update to 1.2.2
2014-09-23 11:51:46 +02: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
Michael Raskin
d22a3b8d0e
Fix /bin/mv reference in replace-literal
2014-09-20 11:53:21 +04:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
Alexander Kjeldaas
7141303c99
groff, opensp: make deterministic
2014-09-13 15:06:59 +02:00
Pascal Wittmann
8d67b9a240
transformed meta.maintainers of some packages into lists
2014-09-13 13:52:02 +02:00
Joel Taylor
7da056233f
wip libc++
2014-09-09 13:54:25 -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
Peter Simons
ff85b53c5f
highlight: update to version 3.18 to fix build errors with Lua 5.2
2014-09-08 10:22:50 +02:00
Moritz Ulrich
2bfd7ae15c
dos2unix: update from 6.0.5 to 6.0.6
2014-09-04 19:31:33 +02:00
Moritz Ulrich
14fd86307f
diffstat: update from 1.58 to 1.59
2014-09-04 19:31:32 +02:00
Domen Kožar
fbecc676e5
wgetpaste: 2.23 -> 2.25
2014-08-25 13:03:30 +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
Eelco Dolstra
a9baea48df
openjade: Use default perl
2014-08-21 16:54:28 +02:00
Pascal Wittmann
464ec2a8e5
silver-searcher: update from 0.21.0 to 0.24.1
2014-08-19 19:27:16 +02:00
Vladimír Čunát
8a4827a881
kdiff3: minor update
2014-08-14 19:43:27 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
taku0
74ce1a016f
add peco: Simplistic interactive filtering tool
2014-08-07 01:34:28 +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
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00