Commit graph

574 commits

Author SHA1 Message Date
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Badi' Abdul-Wahid
1cf106dd06 popfile: init at 1.1.3
Popfile by default assumes that it is run directly from the install
directory, in which it has full write access. This assumption is invalid
on Nix, and so Popfile is pachted to accomodate this:

- define `POPFILE_ROOT` in wrapper

  Default POPFile configuration assumes it is running in the
  installation directory. This patch wraps `popfile.pl` so that
  `POPFILE_ROOT` points to the installation directory

- define and create if missing `POPFILE_USER` in wrapper

  POPFile stores stores state in the `POPFILE_USER` directory, which by
  default is the installation directory. This change sets `POPFILE_USER`
  to `$HOME/.popfile` by default, creating it with 0700 mode if
  necessary.
2016-02-01 19:59:03 -05:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Lluís Batlle i Rossell
4eb1e346c6 Improving the patch for mairix for mbox>2GB.
https://github.com/rc0/mairix/pull/19
2016-01-15 16:00:46 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Lluís Batlle i Rossell
6401bb1795 mairix: add fix (patch) for big files. 2016-01-14 17:38:57 +01:00
Eelco Dolstra
3fdf018f77 gnugrep: Disable tests
The test long-pattern-perf is timing sensitive, so it can fail
randomly based on load.

http://hydra.nixos.org/build/30265484
2016-01-12 12:06:41 +01:00
Arseniy Seroka
e126769a68 Merge pull request #12267 from zimbatm/dos2unix-7.3.2
dos2unix: 7.3 -> 7.3.2
2016-01-09 23:52:39 +03:00
Yann Hodique
38c7c7b09e silver-searcher: 0.30.0 -> 0.31.0 2016-01-09 11:22:56 -08:00
zimbatm
b898959fc7 dos2unix: 7.3 -> 7.3.2 2016-01-09 16:46:03 +00:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Tobias Geerinckx-Rice
8924e770ca a2ps: fix evaluation 2016-01-01 22:03:21 +01:00
Benno Fünfstück
aaeba728b3 a2ps: new package 2016-01-01 19:11:58 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robert Helgesson
d66a1a46e6 colordiff: add archive URL
When a new version of colordiff is released the old tarball is moved to
the archive directory. This breaks builds until the derivation is
updated to the new version. This commit lets fetchurl know about the
archive URL.
2015-12-16 00:49:43 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Niclas Thall
eae3d7467b colordiff: 1.0.15 -> 1.0.16 2015-12-09 22:18:37 +01:00
Emery Hemingway
2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
81b9cc6f54 html-tidy: unify with its drop-in replacement tidy-html5
- the original project has been unmaintained for years
- some dependants needed to be patched due to renamed headers
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114
- separate tidy-html5 package was removed, as since the 5.0.0 version
  it's meant as a successor to both, and library name got back
  from libtidy5.so to libtidy.so
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666

/cc committers to tidy-html5: @edwjto and @zimbatm.
2015-11-29 10:32:02 +01:00
Matthijs Steen
8cd52ce5f7 basex: 7.8.2 -> 8.3.1 2015-11-27 21:56:31 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Marcus Crestani
64ef239c02 html2text: Enable on OS X. 2015-11-19 08:47:46 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Danny Wilson
11be480df4 Skip failing tests on SmartOS 2015-11-16 17:20:16 +01:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Domen Kožar
505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Domen Kožar
7f25bc8d0a Merge pull request #10871 from zimbatm/gist-4.4.2
gist: 4.3.0 -> 4.4.2
2015-11-11 12:18:23 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
zimbatm
c0278ded1c gist: 4.3.0 -> 4.4.2 2015-11-07 19:36:31 +00:00
zimbatm
efdcc6c16b tidy-html5: fix missing dependency
xsltproc is used during the build
2015-11-07 19:35:33 +00:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III
b983c6b9b5 grep: 2.21 -> 2.22 2015-11-03 20:54:22 -08:00
Stéphane Jourdois
42dfe8f4e1 ascii: allow build on darwin 2015-10-31 16:08:03 +01:00
Vladimír Čunát
8adabe6679 gawk: split $doc into $man and $info
Info files are rather large and not much used anymore, AFAIK.
(We include $man or $doc in the system closure by default.)
2015-10-28 10:16:55 +01:00
Vladimír Čunát
ad02a45af0 gnugrep: re-split the documentation stuff 2015-10-28 10:09:33 +01:00
Tuomas Tynkkynen
a39f5839ea groff: Fix multiple-output build 2015-10-03 14:08:50 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Arseniy Seroka
8eecf2d98a Merge pull request #10119 from k0ral/xurls
xurls: 0.7.0 -> 0.8.0
2015-09-28 23:04:14 +03:00
koral
02da999dc3 xurls: 0.7.0 -> 0.8.0 2015-09-28 17:56:15 +00:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Robbin C
3a8756913c zimreader: init at 20150710.
This adds zimreader, a tool to serve ZIM files using HTTP.

Its dependencies, cxxtools and tntnet are included in this derivation
because zimreader needs specific (not latest) versions of them
to compile.
2015-09-20 12:57:50 +08:00
Robbin C
d75152c028 zimwriterfs: init at 20150710.
This adds zimwriterfs, a console tool to create ZIM (http://www.openzim.org)
files from a locally stored directory containing 'self-sufficient'
HTML content (with pictures, javascript, stylesheets).
2015-09-19 19:44:20 +08:00
Bjørn Forsman
b8e776bbe4 diffstat: 1.59 -> 1.60
2015/07/07 (diffstat 1.60)
	+ add configure option --with-man2html

	+ update configure macros

	+ update config.guess, config.sub
2015-09-16 07:55:13 +02:00
Bjørn Forsman
a8b75d8777 ascii: 3.14 -> 3.15 2015-09-16 07:51:05 +02:00
Kovacsics Robert (NixOS-SSD2)
7234e89913 txt2tags: init at 2.6
txt2tags is a KISS markup language
2015-09-01 14:12:26 +01:00
William A. Kennington III
d96b30f5b0 dos2unix: 7.2.2 -> 7.3 2015-08-30 10:57:16 -07:00
koral
da6b369029 xurls: 0.6.0 -> 0.7.0 2015-08-29 23:46:18 +02:00
Philip Potter
44048385bd html-xml-utils: fix and bump to 6.9
6.4 had a compile error:

```
scan.l:136:7: error: expected identifier or ‘(’ before ‘__extension__’
char *strndup(const char *s, size_t n);
^
```

This is caused by the standard library strndup() now living in string.h
and conflicting with another strndup() declared in scan.l.  Version 6.9
fixes this.

This also removes the need for the boolean patch that we previously had.
2015-08-24 22:38:01 +01:00
Badi' Abdul-Wahid
978d4be3ab colordiff: support Darwin as a platform
This change just adds darwin to the supported platforms attribute of
the package.
2015-08-13 10:11:36 -04:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Tobias Geerinckx-Rice
e8596c189f colordiff: 1.0.13 -> 1.0.15
Changes:
- Big improvements to side-by-side diff detection
- Additional colordiffrc example colour scheme file to match 'git diff'
- Misc fixes
2015-07-27 01:54:08 +02:00
Eelco Dolstra
6a91bf20c8 groff: Move docs to separate output
This cuts the size of the package by ~10 MB.
2015-07-26 22:46:44 +02:00
Vladimír Čunát
52b3546e4a merge #8617: recoll: filters for LaTeX, RTF, and WP 2015-07-20 11:00:04 +02:00
Joachim Fasting
4bd52ddb88 untex: init at 1.2 2015-07-15 17:03:18 +02:00
Joachim Fasting
bcb314853a unrtf: init at 0.21.9 2015-07-15 17:03:17 +02:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Arseniy Seroka
2fa88f65ea Merge pull request #8812 from k0ral/xurls
xurls: init at 0.6.0
2015-07-14 14:13:08 +03:00
koral
562f760f20 xurls: init at 0.6.0 2015-07-14 08:27:29 +00:00
Jude Taylor
d0951cb68d darwin purity: recode 2015-06-25 16:36:05 -07:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
tv@shackspace.de
e14c8fd368 highlight: fixes an issue locating the default conf_dir, closes #8385 2015-06-24 17:19:56 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Jascha Geerds
a612e397d8 silver-searcher: Replace fetchurl with fetchFromGitHub 2015-06-22 16:19:23 +02:00
Jascha Geerds
b9cebbe9b1 silver-searcher: 0.29.1 -> 0.30.0 2015-06-22 12:10:03 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
lethalman
0243472c05 Merge pull request #8344 from joachifm/redundant-cheetah
Delete redundant expression cheetahTemplate
2015-06-18 14:51:17 +02:00
Joachim Fasting
ed554d5ae2 Delete redundant expression cheetahTemplate
Use the one provided by python-packages instead; retain the
top-level cheetahTemplate name as an alias.
2015-06-15 23:31:37 +02:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Tobias Geerinckx-Rice
776608a332 aha: remove default GitHub downloadPage 2015-06-12 02:27:53 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Florian Friesdorf
2876b726bd cygwin: currently no libsigsegv for x86_64-cygwin 2015-05-28 10:53:36 +02:00
Marko Durkovic
af5484a630 cygwin: opensp 2015-05-28 10:53:36 +02:00
Florian Friesdorf
15952587a0 cygwin gnugrep: disable check due to multibyte-white-space 2015-05-28 10:53:36 +02:00
William A. Kennington III
1b82194892 dos2unix: 7.2.1 -> 7.2.2 2015-05-26 01:36:35 -07:00
Edward Tjörnhammar
161fdec0f5 tidy-html5: added package, also provides libtidy5 2015-05-25 15:05:05 +02:00
William A. Kennington III
cdd93463c0 gawk: 4.1.2 -> 4.1.3 2015-05-24 00:19:35 -07:00
Eelco Dolstra
0cc883f2ee groff: Mark as unsafe for parallel building 2015-05-13 18:17:25 +02:00
Vladimír Čunát
cefdc20c00 gawk: disable doCheck again, add meta.platforms
It didn't work when chrooted.
2015-05-05 11:56:30 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
William A. Kennington III
08ffb05c7e gawk: 4.1.1 -> 4.1.2 2015-05-04 23:22:57 -07:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Tobias Geerinckx-Rice
999241a907 Add aha 0.4.8: quick & dirty ANSI-to-HTML converter 2015-04-28 00:10:14 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00