Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging
2016-08-29 00:24:47 +00:00
sternenseemann
2fce6824ee
a2ps: fix a misspelling in description
2016-08-28 22:32:32 +02:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Graham Christensen
6bfe459355
Merge pull request #17983 from ericsagnes/pkg/groonga
...
groonga: init at 6.0.7
2016-08-25 08:02:08 -04:00
Eric Sagnes
9dc5952bfa
kytea: init at 0.4.7
2016-08-25 17:36:33 +09:00
obadz
78b7529ee3
Merge branch 'master' into staging
2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23
Merge pull request #17685 from matthewbauer/darwin-misc2
...
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Shea Levy
ed20bbc8fb
Merge branch 'update_diffutils-3.5' of git://github.com/lancelotsix/nixpkgs into staging
2016-08-22 07:56:43 -04:00
Lancelot SIX
88949e6d13
diffutils: 3.3 -> 3.5
...
Releases announcements:
3.4: http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
3.5: http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00010.html
2016-08-21 14:33:29 +02:00
Matthew Bauer
a6faa04ee4
unrtf: fix darwin build
...
unrtf needs libiconv on Darwin. Linux has issues with the -liconv flag,
but it's provided by gcc anyway.
2016-08-16 19:25:46 +00:00
Matthew Bauer
2ecb5ddea7
odt2txt: fix darwin build
...
- needs libiconv in ld flags on clang
2016-08-16 19:25:44 +00:00
Shea Levy
9adad8612b
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
...
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0
, reversing
changes made to 760b2b9048
.
2016-08-15 19:05:52 -04:00
Vladimír Čunát
4fbb37c517
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1287298
2016-08-14 12:02:28 +02:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4
buildGoPackage: remove Go deps file libs.json
...
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Jean-Luc Jox
526291231b
par: init at 1.5.2
...
Issue #17521
2016-08-11 12:48:41 +02:00
Kyle McKean
de7a265117
reckon: init at 0.4.4
2016-08-10 14:16:24 +01:00
Lancelot SIX
8bff33a4ff
diffutils: 3.3 -> 3.4
...
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
for release announcement.
2016-08-10 14:54:49 +02:00
Lancelot SIX
c4b77c0f7c
Revert "diffutils: 3.3 -> 3.4"
...
This reverts commit 99f242bd00
.
It will go into staging before getting into master.
2016-08-10 14:52:20 +02:00
Lancelot SIX
99f242bd00
diffutils: 3.3 -> 3.4
...
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00004.html
for release announcement.
2016-08-10 13:45:09 +02:00
Tuomas Tynkkynen
b793398131
zimreader: Broken on i686
...
(Well, actually tntnet, but that derivation is defined in the same file).
http://hydra.nixos.org/build/38238028
2016-08-06 17:06:45 +03:00
Tobias Geerinckx-Rice
8cb6821679
aha: 0.4.8 -> 0.4.9
2016-08-04 00:25:20 +02:00
Robin Gloster
7423e029a2
convertlit: disable format hardening
2016-08-03 20:04:28 +00:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
db35d7b8ab
koji, opensp: Some meta fixes
2016-08-02 21:17:44 +03:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Benno Fünfstück
5e5165ec6f
platinum-searcher: 2.1.1 -> 2.1.3
2016-07-16 17:07:14 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Carl Sverre
0e6fbf83f8
sift: fix hydra build fail ( #16820 )
...
For some reason I haven't been able to figure out, sift does not build on OSX.
I think it is because sift uses cgo for some of its functionality which you can
see here:
https://github.com/svent/sift/blob/master/matching_cgo.go#L23
The error which hydra found (and is reproducible on OSX) can be seen here:
https://hydra.nixos.org/build/37169149
Ideally I would like to get sift building on OSX, however my nix-fu is weak.
Any suggestions are welcome. In the meantime I would like to get sift into one
of the release channels for Linux where it works fine.
2016-07-10 11:17:47 +02:00
Jonathan Glines
8199cda762
mecab: init at 0.996 ( #16175 )
...
Japanese morphological analysis system, used by Anki in particular
2016-06-26 22:47:23 +02:00
Carl Sverre
a12ec263fa
sift: init at 0.8.0
...
sift is a fast and powerful alternative to grep.
https://sift-tool.org
2016-06-25 14:10:34 -07:00
Bjørn Forsman
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Gabriel Ebner
4099bba676
silver-searcher: 0.31.0 -> 0.32.0
2016-06-19 19:01:03 +02:00
Nahum Shalman
0060a0f3df
shfmt: 2016-06-15 -> 2016-06-16 ( #16272 )
...
Among other improvements the author fixed mvdan/sh#13
2016-06-16 15:05:24 +01:00
Nahum Shalman
d624b02e1e
Add new package "shfmt"
2016-06-16 00:18:15 +00:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd
no more goPackages
2016-06-09 13:08:00 +02:00
Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
Matthias Beyer
871c4d78e8
diffstat: 1.60 -> 1.61
2016-06-03 16:04:41 +02:00
Matthias Beyer
97e64c3cf5
discount: 2.1.6 -> 2.2.0
2016-06-03 16:04:41 +02:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Vladimír Čunát
0b192a0976
Merge branch 'master' into staging
...
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Robert Helgesson
b717faf49f
xml2: add platforms field
2016-05-22 14:34:05 +02:00
Vladimír Čunát
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
8d473f107c
treewide: Make explicit that 'dev' output of readline is used
2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
3672f3edcb
treewide: Make explicit that 'dev' output of libxslt is used
2016-05-19 10:00:48 +02:00
Alexey Lebedeff
a4ecc91d39
platinum-searcher: init at 2.1.1
2016-05-18 19:24:10 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Matthias Beyer
4d2914ff9e
sourceHighlight: 3.1.7 -> 3.1.8
2016-05-16 16:12:21 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4
Merge branch 'master' to resolve conflicts
2016-05-05 08:25:38 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Tobias Geerinckx-Rice
be3d012da4
highlight: 3.18 -> 3.28
2016-05-03 04:33:49 +02:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Lancelot SIX
df42fe1582
pkgs.gnugrep: 2.22 -> 2.25
...
All releases between 2.22 and 2.25 are all bugfix releases:
- 2.23: http://lists.gnu.org/archive/html/info-gnu/2016-02/msg00000.html
- 2.24: http://lists.gnu.org/archive/html/info-gnu/2016-03/msg00004.html
- 2.25: http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00010.html
2016-04-28 19:38:54 +02:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Vladimír Čunát
7d7a9df360
html-tidy: fix on mingw
...
This doesn't fix the cross-build by itself due to
https://github.com/NixOS/nixpkgs/issues/14965
But in this case one can hack around that "easily" by:
(html-tidy.override {
inherit (/*non-cross nixpkgs eval*/)
cmake;
}).crossDrv
2016-04-25 10:09:15 +02:00
Vladimír Čunát
1c8ac52999
groff: now really fix build after --docdir fix
...
I forgot about some later changes around characters permitted in
$shareDocName.
2016-04-20 20:37:19 +02:00
Vladimír Čunát
60d6c5a92b
groff: fix build after --docdir fix
2016-04-20 16:38:42 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Joachim Fasting
36f7d498c9
unrtf: split man output
2016-04-15 17:41:41 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Franz Pletz
2e08d8234e
Merge remote-tracking branch 'origin/master'
2016-03-31 10:06:30 +02:00
Luca Bruno
04d4d0000f
namazu: mark as broken
2016-03-30 21:54:03 +02:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
Aneesh Agrawal
4fad4d49f6
icdiff: init at 1.7.3
2016-03-23 15:04:50 -04:00
joachifm
4f29a8c03e
Merge pull request #14023 from Adjective-Object/add/ansifilter
...
ansifilter: add @ 1.15
2016-03-22 00:44:49 +00:00
Maxwell
5c740539a8
ansifilter: init at 1.15
2016-03-21 09:42:32 -04:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
宋文武
93feb5d115
drop my maintainership ( close #13881 )
2016-03-13 18:39:01 +01:00
Joachim Fasting
5d2ed453b3
unrtf: move build deps to nativeBuildInputs
2016-03-12 19:06:56 +01:00
Wander Nauta
f70d678ec4
diction: init at 1.11
2016-03-08 11:53:39 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00
Robin Gloster
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
Ozan Sener
3a6b06f1be
wring: init at 1.0.0
2016-02-28 18:05:56 +02:00
zimbatm
17348dc094
Remove all dots at end of descriptions
...
Specially crafted for @JagaJaga
find pkgs -name "*.nix" -exec \
sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Frederik Rietdijk
40ca841c5c
Merge pull request #13124 from FRidh/buildPythonApplication
...
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Pascal Wittmann
f1a65b3443
Merge pull request #13241 from zimbatm/gist-4.5.0
...
gist: 4.4.2 -> 4.5.0
2016-02-22 09:16:07 +01:00
zimbatm
17ad5ab0a9
gist: 4.4.2 -> 4.5.0
...
Fixes #13158
2016-02-21 18:43:34 +00:00
Robin Gloster
bc21db3692
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-19 21:16:14 +00:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Nikolay Amiantov
199aeab96e
yaml-merge: init at 2016-02-16
2016-02-17 17:05:59 +03:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Robin Gloster
9375cd8e4d
untex: turn off format hardening
2016-02-12 15:14:12 +00:00
Eelco Dolstra
e2eca0c24c
Fix misspelled meta.maintainers attributes
2016-02-10 23:27:34 +00:00
Eelco Dolstra
aea262f654
Fix misspelled meta.maintainers attributes
2016-02-10 14:59:50 +01:00
Robin Gloster
a626fc9813
a2ps: turn off format hardening
2016-02-09 02:14:32 +00:00
Robin Gloster
79219c1981
patchutils: turn off format hardening
2016-02-07 15:07:42 +00: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
William A. Kennington III
05a9e34f8a
dos2unix: 7.0 -> 7.2.1
2015-04-05 23:04:23 -07:00
William A. Kennington III
008e3893d8
gawk: 4.1.0 -> 4.1.1
2015-03-26 15:13:50 -07:00
William A. Kennington III
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00