cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
119483 commits 1 branch 0 tags 3.7 GiB
Commit graph

865 commits

Author SHA1 Message Date
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
Benjamin Staffin
8d07a8b381 Merge pull request #24883 from lucas8/fanficfare 
fanficfare: init at 2.9.0
 2017-04-14 19:08:16 -04:00
lucas8
9d79418019 fanficfare: init at 2.9.0 2017-04-13 23:05:45 +02:00
Tuomas Tynkkynen
0d86c0692f gawk: Disable tests that don't work in sandbox 2017-04-11 23:37:31 +03:00
Tuomas Tynkkynen
1e1b68b4a0 patchutils: Drop patch applied upstream 2017-04-11 23:13:28 +03:00
Tuomas Tynkkynen
d550c90712 patchutils: 0.3.3 -> 0.3.4 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen
c7e1a25765 gawk: 4.1.3 -> 4.1.4 2017-04-11 13:00:56 +03:00
Tim Jaeger
1b6189117f
xsv: init at 0.11.0 
This commit adds the `xsv` utility. It is quite useful when dealing with CSV files
 2017-04-04 09:32:42 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Baptist BENOIST
7d72b9b74e Remove bbenoist from maintainers 
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
 2017-03-23 03:03:04 +01:00
Nick Hu
a185b1267f proselint: disable tests and put in correct scope 2017-03-22 18:03:38 +00:00
ndowens
93ec1ad987 highlight: 3.28 -> 3.35 (#24068) 
* highlight: 3.28 -> 3.35

highlight: Add support for darwin, suspecting needs gcc

highlight: Fixed isDarwin [gcc]

* highlight: enable darwin build
 2017-03-19 15:22:57 -05:00
Michael Raskin
8565047bdd kdiff3: fix build 2017-03-19 12:16:32 +01:00
Michael Raskin
f2bba743fb Merge pull request #23283 from alibabzo/init/proselint 
proselint: init at 0.8.0
 2017-03-18 18:29:20 +01:00
Daiderd Jordan
c8ddac7c76 Merge pull request #23864 from mimadrid/update/ripgrep-0.5.0 
ripgrep: 0.4.0 -> 0.5.0
 2017-03-15 21:42:23 +01:00
mimadrid
363cfbd23d
ripgrep: 0.4.0 -> 0.5.0 2017-03-13 22:48:38 +01:00
c74d
161d73c163 ripgrep: install man-page 
Modify the `ripgrep` package to install the tool's manual page.

I have tested this commit per nixpkgs manual section 11.1 ("Making
patches").
 2017-03-10 07:12:16 +00:00
Joachim Fasting
351d1d9032
zimwriterfs: 20150710 -> 1.0 2017-03-07 14:06:12 +01:00
mimadrid
2b38cbb329 qshowdiff: fix build 2017-03-04 12:45:12 +01:00
Alistair Bill
0904cf034c proselint: init at 0.8.0 2017-03-03 16:25:41 +00:00
Jörg Thalheim
98523861f6
highlight: disable darwin build 
https://hydra.nixos.org/build/49668465/nixlog/1
 2017-03-02 16:39:12 +01:00
Jörg Thalheim
de90e320c8 Merge pull request #23314 from ndowens/ansifilter 
Ansifilter: 1.15 -> 2.4
 2017-03-02 09:54:44 +01:00
Jörg Thalheim
c5a1625f85 Merge pull request #23309 from ndowens/enca 
enca: 1.16 -> 1.19
 2017-03-02 09:51:31 +01:00
Jörg Thalheim
03a8db5cdc Merge pull request #23308 from ndowens/highlight 
highlight: 3.28 -> 3.35
 2017-03-02 09:48:33 +01:00
Jörg Thalheim
85a1dd288b Merge pull request #23306 from ndowens/kytea 
kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6
 2017-03-02 08:44:14 +01:00
Peter Hoeg
0d936b0366 Merge pull request #23312 from ndowens/discount 
Discount: 2.2.0 -> 2.2.2
 2017-03-02 08:12:54 +08:00
ndowens
3df8bef60e discount: 2.2.0 -> 2.2.2 
Discount: added missing update
 2017-03-01 13:28:16 -06:00
ndowens
c393512809 catdoc: 0.94.2 -> 0.95 2017-03-01 19:18:20 +01:00
ndowens
614afce3a8 dos2unix: 7.3.2 -> 7.3.4 (#23310) 2017-03-01 14:29:46 +00:00
ndowens
38d9c0b88f ansifilter: 1.15 -> 2.4 2017-02-28 19:23:24 -06:00
Peter Hoeg
9a2b23427f Merge pull request #23300 from ndowens/xurls 
xurls: 0.8.0 -> 1.1.0
 2017-03-01 08:43:42 +08:00
ndowens
775e8eb4a4 enca: 1.16 -> 1.19 2017-02-28 18:05:03 -06:00
ndowens
9655567c09 highlight: 3.28 -> 3.35 2017-02-28 17:44:50 -06:00
Jörg Thalheim
d4c0bee936 Merge pull request #23305 from ndowens/numdiff 
numdiff: 5.8.1 -> 5.9.0
 2017-03-01 00:27:28 +01:00
ndowens
8f29ca2104 kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6 2017-02-28 17:26:26 -06:00
ndowens
cb766725c7 numdiff: 5.8.1 -> 5.9.0 2017-02-28 17:16:33 -06:00
ndowens
d02209edf2 wgetpaste: 2.25 -> 2.28 2017-02-28 23:34:40 +01:00
ndowens
e9c507e060 xul: 0.8.0 -> 1.1.0 2017-02-28 16:19:28 -06:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4 
Remove KDE 4 desktop packages
 2017-02-25 12:21:44 -06:00
edef
447ba91858 rnv: fix missing rec (#23162) 2017-02-25 01:40:02 +01:00
Thomas Tuegel
c9de5eca0f
Remove kde4.kdiff3 
- Already updated to KDE 5 in Nixpkgs
 2017-02-24 16:48:32 -06:00
Leon Isenberg
d556f53517 rnv: init at 1.7.11 2017-02-24 08:26:09 +01:00
Graham Christensen
fc45440b8f Merge pull request #22761 from mimadrid/update/ripgrep-0.4.0 
ripgrep: 0.3.2 -> 0.4.0
 2017-02-13 17:54:45 -05:00
mimadrid
51592a3f49
ripgrep: 0.3.2 -> 0.4.0 2017-02-13 22:38:36 +01:00
Vladimír Čunát
8f5b3ae07a
Merge branch 'master' into staging 2017-02-11 11:22:29 +01:00
Lancelot SIX
7031e8fd01
gnugrep: 2.27 -> 3.0 
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00005.html
and https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00006.html
for release information.
 2017-02-10 21:02:56 +01:00
Tuomas Tynkkynen
6a48087bc3 jade: Cleanup a bit 
- Include version number the name so Nix knows about it.
- gcc and gzip are implicitly included, no need to add them here.
- Add meta.platforms
 2017-02-10 20:12:00 +02:00
Vladimír Čunát
66fe4af226
Merge recent staging 
It's the version last built on Hydra, almost fully.
 2017-02-10 18:07:14 +01:00
mingchuan
c86b781c08 opencc: 1.0.4 -> 1.0.5 (#22516) 2017-02-09 15:35:17 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk
923793f99a xpf: use python2 2017-02-08 19:58:00 +01:00
Thomas Tuegel
f0bbf73e0b Merge pull request #22477 from peterhoeg/f/kdiff3 
kdiff3-qt5: init at 1.7.0
 2017-02-06 11:21:31 -06:00
TANIGUCHI Kohei
9d6f2fd297 nkf: 2.1.3 -> 2.1.4 2017-02-06 01:43:34 +01:00
Lancelot SIX
7702225ad1
gnused: 4.3 -> 4.4 
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00001.html
for release information.
 2017-02-04 14:13:58 +01:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Peter Hoeg
8d803b90ac kdiff3-qt5: init at 1.7.0 
Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
 2017-02-02 13:01:40 +08:00
Robert Helgesson
de172ae061
copyright-update: init at 2016.1018 2017-02-01 22:19:24 +01:00
Robin Gloster
61f893fb64
html-tidy: 5.0.0 -> 5.2.0 2017-01-25 20:12:42 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Jörg Thalheim
57b06f45db
ruby-zoom: use gemdir 2017-01-18 00:52:48 +01:00
Jörg Thalheim
4237a2bd18
reckon: use gemdir 2017-01-18 00:52:47 +01:00
John Ericson
27b47ef736 gawk: xz.bin should be a native build input 2017-01-14 17:54:53 -05:00
Tuomas Tynkkynen
e00c61fd36 gnused: Fix cross build after upgrade to 4.3.0 
Fixes:
````
  GEN      doc/sed.1
help2man: can't get `--help' info from sed/sed
make[2]: *** [Makefile:5775: doc/sed.1] Error 126
make[2]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make[1]: *** [Makefile:3024: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make: *** [Makefile:2156: all] Error 2
````

http://hydra.nixos.org/build/46051086/nixlog/11/raw
 2017-01-14 06:36:44 +02:00
Graham Christensen
2dab7782f3
unrtf: patch against CVE-2016-10091 2017-01-11 20:11:01 -05:00
Sarah Brofeldt
760710efd1 qualia: init at 1.0.0 
tests disabled
maintainer srhb
 2017-01-07 21:24:44 +01:00
Vladimír Čunát
07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
Vladimír Čunát
75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4 2017-01-06 14:05:22 +01:00
Vladimír Čunát
cb70a594cb
sed: bring back 4.2.2 temporarily 
It will be useful to fixup compatibility problems with [:space:].
 2017-01-06 10:53:25 +01:00
Nahum Shalman
1a80edba7d shfmt: 0.2.0 -> 1.1.0 2017-01-05 17:34:25 -05:00
Vladimír Čunát
be489cf48c
gnused: 4.2.2 -> 4.3 
Real replacement of #21646.
 2017-01-05 00:17:59 +01:00
Alexander Kahl
61d125b842 sssd: init at 1.14.2 
perlPackages.TextWrapI18N: init at 0.06
perlPackages.Po4a: init at 0.47
jade: init at 1.2.1
ding-libs: init at 0.6.0

Switch nscd to no-caching mode if SSSD is enabled.

abbradar: disable jade parallel building.

Closes #21150
 2017-01-04 03:07:20 +03:00
Benno Fünfstück
a55bf2b812 codesearch: init at 20150617 2016-12-27 15:13:07 +01:00
Vladimír Čunát
86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
Ricardo M. Correia
096e8ab45f Merge pull request #21218 from mimadrid/update/ripgrep-0.3.2 
ripgrep: 0.2.1 -> 0.3.2
 2016-12-17 13:39:56 +01:00
mimadrid
2077a60c2f
ripgrep: 0.2.1 -> 0.3.2 2016-12-17 00:16:40 +01:00
Tom Saeger
e0e1bdc25c Fixup description of ripgrep. 2016-12-15 17:41:22 -06:00
Jascha Geerds
b44e52b134 languagetool: Add myself as a maintainer 2016-12-15 22:18:29 +01:00
Vladimír Čunát
b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Lancelot SIX
4ea9f4e325
gnugrep: 2.25 -> 2.27 
See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00004.html
for release announcement.
 2016-12-08 17:28:52 +01:00
demoslam
d76c48796e silver-searcher: 0.33.0 -> 1.0.2 2016-12-06 22:22:03 -08:00
Pascal Wittmann
f7e0bc2ae7
Make all meta.maintainers attributes lists 2016-11-20 18:06:03 +01:00
Joachim Fasting
f32a8eb6cc
xidel: refactor & fix eval 
- Fix eval by removing reference to non-existent stdenv.glibc
- Simplify patchelf calls
- Set meta.platforms = linux
 2016-11-19 14:29:22 +01:00
Tobias Geerinckx-Rice
3c3dfbc402
aha: 0.4.10.1 -> 0.4.10.2 2016-11-15 21:44:04 +01:00
Tobias Geerinckx-Rice
7981d3437d
aha: 0.4.9 -> 0.4.10.1 2016-11-14 14:14:52 +01:00
mingchuan
edc5cdc3c8 opencc: init at 1.0.4 2016-11-10 01:48:28 +01:00
Joachim F
be59aa055b Merge pull request #20178 from 8573/8573/pkg/add/agrep/1 
agrep: init at 3.41.5
 2016-11-06 15:18:39 +01:00
Vladimír Čunát
cb6a81c607
jing-trang: fixup indentation problems 2016-11-05 10:17:56 +01:00
Vladimír Čunát
fbb33ab8c9 saxon: use our standard share/java/*.jar location 2016-11-05 10:17:44 +01:00
Vladimír Čunát
c6fcd28e2d
jing-trang: add back and update; removed in #20142 
This fixes the tarball, as we use jing to validate nixpkgs manual!
/cc maintainer @bjornfor.
 2016-11-05 10:03:29 +01:00
c74d
0033f6076e agrep: init at 3.41.5 
In category `tools`, subcategory `text`, add a package definition for
the program [`agrep`] [1] — "Approximate `grep` for fast fuzzy string
searching".

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").

[1]: <https://www.tgries.de/agrep/>
 2016-11-05 08:55:29 +00:00
Tim Steinbach
6dd1796b0e
Remove trang 
Source no longer exists
 2016-11-04 10:54:09 -04:00
Tim Steinbach
7329435fab
Remove jing 
No longer exists
 2016-11-04 10:27:01 -04:00
Jascha Geerds
9ca0521099 silver-searcher: 0.32.0 -> 0.33.0 2016-10-30 01:12:41 +02:00
zimbatm
9970b28680 Merge pull request #19799 from vmandela/ruby-zoom 
ruby-zoom: init at 4.1.0
 2016-10-26 13:18:43 +01:00
Venkateswara Rao Mandela
219b9d5086 ruby-zoom: init at 4.1.0 
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
 2016-10-26 17:26:26 +05:30
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Frederik Rietdijk
f7b983aeaf grin: use python2 2016-10-18 23:14:33 +02:00
Graham Christensen
bd2ad683d3 Merge pull request #19483 from RamKromberg/fix/a2ps 
a2ps: fix build
 2016-10-15 13:18:29 -04:00
Nahum Shalman
94cf6fbc35 shfmt: 2016-06-16 -> 0.2.0 2016-10-13 15:24:39 -04:00
Ram Kromberg
1b0163ea16 a2ps: fix build 2016-10-12 14:15:21 +03:00
Jörg Thalheim
2d9148dc8a Merge pull request #17815 from juliendehos/zimreader_tntnet221 
zimreader: update for using tntnet-2.2.1 ?
 2016-10-08 23:17:12 +02:00
Julien Dehos
5ddf7e0f10 zimreader: update for using tntnet-2.2.1 2016-10-08 16:55:07 +02:00
Bjørn Forsman
1021797201 languagetool: fix eval 2016-10-05 17:04:50 +02:00
Edward Tjörnhammar
e4bdbfc247
languagetool: init at 3.5 2016-10-05 15:11:20 +02:00
Benno Fünfstück
4c493a32f9 ripgrep: update 0.1.17 -> 0.2.1 2016-09-29 00:51:14 +02:00
Franz Pletz
76b142b915 Merge pull request #18894 from tailhook/ripgrep 
Add ripgrep package
 2016-09-25 14:28:29 +02:00
Franz Pletz
c39195d699
a2ps: fix CVE-2001-1593 & CVE-2014-0466 2016-09-24 15:33:03 +02:00
Paul Colomiets
1255d60b35 ripgrep: init at 0.1.17 2016-09-23 23:53:54 +03:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Ram Kromberg
14e9972e49 groff: add missing depedencies for optional postscript and html outputs 2016-09-13 23:38:05 +03:00
Bjørn Forsman
7ffbe5174f sablotron: update source URL 
The current URL no longer works, switch to a sourceforge mirror URL.
Fixes issue #18337.
 2016-09-08 15:33:31 +02:00
Sander van der Burg
8bedff0e92 wring: use node2nix generated package 2016-09-01 20:50:08 +00:00
Tuomas Tynkkynen
048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
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