JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,317 Commits 2 Branches 0 Tags 12 GiB
5120601c28
Commit Graph

1735 Commits

Author SHA1 Message Date
Nikolay Amiantov
43930f4057 tlp: 0.7 -> 0.8 2015-10-15 17:07:39 +03:00
Nikolay Amiantov
0645e6b43f sdl-jstest: 20150625 -> 20150806 2015-10-15 17:07:39 +03:00
Eelco Dolstra
11aef37ca6 less: Update to 481 2015-10-14 13:55:43 +02:00
Eric Sagnes
d6c0c0e3c9 goaccess: 0.9 -> 0.9.4 2015-10-13 22:14:27 +09:00
Ricardo M. Correia
f86080cdb3 youtube-dl: 2015.08.28 -> 2015.10.06.2 2015-10-07 20:06:11 +02:00
Thomas Strobel
5b800ea05e trustedGRUB2: 1.2.0 -> 1.2.1 2015-10-06 20:12:39 +02:00
Allan Espinosa
80ac72bbab screen: fix utmp.c compile problem in darwin 
Apply the patch specified in http://savannah.gnu.org/bugs/?45359
 2015-10-06 22:46:48 +09:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
 2015-10-06 15:24:20 +02:00
Pascal Wittmann
5c66135b25 parallel: 20150822 -> 20150922 2015-10-06 13:13:57 +02:00
Jude Taylor
0a32eab91e fix LLVM packages to work in darwin stdenv 2015-10-05 08:46:56 -07:00
William A. Kennington III
2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
lethalman
e9d554580c Merge pull request #10066 from michaelpj/p/heatseeker 
heatseeker: init at 1.3.0
 2015-10-02 11:36:07 +02:00
Eelco Dolstra
b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Rickard Nilsson
94eac9ccbd opentsdb: 2.1.0 -> 2.1.1 2015-09-29 14:26:12 +02: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
Arseniy Seroka
5afb75464f Merge pull request #10057 from matthiasbeyer/update-multitail 
multitail: 6.2.1 -> 6.4.1
 2015-09-27 01:39:41 +03:00
aszlig
8e44a66b3b
toilet: init at 0.3 
It's a replacement for the figlet utility based on libcaca and has a few
more features, such as:

 * The ability to load FIGlet fonts
 * Support for Unicode input and output
 * Support for colour fonts
 * Support for colour output
 * Support for various output formats: HTML, IRC, ANSI...

I've stolen the description from the Debian package:

https://packages.debian.org/sid/toilet

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-26 21:04:15 +02:00
Matthias Beyer
fb99a1d410 multitail: 6.2.1 -> 6.4.2 
This patch includes:

    * multitail: Move version to own variable
    * multitail: Add myself as package maintainer
 2015-09-26 11:03:17 +02:00
Michael Peyton Jones
ef8e002bf0 heatseeker: init at 1.3.0 2015-09-25 16:27:43 +01:00
Patrick Mahoney
71025243a1 s6-portable-utils 2.0.5.0 -> 2.0.5.2 2015-09-24 20:13:27 -05:00
Patrick Mahoney
1fcf088a6a execline 2.1.2.0 -> 2.1.4.0 2015-09-23 22:23:21 -05:00
William A. Kennington III
d3f4ba9d6f Merge branch 'master.upstream' into staging.upstream 2015-09-23 14:44:21 -07:00
William A. Kennington III
6c6ebacf8b yubikey-personalization: 1.17.1 -> 1.17.2 2015-09-23 12:30:00 -07:00
Andreas Wagner
23ed438d5a urjtag: enable various features 
[Bjørn: commit message: enabled -> enable]
 2015-09-23 21:03:11 +02:00
Andreas Wagner
52379183e1 urjtag: path fixes, use svn to get version string 
If built from svn:

  $ jtag --version
  UrJTAG 0.10 #2051

If built from git:
  $ jtag --version
  UrJTAG 0.10 #

Also, with svn we don't need to download the web/ subdirectory because
svn supports partial repository clones.

[Bjørn: extend commit message]
 2015-09-23 20:59:37 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
William A. Kennington III
bd0120202e file: 5.24 -> 5.25 2015-09-22 14:30:16 -07:00
Matthias Beyer
5dcb0c944f slop: 4.1.15 -> 4.1.16 2015-09-22 01:57:11 +02:00
Eelco Dolstra
01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219 
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
 2015-09-21 12:57:30 +02:00
Arseniy Seroka
e142ad39aa Merge pull request #9959 from matthiasbeyer/update-pal 
pal: 0.4.2 -> 0.4.3
 2015-09-20 22:51:37 +03:00
Matthias Beyer
34b3860909 pal: 0.4.2 -> 0.4.3 2015-09-20 15:36:31 +02:00
Pascal Wittmann
aeb4aa05f6 Merge pull request #9951 from dezgeg/pr-update-sl 
sl: 3.03 -> 5.02
 2015-09-20 12:34:02 +02:00
Tuomas Tynkkynen
4cf60b3452 sl: 3.03 -> 5.02 
- Source moved to GitHub
- No need to patch Makefile
- Install manpage
 2015-09-20 02:55:55 +03:00
William A. Kennington III
fcbce03142 Merge pull request #9950 from dezgeg/pr-update-picocom 
picocom: 1.8 -> 2.0
 2015-09-19 16:30:05 -07:00
Tuomas Tynkkynen
8756ac99eb picocom: 1.8 -> 2.0 
- Upstream changed manpage filename
- Home page no longer at Google Code
 2015-09-20 02:26:56 +03:00
Arseniy Seroka
6c2993284a Merge pull request #9929 from oxij/fdupes-jody 
fdupes: switch to fdupes-jody patch set
 2015-09-19 01:37:19 +03:00
Jan Malakhovski
6640a241d2 fdupes: switch to fdupes-jody patch set 
This adds a lot of useful features implemented in a reasonable way (unlike
debian patches).
 2015-09-18 22:31:23 +00:00
William A. Kennington III
f1c67b858d yubikey-personalization-gui: 3.1.20 -> 3.1.21 2015-09-18 14:52:51 -07:00
William A. Kennington III
db031b5dff yubico-piv-tool: 0.1.6 -> 1.0.2 2015-09-18 14:52:51 -07:00
Eelco Dolstra
e70593389f Another libgudev dependency 2015-09-17 17:44:59 +02:00
Edward Tjörnhammar
54ced3be71 Merge pull request #9856 from rycee/bump/svtplay-dl 
svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13
 2015-09-16 13:51:21 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
vbgl
39af9df25b Merge pull request #9866 from ericsagnes/byobu 
byobu: fixup script paths (closes #9865)
 2015-09-15 08:58:59 +02:00
Eric Sagnes
ad3193e59a byobu: fixup script paths 2015-09-15 15:42:20 +09:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Robert Helgesson
d749f111ab svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13 2015-09-14 20:08:56 +02:00
Pascal Wittmann
3ed2f6a621 zsh-navigation-tools: init at 1.2 2015-09-13 14:39:46 +02:00
Paulus Esterhazy
caf43ad5af parallel: no dependency on procps on Darwin 
Fixes #9592
 2015-09-11 11:11:35 +02:00
Tobias Geerinckx-Rice
d972665858 man-db: 2.7.2 -> 2.7.3 2015-09-10 23:01:59 +02:00
Damien Cassou
c28ee050ac Merge pull request #9673 from DamienCassou/new-tmate 2015-09-08 14:54:36 +02:00
Damien Cassou
1b55859d2a tmate: init at 1.8.10 2015-09-08 13:13:19 +02:00
Pascal Wittmann
ffc12580a6 cv: adopt its new name 'progress' 2015-09-06 20:57:57 +02:00
Jaka Hudoklin
f364702bb7 logstash: fix description and make install process more compact 2015-09-06 14:51:10 +02:00
Pascal Wittmann
90d628b040 cv: update from 0.8 to 0.9 2015-09-05 11:20:28 +02:00
William A. Kennington III
8f34c44824 asciinema: Move to go-packages 2015-09-02 17:43:36 -07:00
William A. Kennington III
a8d64c8eea fzf: Move to go-packages and 0.10.0 -> 0.10.4 2015-09-02 17:27:03 -07:00
William A. Kennington III
dea4d952ae ngrok: Move to go-packages 2015-09-02 17:18:40 -07:00
Kovacsics Robert (NixOS-SSD2)
83eed584bf remind: 3.1.14 -> 3.1.15 2015-09-02 09:56:35 +01:00
Luca Bruno
24ae56e7fe ngrok: fix build 2015-09-01 11:59:01 +02:00
Mateusz Kowalczyk
adbb5d7ca6 youtube-dl: update to 2015.08.28 2015-08-31 23:57:16 +01:00
Arseniy Seroka
b653aac1cc Merge pull request #9576 from rnhmjoj/bdf2psf 
bdf2psf: init at 1.132
 2015-08-31 23:58:50 +03:00
Tobias Geerinckx-Rice
45d5833e82 debian_devscripts: 2.15.4 -> 2.15.8 
Also:
- add some previously missing dependencies and patch /usr paths
- fix fetching of https:// URIs with perlPackages.LWPProtocolHttps
- remove the bash completion work-around (no longer needed)
- add newly required make flags
- change licence from string to attribute (still unspecified)

CC maintainer @raskin.
 2015-08-31 17:17:32 +02:00
rnhmjoj
d4b4647857 bdf2psf: init at 1.132 2015-08-31 16:04:32 +02:00
Andreas Wagner
e7a024abc4 urjtag: init at 0.10 
[Bjørn: make the function argument lines occupy less vertical space.]
 2015-08-30 20:47:24 +02:00
Daniel Fox Franke
36ac761340 expect: fix Darwin linkage 
expect's build system doesn't seem to provide the proper linker flags
for the expect programs to be able to find libexpect on Darwin. (Stuff
like this should really just use libtool. *sigh*). Setting
DYLD_LIBRARY_PATH is an inelegant hack, but it gets the job done
without risking affecting other platforms.
 2015-08-30 00:50:48 +02:00
William A. Kennington III
4121c5064a parallel: Fix some needed dependencies 2015-08-29 10:49:23 -07:00
Domen Kožar
07ca74f60f Merge pull request #9481 from rycee/fix/xdaliclock 
xdaliclock: replace use of builderDefsPackage
 2015-08-27 18:41:00 +02:00
Damien Cassou
7043fa844c Merge pull request #9479 from DamienCassou/update-umlet-13.3 
umlet 13.2 → 13.3
 2015-08-27 17:20:16 +02:00
Damien Cassou
3dc24b9e53 umlet 13.2 → 13.3 2015-08-27 17:14:54 +02:00
Robert Helgesson
6a41cb828e xdaliclock: replace use of builderDefsPackage 2015-08-27 16:44:23 +02:00
William A. Kennington III
00fd3b25f9 parallel: 20150722 -> 20150822 2015-08-27 01:02:35 -07:00
Robert Helgesson
8dc7eb9611 svtplay-dl: 0.10.2015.05.24 -> 0.10.2015.08.24 2015-08-26 08:42:42 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Samuel Rivas
c41a62aa98 colord: 1.2.3 -> 1.2.12 
* Use fetchzip instead of fetchurl
 2015-08-24 19:52:37 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Nikolay Amiantov
d0a03e078c tlp: install man pages 2015-08-23 17:33:49 +03:00
Phil Scott
3bbd79aaa6 scanmem: init at 0.15.2 
[Bjørn: Remove trailing dot in description.]
 2015-08-23 15:25:52 +02:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Pascal Wittmann
d73829576d rrdtool: update from 1.5.3 to 1.5.4 2015-08-21 08:49:49 +02:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jaka Hudoklin
9146edd5be logstash: 1.4.2 -> 1.5.3 2015-08-20 00:34:23 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III
88b1d7e5d9 logstash-forwarder: 20141216 -> 0.4.0 2015-08-19 13:25:44 -07:00
Arseniy Seroka
e197085b45 Merge pull request #9289 from jb55/antimicro-patch 
antimicro: init at 2.18
 2015-08-19 14:45:12 +03:00
Mateusz Kowalczyk
ccb9acc43e youtube-dl: update to 2015.08.16.1 2015-08-19 00:45:59 +01:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
William A. Kennington III
9fa56e49d7 man-db: 2.7.1 -> 2.7.2 2015-08-18 11:29:36 -07:00
William A. Kennington III
810a033d1b picocom: 1.7 -> 1.8 2015-08-17 13:14:59 -07:00
William Casarin
aba6c9e9cb antimicro: init at 2.18 
antimicro is a graphical program used to map keyboard keys and mouse controls
to a gamepad. Useful for playing PC games with no gamepad or poor gamepad
support.
 2015-08-16 20:07:23 -07:00
zimbatm
67c9a485b7 direnv: 2.6.0 -> 2.7.0 2015-08-15 22:39:03 +01:00
Pascal Wittmann
72bfb93beb plowshare: move from googlecode to github 2015-08-15 21:04:32 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Badi' Abdul-Wahid
aed29abec7 keychain: support Darwin as a platform 
This change provides support for Darwin as a platform by making the
`procps` parameter optional. If the platform is linux, then
`procps`/bin is added to the wrapped keychain's PATH, else not.
 2015-08-12 11:46:56 -04:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Jascha Geerds
6699992368 vdirsyncer: 0.5.2 -> 0.6.0 2015-08-07 12:18:24 +02:00
lethalman
203e32e871 Merge pull request #9113 from dezgeg/pr-diffoscope 
debbindiff: Rename to 'diffoscope' and update 26 -> 29 (plus some Python deps)
 2015-08-06 11:53:26 +02:00
William A. Kennington III
0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Pascal Wittmann
6bacb60ca9 screenfetch: add grep to PATH, closes #9088 2015-08-05 14:44:41 +02:00
Tobias Geerinckx-Rice
02319b63e0 gparted: update home page 
Downloads are still hosted by Sourceforge :-(
 2015-08-05 00:57:04 +02:00
Tobias Geerinckx-Rice
6ee6e9fa57 gparted: 0.22.0 -> 0.23.0 
Key changes include:
- Add partition name to create dialog and enable online naming
  (relevant for GPT partitioned disk)
- Show serial number in device information
- Add support for btrfs set new file system UUID
- Prevent UI hang when resizing FAT16/32, HFS and HFS+ file systems
 2015-08-05 00:57:03 +02:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Luca Bruno
4a96fa92db cpulimit: does not build on darwin (ZHF) 2015-08-04 10:40:44 +02:00
Tuomas Tynkkynen
ba5402a328 debbindiff: Rename to 'diffoscope' and update 26 -> 29 
Upstream has changed the project name to 'diffoscope' since "debbindiff
has grown way beyond a being just a tool to compare Debian packages."

Besides the rename, there are new dependencies on ssdeep, libarchive-c
and sqlite.
 2015-08-04 09:27:33 +03:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
William A. Kennington III
f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
Tobias Geerinckx-Rice
9cd4763e9c ipad_charge: init at 2015-02-03 2015-08-03 01:45:13 +02:00
Thomas Strobel
192091dc06 trustedGRUB2: git -> 1.2.0 2015-08-02 23:03:45 +02:00
William A. Kennington III
1dab05033f Merge branch 'master.upstream' into staging.upstream 2015-08-01 19:18:08 -07:00
Pascal Wittmann
9cac20afa8 cv: update from 0.7.1 to 0.8 2015-08-01 21:13:38 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Tobias Geerinckx-Rice
2ed604e566 Merge pull request #8937 from cheecheeo/entr_init 
entr: init at 3.2
 2015-07-31 12:45:50 +02:00
John Chee
6c14111c9d entr: init at 3.2 2015-07-30 23:05:38 -07:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
William A. Kennington III
428f9ad382 mongodb-tools: Use mongo-tools from goPackages 2015-07-30 11:19:07 -07:00
Pascal Wittmann
290fc1d044 parallel: update from 20150622 to 20150722 2015-07-29 22:38:07 +02:00
Pascal Wittmann
3df27bec74 bmon: update from 3.7 to 3.8 2015-07-29 22:36:55 +02:00
Bjørn Forsman
72d7e4048c moreutils: 0.55 -> 0.57 
(Implicitly fixes build, since 0.55 source has disappeared.)

Also add needed "docbook_xml_dtd_44" dependency for the new version.
 2015-07-29 15:46:15 +02:00
devhell
4838367a5e profile-cleaner: 2.34 -> 2.35 
Built and tested locally. Unfortunately there is no clear changelog
available.
 2015-07-28 22:13:35 +01:00
Nikolay Amiantov
b2d5326e3a sdl-jstest: update package 2015-07-28 12:33:30 +03:00
Raymond Gauthier
71a1e3acb6 pipelight: Add support for 32 bit linux. 
Done so by using the 32 bit stdenv as the requirement
of this package was to be provided with a 32 bit
compiler.
 2015-07-26 09:40:02 -04:00
Vladimír Čunát
a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
lethalman
5d60c20fd8 Merge pull request #8731 from cheecheeo/fzf-master 
fzf
 2015-07-24 10:13:01 +02:00
Samuel Rivas
55ad2d2150 Fix wyrd to compile with ocaml 4.02 
camlp4 is now a separate package instead of shipping within the ocaml package
 2015-07-23 19:50:01 +02:00
William A. Kennington III
754f21df19 file: Fix hash 2015-07-17 14:37:48 -07:00
William A. Kennington III
fd5f56dc50 file: 5.23 -> 5.24 2015-07-17 14:37:20 -07:00
Vladimír Čunát
9f37e91ec5 Merge master into staging 
There are larger-rebuild changes: gnutls and samba.
 2015-07-17 06:38:04 +02:00
John Chee
17c1428bfb fzf: 0.9.13 -> 0.10.0 2015-07-15 19:59:20 -07:00
Robert Helgesson
d68d929291 dtach: fix CVE-2012-3368 2015-07-15 18:19:46 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
William A. Kennington III
d253b3d875 coreutils: Skip sparse cp test as it fails reliably with btrfs on ubuntu 14.04 2015-07-13 13:48:59 -07:00
Tuomas Tynkkynen
3b81288a58 debbindiff: init at version 26 
[Bjørn: set namePrefix = "" to align attrname/pkgname, break overlong
lines, change patchPhase into postPatch so that 'patches' can still be
used.]
 2015-07-13 08:31:55 +02:00
Tuomas Tynkkynen
2ad7463144 pythonPackages.magic: Fix loading libmagic.so 
Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
 2015-07-13 08:29:05 +02:00
John Chee
ec6e64a371 fzf: add magnetophon as a maintainer 2015-07-11 10:30:51 -07:00
John Chee
9e2da99cc7 fzf: whitespace 2015-07-10 10:52:23 -07:00
William A. Kennington III
48f44bfa69 grub2: 2015-05-14 -> 2015-07-05 2015-07-09 22:17:54 -07:00
John Chee
fb371c0642 fzf: init at 0.9.13 
patch by @magnetophon
 2015-07-09 18:05:14 -07:00
William A. Kennington III
6aa4714dba coreutils: 8.23 -> 8.24 2015-07-06 17:37:18 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Thomas Strobel
2285ad1bfa trustedGRUB: GRUB 1 based -> GRUB 2 based 2015-07-05 11:48:36 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Matthias Beyer
ab9e853801 cloc: 1.62 -> 1.64 2015-07-01 20:42:44 +02:00
Shea Levy
dd9530c819 Merge remote-tracking branch 'projectorhq/riemann-tools' 
Add riemann-tools package and service
 2015-07-01 08:45:33 -04:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Robert Pitts and Trenton Strong
bbb36ea039 Add riemann-tools to nixpkgs 
Adds package via bundlerEnv and service for Riemann health.
 2015-06-30 17:16:51 -04:00
Jascha Geerds
db53d84a98 screen: 4.3.0 -> 4.3.1 2015-06-30 22:59:15 +02:00
Pascal Wittmann
e46933f554 bmon: update from 3.6 to 3.7 2015-06-30 18:22:25 +02:00