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
Eelco Dolstra
4c2c0499f3
enscript: Build with the default GCC
2014-07-23 11:25:38 +02:00
Eelco Dolstra
8aacdfee7c
gawk: Remove unnecessary ‘gawk-<version>’ copy
...
This saves > 600 KiB.
2014-07-08 15:43:05 +02:00
John Wiegley
f4b3bc0334
diffstat: weaken platform requirement
...
This fixes a change made in 3ae765278f
.
2014-06-24 14:45:33 -07:00
Bjørn Forsman
5d97335b6d
colordiff: update 1.0.9 -> 1.0.13
2014-06-22 23:00:14 +02:00
Bjørn Forsman
7061116faa
colordiff: add meta attributes
2014-06-22 22:57:08 +02:00
Bjørn Forsman
4d120e29c5
catdoc: add meta.description
2014-06-22 22:48:09 +02:00
Bjørn Forsman
3ae765278f
diffstat: clean up expression
...
Most importantly, add meta.description and meta.platforms.
2014-06-22 13:39:28 +02:00
Rob Vermaas
6bfb25b9e8
dos2unix: update from 6.0.4 to 6.0.5
2014-05-27 21:33:07 +02:00
Bjørn Forsman
1d79330e1d
basex: update 7.7.2 -> 7.8.2
2014-05-25 13:00:37 +02:00
Austin Seipp
c0db39e294
Merge pull request #2671 from wmertens/recode-osx
...
Recode: Build on OS X
2014-05-18 14:07:35 -05:00
Vladimír Čunát
137eae0b55
Merge #2630 : add and use fetchpatch
...
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.
Conflicts (auto-solved):
pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Wout Mertens
d04c84d0ac
Recode: Build on OS X
2014-05-16 23:28:19 +02:00
Eelco Dolstra
6aeb59bbe0
Rename fetchGitHub -> fetchFromGitHub
...
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046
Add a utility function "fetchGitHub"
...
This is a small wrapper around fetchzip. It allows you to say:
src = fetchGitHub {
owner = "NixOS";
repo = "nix";
rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
};
2014-05-08 15:30:18 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 15:01:55 +02:00
Eelco Dolstra
dbd332d147
Fix meta.maintainer -> meta.maintainers
2014-04-23 14:26:32 +02:00
宋文武
c796adfd65
add kakasi, a Kanji to Hiragana, Katakana or Romaji converter
2014-04-18 22:07:17 +08:00
Georges Dubus
b13a33550a
silver-searcher: update to 0.21.0
2014-03-27 17:57:02 +01:00
Shea Levy
d574c34e0a
Merge branch 'master' of git://github.com/madjar/nixpkgs
...
silver-searcher: avoid -lgcc_s on darwin
2014-03-19 18:18:08 -04:00
Cillian de Róiste
b57ee8c331
nixpkgs-lint: add the platforms meta attr for most of my packages
2014-03-16 12:08:26 +01:00
Georges Dubus
b805528552
silver-searcher: avoid -lgcc_s on darwin
2014-03-12 17:48:32 +01:00
Karn Kallio
0774192dd3
xmlstarlet: advance version to 1.5.0
2014-02-11 23:17:39 +01:00
Georges Dubus
8677b19c9d
silver-searcher: updated to 0.19.2
...
Also fixed the "libgcc_s.so.1 must be installed for pthread_cancel to
work" problem.
2014-02-03 18:21:43 +01:00
Georges Dubus
a737352862
silver-searcher: updated to 0.19.1
2014-02-01 21:56:28 +01:00
Eelco Dolstra
150ec8f79e
wdiff: Update to 1.2.1
2014-01-27 17:58:26 +01:00
Kevin Quick
8f0511b0a0
gawk: add gawkInteractive with readline support
...
stdenv (on linux) depends on gawk, readline and similar are useless for non-interactive usage.
Close #1596 . Original patch was almost completely rewritten by vcunat.
On darwin we always specify whether to use readline, so it isn't always picked as reported.
2014-01-26 10:53:22 +01:00
Shea Levy
ca116f76f9
Unmaintain a bunch of packages
...
Trying to take maintainership more seriously...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Georges Dubus
9f9244f061
silver-search: Add
2014-01-19 17:42:43 +01:00
Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
86afcccecb
sp-compat: Fix build
...
You can't run fixupPhase before installPhase.
http://hydra.nixos.org/build/8149119
2014-01-17 12:13:20 +01:00
Nixpkgs Monitor
bfb16b5296
dos2unix: update from 6.0.3 to 6.0.4
2014-01-13 17:28:42 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df
Merge glibc-2.18 branch into stdenv-updates
...
It's to separate from other changes coming from master.
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Eelco Dolstra
9f75797d0b
Merge remote-tracking branch 'origin/glibc-2.18'
2013-12-26 14:49:19 +01:00
Nixpkgs Monitor
69e6bd8707
mairix: update from 0.22 to 0.23
2013-12-21 04:07:50 +02:00
Nixpkgs Monitor
32a2e5dad3
numdiff: update from 5.6.1 to 5.8.1
2013-12-21 04:00:19 +02:00
Nixpkgs Monitor
d9952c5b40
namazu: update from 2.0.20 to 2.0.21
2013-12-21 02:28:24 +02:00
Nixpkgs Monitor
1ef60acae5
highlight: update from 3.5 to 3.9
2013-12-18 18:18:31 +02:00
Evgeny Egorochkin
74ced3209e
enca: update dependencies
2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
74c3965b92
enca: update from 1.13 to 1.15
2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
b89bcaef22
dos2unix: update from 5.3.1 to 6.0.3
2013-12-18 18:18:25 +02:00
Eelco Dolstra
134ba27ea2
Merge remote-tracking branch 'origin/master' into glibc-2.18
2013-12-18 15:42:54 +01:00
Peter Simons
45e8de9a7d
Merge branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Eelco Dolstra
eea9e405c8
source-highlight: Don't do a parallel build
...
The "make check" appears to have a race condition.
http://hydra.nixos.org/build/7116409
2013-12-16 17:03:19 +01:00
Nixpkgs Monitor
e4df13e956
enscript: update from 1.6.5.2 to 1.6.6
2013-12-15 12:35:47 +02:00
Nixpkgs Monitor
d706aab747
diffstat: update from 1.45 to 1.58
2013-12-11 09:47:45 +02:00
Eelco Dolstra
ed463a7671
boost: Remove 1.53 and 1.54
...
These don't build against Glibc 2.18, but they're not used anyway
(except by source-highlight, which builds fine against 1.49).
2013-12-10 12:02:53 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Nixpkgs Monitor
d643418edd
wgetpaste: update from 2.20 to 2.23
2013-12-06 17:13:23 +02:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor
5378fd5948
uni2ascii: update from 4.15 to 4.18
2013-12-04 06:39:34 +02:00
Nixpkgs Monitor
1b20cadd1d
ebook_tools: update from 0.2.1 to 0.2.2
2013-12-04 06:30:16 +02:00
Bjørn Forsman
214e92081f
ascii: update 3.12 -> 3.14
...
The Makefile has changed so the I had to update the sed line.
2013-11-30 23:51:39 +01:00
Bjørn Forsman
456edc140d
ascii: update/add meta attributes
2013-11-30 23:51:33 +01:00
Bjørn Forsman
bd67a1a16f
basex: bump 7.7 -> 7.7.2
...
This update brings "fixes and better CSV support":
http://basex.org/about-us/news/
2013-11-21 22:52:42 +01:00
Eelco Dolstra
01087750ba
Don't build some packages on some platforms
2013-11-04 21:11:00 +01:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Shea Levy
e1ea4e3800
Add htm-xml-utils
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-17 14:11:15 -04:00
Bjørn Forsman
866d57d93d
wgetpaste: better package description
2013-10-06 21:19:27 +02:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Peter Simons
3a7efa38ba
source-highlight: don't repeat the package name in meta.description
2013-09-26 11:12:12 +02:00
Peter Simons
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
Domen Kožar
e67a2479e1
add poedit
2013-09-13 20:42:49 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Bjørn Forsman
6167864aab
source-highlight: 3.1.6 -> 3.1.7
...
From NEWS file (version 3.1.7):
* fixed compilation bugs in MacOsX systems (thanks to
Trevor Spiteri)
* language definition for Lilypond (thanks to Federico Bruni)
* language definition for R statistics programming language
* language definition for ISLISP (thanks to Christian Jullien)
* improved Erlang definition file (thanks to Erik Søe Sørensen)
* new output format: ESC 256 ascii code (thanks to
Xavier-Emmanuel Vincent).
(It still needs boost 1.53 for all tests to pass.)
2013-09-04 20:00:27 +02:00
Bjørn Forsman
b7d4c94d52
unoconv: new package
...
unoconv is a tool that converts between any document format supported by
LibreOffice/OpenOffice.
Example of how to convert an .odt file to .pdf:
unoconv -f pdf some-file.odt
Homepage: http://dag.wieers.com/home-made/unoconv/
Implementation notes:
unoconv must use the same python version as libreoffice (unless it will
not be able to load the pyuno module from libreoffice). And because we
recently switched to libreoffice 4.x, which uses python3, I had to
include unoconv-python3.patch. The patch comes from upstream unoconv.git
repo, so it will be included in the next release.
2013-09-02 07:11:58 +02:00
Bjørn Forsman
0526403461
basex: new package
...
BaseX is a very fast and light-weight, yet powerful XML database and
XPath/XQuery processor, including support for the latest W3C Full Text
and Update Recommendations. It supports large XML instances and offers a
highly interactive front-end (basexgui). Apart from two local standalone
modes, BaseX offers a client/server architecture.
Homepage: http://basex.org/
Implementation notes:
- I'm using the pre-built java package (because it's simple)
- I copied the basex.svg icon file from the Ubuntu package because I
couldn't find it anywhere else. It's 9.3 KiB.
2013-08-31 14:27:40 +02:00