Commit graph

811 commits

Author SHA1 Message Date
Franz Pletz
5bfc47bbab
catdoc: add to patch fix CVE-2017-11110 2017-08-01 10:26:19 +02:00
Frederik Rietdijk
740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
mimadrid
3e6e05bf98 mawk: 1.3.4-20141206 -> 1.3.4-20161120 2017-07-30 20:58:48 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Muhammad Herdiansyah
d31e7ee1bd nawk: init at 20121220 2017-07-27 21:51:10 +07:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Patrick Callahan
edef4459f6 html-tidy: 5.2.0 -> 5.4.0 2017-07-24 09:19:03 -07:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Yegor Timoshenko
90f0c3b93e html-xml-utils: 6.9 → 7.1, macOS support 2017-07-17 21:46:02 +03:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Lancelot SIX
706f0c3849 gnugrep: 3.0 -> 3.1
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00000.html
for release announcement
2017-07-13 15:19:29 +02:00
Benno Fünfstück
f3cbde9125 codesearch: correct version number 2017-07-11 22:44:43 +02:00
Vladimír Čunát
9e1c7ddaae
Merge branch 'master' into staging 2017-07-05 09:53:53 +02:00
Vladimír Čunát
1db1ba9048
groff: (nitpick) quote shell variables 2017-07-05 09:33:39 +02:00
Vladimír Čunát
7b7eb577a2
Merge #27061: groff: fix man page coloring 2017-07-05 09:30:47 +02:00
Vladimír Čunát
5328aac7be
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Frederik Rietdijk
680298ef85 Merge pull request #27039 from jokogr/f/kdiff3-kcrash
kdiff3: add dependency to kcrash
2017-07-03 09:51:20 +02:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Ioannis Koutras
bf9e5d2111 kdiff3: add dependency to kcrash 2017-07-02 13:47:10 +03:00
dywedir
8197e4dffa xsv: 0.11.0 -> 0.12.1 2017-07-02 12:05:00 +03:00
Aneesh Agrawal
111b5eb637 groff: Add site.tmac to fix man page coloring
This enables groff to correctly respond to the LESS_TERMCAP_*
environment variables, allowing colorized man pages.

Patch is taken from Arch Linux;
see https://bugs.archlinux.org/task/33760.
2017-07-01 18:58:34 -07:00
John Ericson
95c8277701 misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
hsloan
10685e3956 replace: Rely on cc-wrapper to export env var 2017-06-28 21:29:08 -04:00
hsloan
936196129d html-tidy: Don't use stdenv.cross 2017-06-28 21:29:08 -04:00
Jörg Thalheim
c09d4ae6a8 Merge pull request #26729 from igsha/languagetool
languagetool: fix arguments passing
2017-06-24 18:21:00 +01:00
John Ericson
ef0b07e94a gnu patch: Fix for cross 2017-06-22 17:53:53 -04:00
Vladimír Čunát
629e9c6dc7
Merge branch 'staging'
I don't like to wait for the expat-induced rebuild to happen yet another
time on staging.
2017-06-19 07:29:42 +02:00
Thomas Tuegel
be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Vladimír Čunát
66fdb94f50
gawkInteractive: fix build after 04d4d14d6d
(Without causing a mass rebuild for now.)
2017-06-18 13:53:09 +02:00
Igor Sharonov
8506fc3653 languagetool: fix arguments passing 2017-06-17 20:42:51 +03:00
Robin Gloster
04d4d14d6d
gawk: link gawk manpage to awk 2017-06-13 13:16:50 +02:00
Jörg Thalheim
f723f7ceb4 Merge pull request #26423 from sjagoe/fix-grin-dependencies
grin: Fix build dependencies
2017-06-10 12:02:18 +01:00
romildo
b5fc15610a colordiff: 1.0.16 -> 1.0.18 2017-06-08 14:57:22 -03:00
Linus Heckemann
3c3a25acc5 jing-trang: use jre_headless
This halves its closure size.
2017-06-07 15:18:41 +02:00
Simon Jagoe
0218408846 grin: Use fetchFromGitHub instead of fetchgit 2017-06-07 14:22:52 +03:00
Yann Hodique
ac0fc387b2 silver-searcher: 1.0.2 -> 2.0.0 2017-06-07 06:26:51 +02:00
Simon Jagoe
314da48f31 grin: Fix build dependencies
Using old source, grin was unable to build due to missing argparse pypi
package.
2017-06-06 15:14:17 +03:00
Eelco Dolstra
105f51f151 Merge pull request #26057 from armijnhemel/diffutils-3.6
diffutils: 3.5 -> 3.6
2017-05-24 18:12:28 +02:00
Armijn Hemel
bd500816f7 diffutils: 3.5 -> 3.6 2017-05-24 13:43:56 +02:00
Vladimír Čunát
8004e79415
Merge branch 'master' into staging 2017-05-24 03:24:06 +02:00
Robin Gloster
17a7ea7992
aha: 0.4.10.2 -> 0.4.10.6 2017-05-23 02:52:41 +02:00
Frederik Rietdijk
99cfab07b9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-22 09:21:40 +02:00
Robin Gloster
9516b038b7
basex: 8.3.1 -> 8.6.4 2017-05-21 20:27:44 +02:00
Vladimír Čunát
e9aeb55f3b
Merge branch 'master' into staging 2017-05-18 11:24:18 +02:00
Jörg Thalheim
eda502d143 Merge pull request #25847 from aneeshusa/update-icdiff-to-1.9.0
icdiff: 1.7.3 -> 1.9.0
2017-05-18 06:50:22 +01:00
Aneesh Agrawal
e75297abba icdiff: 1.7.3 -> 1.9.0
Also move to all-packages.nix,
because it is an application and not a library.
2017-05-17 03:12:14 -04:00
Ruben Maher
dfad5d3fed sift: fix build for darwin 2017-05-17 10:26:35 +09:30
mimadrid
56393d4471
ripgrep: 0.5.1 -> 0.5.2 2017-05-15 20:21:49 +02:00
Vladimír Čunát
51e0f8f759
Merge branch 'master' into staging
Some more larger rebuilds from master.
2017-05-12 12:03:37 +02:00