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 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing
changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
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 99f242bd00de583730303c0bc87811a157d8b4f9.
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