Commit graph

884 commits

Author SHA1 Message Date
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Jörg Thalheim
8d4f6ece15 Merge pull request #28602 from sigma/pr/silver-searcher-2.1.0
silver-searcher: 2.0.0 -> 2.1.0
2017-08-27 06:17:18 +01:00
Yann Hodique
04ff3e137d
silver-searcher: 2.0.0 -> 2.1.0 2017-08-26 12:00:52 -07:00
mimadrid
c3f28f84a8
xsv: 0.12.1 -> 0.12.2 2017-08-26 20:07:18 +02:00
Joachim Fasting
0387f84cf3
Revert "xsv: 0.12.1 -> 0.12.2"
This reverts commit edb61d1151.

The sha256 is malformed.
2017-08-26 18:45:41 +02:00
mimadrid
edb61d1151
xsv: 0.12.1 -> 0.12.2 2017-08-26 16:09:25 +02:00
Frederik Rietdijk
665d393919 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-25 19:39:41 +02:00
dywedir
5db77990db ripgrep: 0.5.2 -> 0.6.0 2017-08-25 01:25:02 +03:00
Vladimír Čunát
8137a8cb73
gawk: refactor
- Don't build with libsigsegv by default.  The build apparently attempted
  to link against it, but it never retained the reference anyway...
- Side effect: stdenv bootstrapping needs no libsigsegv anymore.
- Run checks, but only in the interactive gawk by default on Linux,
  so that stdenv bootstrap isn't slowed down (by glibc locales, etc.).
- xz should be no longer needed in inputs, as we have it in stdenvs now.

The whole change was triggered by some used kernel versions still
breaking libsigsegv tests #28464.
2017-08-24 11:06:53 +02:00
John Ericson
63428ebab9 diffutils: coreutils is a run-time dep; specify pr's location 2017-08-16 11:54:34 -04:00
Frederik Rietdijk
62dac1bdd9 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Vladimír Čunát
34946256a0
Merge #27424: stdenv: Don't put man pages into $doc 2017-08-13 19:32:51 +02:00
Frederik Rietdijk
7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Frederik Rietdijk
2a8cd14d5f Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-13 09:50:47 +02:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Robin Gloster
14080832b0
spCompat: remove
not used anymore
2017-08-11 13:26:50 +02:00
Domen Kožar
486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Robin Gloster
28cc2642f0
treewide: use less phases if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
2017-08-11 11:40:36 +02:00
Silvan Mosberger
310563fab8
gist: 4.5.0 -> 4.6.1 2017-08-10 04:52:16 +02:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
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
Peter Hoeg
641c4116a9 kdiff3: 2016-04-20 -> 2017-02-19 2017-05-11 21:10:00 +08:00
Franz Pletz
d43a2ef80a Merge pull request #25593 from mimadrid/update/languagetool-3.7
languagetool: 3.5 -> 3.7
2017-05-10 03:45:38 +02:00
Vladimír Čunát
8b01ec9a9e
Merge branch 'master' into staging 2017-05-10 00:54:53 +02:00
c74d
7cf29e1305 staccato: init at 0.1.6
Add the package `staccato`, "a command line program that lets you
compute statistics from values from a file or standard input".

I have tested this change per nixpkgs manual section 13.1 ("Making
patches").
2017-05-08 07:03:10 +00:00
mimadrid
7fb709a5ab
languagetool: 3.5 -> 3.7 2017-05-07 23:18:49 +02:00
Vladimír Čunát
fa5d543770
Merge branch 'master' into staging 2017-05-06 13:24:28 +02:00
William Casarin
8d03054f77 mb2md: init at 3.20 2017-05-05 08:52:06 -07:00
Frederik Rietdijk
c520e79842 Merge remote-tracking branch 'upstream/master' into HEAD 2017-05-03 09:59:49 +02:00
Aneesh Agrawal
ded7953478 treewide: meta.platform -> meta.platforms 2017-05-02 19:32:02 -04:00
Michael Raskin
7527355840 Merge pull request #25218 from expipiplus1/cross-llvm
Fix cross compilation of LLVM-3.9
2017-05-02 22:24:41 +02:00
Matthew Bauer
1234825656 xsv: fix "has invalid meta attribute"
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]
2017-05-02 21:04:34 +02:00
Matthew Bauer
aac48708c1 jing-trang: supports all unix
This is needed to build the manual on macOS.
2017-05-02 20:52:19 +02:00
Michael Raskin
a5f436814a Merge pull request #21017 from AndersonTorres/rst2html5
rst2html5: init at 1.9.3
2017-05-01 23:58:28 +02:00
AndersonTorres
4a87eae13c rst2html5: put its expression in a separate file
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
2017-05-01 18:12:36 -03:00
Yann Hodique
5c9986e406 the_platinum_searcher: 2.1.3 -> 2.1.5 2017-04-30 12:51:58 -07:00
Michael Raskin
ba974d4b74 Merge pull request #24214 from NickHu/proselint
proselint: disable tests and put in correct scope
2017-04-25 23:18:34 +02:00
Joe Hermaszewski
3eee6ea7c1 groff: use buildPackages to fix cross compile 2017-04-25 19:59:35 +00:00
Domen Kožar
9f11d17ed2
add papertrail at 0.10.1
Thank you @grahamc <3
2017-04-24 17:05:03 +02:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer
d3084b2798
sourceHighlight: supports darwin 2017-04-23 18:08:35 -05:00
Vladimír Čunát
5a3e454db3
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Tuomas Tynkkynen
814772e93e Revert "patchutils: 0.3.3 -> 0.3.4"
This reverts commit d550c90712.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen
f3b1d6925e Revert "patchutils: Drop patch applied upstream"
This reverts commit 1e1b68b4a0.
2017-04-23 21:46:29 +03:00
Cray Elliott
df86c9731b ripgrep: 0.5.0 -> 0.5.1 2017-04-22 19:03:09 -07:00
Vladimír Čunát
b72d4e13c7
kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Benno Fünfstück
cfcceaee27 Merge pull request #24473 from jgertm/tj/xsv
xsv: init at 0.11.0
2017-04-22 00:26:10 +02:00
Vladimír Čunát
be7ce1b0e9
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00