mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Code Issues Wiki Activity
111752 commits 265 branches 124 tags 5.2 GiB
Commit graph

2986 commits

Author SHA1 Message Date
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel 3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version 
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
 2017-06-18 08:41:57 -05:00
Eric Sagnes b9eecf80e7 tmuxinator: 0.8.1 -> 0.9.0 2017-06-18 20:45:51 +09:00
Pascal Wittmann 2fd359c978
rrdtool: 1.6.0 -> 1.7.0 2017-06-18 11:53:17 +02:00
Pascal Wittmann b49689e6f7
parallel: 20170422 -> 20170522 2017-06-18 11:48:33 +02:00
Vladimír Čunát d88c0cf867
Merge #26628: treewide: setuid/setgid fallout 2017-06-17 13:23:39 +02:00
Jörg Thalheim ca6bb9098c uucp: add remark to patch 2017-06-17 10:44:33 +01:00
Bart Brouns fc0a4a52f9 clipster: 2017-02-27 -> 1.0.1 2017-06-16 15:05:43 +02:00
Will Dietz 5d0a8792a7 uucp: Don't chown to 'uucp' user, don't set special perms 2017-06-16 07:11:02 -05:00
rnhmjoj 7ef9a9ffc1
ddcutil: init at 0.8.2 2017-06-15 00:32:26 +02:00
Profpatsch 79dd4deda5 Ultrastar (#26524) 
* ultrastardx-beta: init at 1.3.5

* libbass, libbass_fx: init at 24

* ultrastar-creator: init at 2017-04-12

* buildSupport/plugins.nix: add diffPlugins

Helper function to compare expected plugin lists to the found plugins.

* ultrastar-manager: init at 2017-05-24

The plugins are built in their own derivations, speeding up (re-)compilation.
The `diffPlugins` function from `beets` is reused to test for changes in the
plugin list on updates.

* beets: switch to diffPlugins

The function is basically just extracted for better reusability.
 2017-06-14 11:29:31 +02:00
Maximilian Bosch 3803864ca6 thefuck: init at 3.18 (#26529) 2017-06-14 09:57:38 +01:00
Bas van Dijk 2444eab485 ELK: update kibana and the elastic beats to 5.4 (#26252) 
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
 2017-06-13 22:36:08 +02:00
Peter Simons 424dc0138d parallel: fix broken shebangs to /usr/bin/perl 
Adding perl to buildInputs accomplishes this for us automatically.
 2017-06-13 22:28:58 +02:00
Robin Stumm 9079f94df7 exa: 2017-04-02 -> 0.6.0 2017-06-13 22:05:27 +02:00
Pascal Wittmann 50b3f8e051
fsql: 0.1.1 -> 0.2.1 2017-06-13 21:26:48 +02:00
Tuomas Tynkkynen f1d8069ee8 file: 5.30 -> 5.31 2017-06-11 19:35:48 +03:00
Jörg Thalheim 86de155951 Merge pull request #26473 from romildo/upd.qt5ct 
qt5ct: 0.32 -> 0.33
 2017-06-10 22:47:29 +01:00
Jörg Thalheim fbe658eea0 Merge pull request #26296 from gnidorah/master3 
autorandr: 855c18b -> 1.1
 2017-06-10 11:00:53 +01:00
Daiderd Jordan a6dc11e81e
tmux: fix hash, looks like the upstream tag was moved 
--- a/configure.ac       1970-01-01 01:00:01.000000000 +0100
+++ b/configure.ac       1970-01-01 01:00:01.000000000 +0100
@@ -1,6 +1,6 @@
 # configure.ac

-AC_INIT(tmux, 2.5-rc)
+AC_INIT(tmux, 2.5)
 AC_PREREQ([2.60])

 AC_CONFIG_AUX_DIR(etc)
 2017-06-09 19:54:39 +02:00
Tuomas Tynkkynen 2bfc977b6e ethtool: 4.10 -> 4.11 2017-06-09 01:58:23 +03:00
Tuomas Tynkkynen 69901f16c9 yle-dl: 2.15 -> 2.16 2017-06-08 23:13:06 +03:00
romildo 146ac9c771 qt5ct: 0.32 -> 0.33 2017-06-08 15:07:12 -03:00
Jörg Thalheim 451de09f51
autorandr: fix python shebang 2017-06-08 12:11:43 +01:00
Josef Kemetmueller cce12a644c hdf4: Init at 4.2.12 2017-06-08 07:52:12 +00:00
Yann Hodique 3ac67c1482 fzf: 0.16.7 -> 0.16.8 2017-06-07 17:53:20 -07:00
Michael Weiss 02aa3264f5 slop: 4.1.16 -> 6.3.41 2017-06-08 01:50:40 +02:00
gnidorah 5c9f0d00c3 autorandr: 855c18b -> 1.1 2017-06-07 13:23:36 +03:00
Kier Davis b81124b4fb
Fix hooks not being called when overriding phases in various packages 
It's necessary to do this in order to fix ckb's compilation, now that
fixupPhase rejects derivation results containing references to the temporary
build directory. It seems like good practice so I've added it to the
other packages that I maintain.
 2017-06-05 19:13:19 +01:00
Vincent Laporte 68eb2c2379 ocamlPackages.re2: mark broken on darwin 2017-06-05 05:45:59 +00:00
Jörg Thalheim 4c034921c3 Merge pull request #26311 from rnhmjoj/colorama 
update colorama and related
 2017-06-03 13:08:24 +01:00
Robert Helgesson 4576e8dddd
trash-cli: fix build on Python 3.6 2017-06-03 00:37:48 +02:00
Lorenzo Manacorda 4a62364c17 youtube-dl: 2017.05.23 -> 2017.05.29 (#26329) 
* youtube-dl: add pycryptodome dependency

The pycrypto library is used for HLS streams with encrypted segments.

See https://github.com/rg3/youtube-dl/pull/8201

* youtube-dl: 2017.05.23 -> 2017.05.29
 2017-06-02 21:40:17 +01:00
Thomas Tuegel b0da92ddf2 Merge pull request #26120 from romildo/upd.qt5ct 
qt5ct: 0.30 -> 0.32
 2017-06-02 09:05:44 -05:00
rnhmjoj 805ee69aa3
tmuxp: 1.2.7 -> 1.3.1 2017-06-02 11:58:37 +02:00
Théo Zimmermann f8fd5531a3 patdiff: init at 0.9.0 2017-05-30 20:50:36 +02:00
Matthias Beyer 97eddf0907 vimer: init at 0.2.0 2017-05-29 23:02:11 +03:00
Frederik Rietdijk 3d2cfabad6 hdf5: add comment about multiple outputs 2017-05-29 21:25:42 +02:00
Pascal Wittmann 9b605ca041 fsql: 0.1.0 -> 0.1.1 2017-05-29 09:52:59 +02:00
Pascal Wittmann 8e507cfdfe Merge pull request #26183 from womfoo/bump/pick-1.6.1 
pick: 1.4.0 -> 1.6.1
 2017-05-28 20:24:05 +02:00
Pascal Wittmann aee5fa2f48
moreutils: 0.59 -> 0.61 2017-05-28 20:00:07 +02:00
Kranium Gikos Mendoza a3bc7ec0f0 pick: 1.4.0 -> 1.6.1 2017-05-29 00:21:25 +10:00
romildo 27aaea0cd2 qt5ct: 0.30 -> 0.32 2017-05-27 07:50:24 -03:00
Pascal Wittmann f717118610
fsql: init at 0.1.0 2017-05-27 11:50:47 +02:00
Michael Weiss c2e27c60b0 lf: 2017-02-04 -> 2017-05-15 2017-05-26 13:59:57 +02:00
Dejan Lukan d4372617d0 loadlibrary: init at 721b08 2017-05-25 00:41:12 +02:00
Tuomas Tynkkynen e6cb889faa esptool: init at 1.4 2017-05-24 02:47:46 +03:00
Tuomas Tynkkynen ff15d0c41e esptool-ck: init at 0.4.11 2017-05-24 02:47:41 +03:00
Robin Gloster c5090b4de6
tux: 2.3 -> 2.5 2017-05-23 13:40:17 +02:00
Robin Gloster c66c53a132
youtube-dl: 2017.04.28 -> 2017.05.23 2017-05-23 12:18:06 +02:00
Peter Hoeg b1b5c66fbc grc: 1.11 -> 1.11.1 2017-05-23 17:32:09 +08:00
Robin Gloster e22673aa36
aescrypt: 3.0.9 -> 3.13 2017-05-23 02:45:21 +02:00
Joachim F 4e88906f41 Merge pull request #25975 from georgewhewell/update-fwup 
fwup: 0.14.2 -> 0.14.3
 2017-05-21 22:47:12 +01:00
Robin Gloster c83086fa52
bibtool: 2.57 -> 2.67 2017-05-21 20:27:44 +02:00
georgewhewell 5e0802c8fe fwup: 0.14.2 -> 0.14.3 2017-05-21 15:20:42 +01:00
Jörg Thalheim 0eaddb05bf Merge pull request #25662 from dochang/yank 
yank: 0.8.0 -> 0.8.2
 2017-05-20 17:34:40 +01:00
Jörg Thalheim 6f5c293bc5
yank: depends on xsel 2017-05-20 17:33:42 +01:00
Robin Gloster ff5b5ef553
dmg2img: 1.6.5 -> 1.6.7 2017-05-20 13:22:54 +02:00
Jörg Thalheim 28f8e5b95d Merge pull request #25760 from georgewhewell/fwup 
fwup: init at 0.14.2
 2017-05-19 07:03:06 +01:00
Jörg Thalheim fb19aac85d
mc: remove unwanted build-dependency references 
fixes #25836
 2017-05-17 00:15:53 +01:00
Tuomas Tynkkynen f2eb770e33 ethtool: 4.6 -> 4.10 2017-05-14 15:18:41 +03:00
georgewhewell a06781877f fwup: init at 0.14.2 2017-05-13 18:22:10 +01:00
Utku Demir aa858b9f2e Set clac.meta.platforms to "unix" instead of "linux" 2017-05-12 09:31:49 +12:00
Peter Hoeg 48192c65c3 partition-manager: init at 3.0.1 
Includes kpmcore 3.0.3
 2017-05-11 19:07:44 +08:00
Robert Helgesson dd70ff228f
svtplay-dl: 1.9.3 -> 1.9.4 2017-05-10 22:50:58 +02:00
Patrick Callahan 3d37af3e8b
fzf: add fish hook for NixOS 2017-05-10 10:16:04 +01:00
Patrick Callahan 855ae68648
direnv: add fish shell hook for NixOS 2017-05-10 10:15:58 +01:00
Desmond O. Chang c6c7197c7d lnav: 0.8.1 -> 0.8.2 2017-05-10 04:10:58 +02:00
Desmond O. Chang ee30a67a86 yank: 0.8.0 -> 0.8.2 2017-05-10 09:36:50 +08:00
Tristan Helmich 1d0627bccc graylogPlugins: Add and update plugins 2017-05-09 17:44:23 +02:00
Pascal Wittmann e7322f1fdf Merge pull request #25587 from mimadrid/update/parallel-20170422 
parallel: 20170122 -> 20170422
 2017-05-07 23:45:06 +02:00
mimadrid fa33bbc01b
parallel: 20170122 -> 20170422 2017-05-07 22:45:42 +02:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide 
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
 2017-05-07 12:56:09 +02:00
gnidorah 42cad8b6b0
winusb: init at 2017-01-30 
fixes #25536
 2017-05-07 08:26:22 +01:00
Tristan Helmich 450a0571cd graylog: 2.2.2 -> 2.2.3 2017-05-06 16:10:04 +02:00
Frederik Rietdijk f6dd52cd69 pythonPackage.Pyro: use upstream name 2017-05-05 21:13:26 +02:00
Peter Hoeg d4dbef90f3 rockboxutility: do not pull in espeak by default 2017-05-02 15:52:10 +08:00
Peter Hoeg 13bca4ba2d rockboxutility: fix linking to Qt libs 2017-05-02 14:34:52 +08:00
Daiderd Jordan ed8fbe3dae Merge pull request #25358 from sigma/pr/fzf-0.16.7 
fzf: 0.16.6 -> 0.16.7
 2017-04-30 23:21:54 +02:00
Yann Hodique 078b7c9f16 fzf: 0.16.6 -> 0.16.7 2017-04-30 11:38:58 -07:00
Michael Raskin eedc0f0a78 Merge pull request #23333 from romildo/upd.qt5ct 
qt5ct: 0.24 -> 0.30
 2017-04-30 19:42:31 +02:00
Maximilian Güntner 76d8811d8a
youtube-dl: 2017.04.17 -> 2017.04.28 2017-04-28 20:06:40 +02:00
Peter Hoeg 4639e68fd1 grc: 1.10.1 -> 1.11 2017-04-26 22:45:03 +08:00
Michael Raskin aea9257581 Merge pull request #25206 from matthiasbeyer/update-my-pkgs 
Update my pkgs
 2017-04-26 11:50:11 +02:00
Matthias Beyer cca20a7114 vdirsyncer: 0.14.1 -> 0.15.0 2017-04-26 09:53:54 +02:00
Armijn Hemel b5530755a5 bc: 1.06 -> 1.07.1 2017-04-25 15:08:36 +03:00
Benno Fünfstück 30a9923f4c Merge pull request #24359 from rnhmjoj/radeon-profile 
radeon-profile: init at 20161221
 2017-04-24 11:28:34 +02:00
rnhmjoj 9b1b22fcb6
radeon-profile: init at 20161221 2017-04-24 10:52:14 +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 bd07af92ec
desktop-file-utils: support darwin 2017-04-23 18:08:37 -05:00
Nikolay Amiantov 5565728670 system-config-printer: 1.5.7 -> 1.5.9 
Use gappsWrapHook.
 2017-04-23 17:08:56 +03:00
Rok Garbas 0feca1abb6 Merge pull request #25135 from garbas/update-asciinema 
Update asciinema
 2017-04-23 04:33:27 +02:00
Rok Garbas 93cacf61a8
asciinema: 1.3.0 -> 1.4.0 2017-04-23 04:18:11 +02:00
Eelco Dolstra d387a1f0ae youtube-dl: 2017.04.02 -> 2017.04.17 2017-04-21 23:32:37 +02:00
Jörg Thalheim b7984d3077 Merge pull request #25053 from Mesh33/buildtorrent-0.8 
buildtorrent: init at 0.8
 2017-04-20 13:08:53 +02:00
Unknown 2f66670162 buildtorrent: init at 0.8 2017-04-20 03:42:49 +02:00
Mesh33 1675d54db3 units: 2.13 -> 2.14 2017-04-20 00:09:54 +02:00
Chris Hodapp 228f33b21d osm2pgsql: init at 0.92.1-unstable 2017-04-17 16:19:41 -04:00
Michael Raskin ba7151e2b5 clac: add missing expression body; thanks @joachifm for the catch 2017-04-16 12:02:35 +02:00
Jörg Thalheim 4a0be7837c Merge pull request #24917 from sigma/pr/fzf 
fzf: 0.16.4 -> 0.16.6
 2017-04-15 09:41:53 +02:00
Yann Hodique e0ed784c06 fzf: 0.16.4 -> 0.16.6 2017-04-14 21:38:31 -07:00
Eric Litak 980ced505f coreutils: fixing ccCross.libc lookup 2017-04-14 02:00:08 -07:00
Daiderd Jordan f8230518a2 Merge pull request #24762 from matthewbauer/darwin-misc-fixes 
darwin: miscellaneous fixes
 2017-04-10 08:50:15 +02:00
Yann Hodique f4ff67099b keychain: add sigma as maintainer 2017-04-09 22:28:27 -07:00
Tuomas Tynkkynen d284082b9f yle-dl: 2.11 -> 2.15 2017-04-09 22:17:16 +03:00
Tuomas Tynkkynen aef593fcbf picocom: 2.1 -> 2.2 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 64306e29d7 less: 481 -> 487 2017-04-09 21:48:25 +03:00
Aristid Breitkreuz faa5d22231 Merge pull request #24771 from sigma/pr/keychain 
keychain: 2.8.0 -> 2.8.3
 2017-04-09 20:26:19 +02:00
Yann Hodique c51625b058 keychain: 2.8.0 -> 2.8.3 2017-04-09 09:17:32 -07:00
Peter Simons 4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs 
Mark linux-only pkgs
 2017-04-09 14:18:10 +02:00
Matthew Bauer 1df7966d9d
scanmem: linux only 2017-04-09 01:29:41 -05:00
Matthew Bauer 65d9a8e4fb
rrdtool: fix macOS build 2017-04-08 23:28:03 -05:00
Aristid Breitkreuz 4ca22140d9 Merge pull request #24669 from gnidorah/master2 
autorandr: 53d29f9 -> 855c18b and module
 2017-04-08 12:17:57 +02:00
Profpatsch 20d3ad5e9c mktorrent: 1.0 -> 1.1 
[1.1] - 2017-01-11
Added
- Autodetect the number of CPUs available <esmil@mailme.dk>
- Option for source string added to torrent info (`-s`), included in infohash.
  Often used by private trackers to create a unique infohash to prevent
  peer-leak and the possibility to track the trackers that do use leaked
  torrents. Having this option in mktorrent make it possible to create a
  infohash accurate torrent to the tracker you want to upload it to
Changed
- Make`-a` (announce list) optional
- Optional announce URL even for private torrents. No need to require announce
  for private torrents, they are added by most private trackers anyway and they
  modify the infohash so you'd have to redownload their modified torrent with
  injected unique announce URL anyway. (@mathieui, fix from @jrwren)
Fixed
- DHT makes trackers optional, so remove the warning
 2017-04-07 17:59:54 +02:00
gnidorah ca733de964 autorandr: 53d29f9 -> 855c18b and module 2017-04-06 13:28:40 +03:00
Jörg Thalheim d3fff80d00
exa: unstable-2016-04-20 -> unstable-2017-04-02 (unbrick) 
cc @ehegnes
 2017-04-04 11:42:33 +02:00
lprndn f259fa6e91 Merge branch 'master' into lprndn_Nixpkgs 2017-04-03 21:37:11 +02:00
Utku Demir db6a2918b9 kt: init at 11.1.0 2017-04-03 16:10:30 +12:00
Eelco Dolstra 17aab8a63e yotube-dl: 2017.03.10 -> 2017.04.02 2017-04-02 21:52:11 +02:00
Tuomas Tynkkynen b65dc619f0 xfstests: Fixes 2017-04-01 19:50:09 +03:00
Tuomas Tynkkynen 097373e691 xfstests: Fix homepage 2017-04-01 19:43:05 +03:00
Tuomas Tynkkynen ba360f90f9 xfstests: Enable parallel build 2017-04-01 19:42:41 +03:00
Tuomas Tynkkynen 197bbe0e1b xfstests: 2016-08-26 -> 2017-03-26 2017-04-01 19:42:01 +03:00
ndowens 0a354c9ea5 Merge pull request #24218 from magnetophon/clipster 
clipster: 2017-02-17 -> 2017-02-27
 2017-04-01 10:24:38 -05:00
ndowens 03aff3d22f Small cosmetic change 2017-04-01 10:16:51 -05:00
ndowens 5eece284a1 parcellite: 1.1.9 -> 1.2.1 2017-03-30 17:41:55 -05:00
John Ericson 166fc028a4 Merge pull request #24465 from Ericson2314/no-with-literal 
Get rid of all `with { inherit... }` and just used `let inherit...`
 2017-03-30 01:49:37 -06:00
John Ericson 4c0d7da183 Get rid of all with { inherit... } and just used let inherit... 
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
 2017-03-30 03:05:05 -04:00
Peter Hoeg 0843ad10fd dynamic-colors: 0.2.2 -> 0.2.2.1 2017-03-30 11:52:35 +08:00
Peter Hoeg 5bb5ce050b dynamic-colors: 0.2.1 -> 0.2.2 2017-03-30 11:14:48 +08:00
Franz Pletz 99ff573194
tmuxp: 1.2.2 -> 1.2.7 2017-03-28 20:14:19 +02:00
Robert Helgesson b31f43d7c6
cpulimit: 2.4 -> 2.5 2017-03-28 17:41:58 +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
Patrick Mahoney 09a5007797 skarnet.org packages: fix darwin build 
The configure scripts have been changed so that `--build` is now the
way to specify (non-cross compiling) build target, which is necessary
on darwin for binary compatibility across darwin versions.
 2017-03-26 17:30:41 -05:00
Patrick Mahoney 72a0d65d3d update skarnet.org packages 
execline:          2.1.4.5 -> 2.2.0.0
s6-dns:            2.0.0.7 -> 2.1.0.0
s6-linux-utils:    2.0.2.3 -> 2.2.0.0
s6-networking:     2.1.0.4 -> 2.2.1.0
s6-portable-utils: 2.1.0.0 -> 2.1.0.0 (no version change)
s6-rc:             0.0.2.1 -> 0.1.0.0
s6:                2.2.4.3 -> 2.4.0.0
skalibs:           2.3.9.0 -> 2.4.0.1

Also use new --enable-absolute-paths configure arg to correctly set
paths to runtime executables to point within the nix store rather than
relying on PATH resolution.
 2017-03-26 14:19:44 -05:00
romildo 53a4021201 qt5ct: 0.24 -> 0.30 2017-03-24 11:11:33 -03:00
Nikolay Amiantov f45cf10f6e Merge pull request #24133 from abbradar/gtk3-qt 
Fix GTK dependencies in wrappers
 2017-03-24 01:49:41 +03:00
Michael Raskin f9add54f28 fontforge-fonttools: init at 20160404 2017-03-23 15:10:52 +01:00
Bart Brouns 88458c8697 clipster: 2017-02-17 -> 2017-02-27 2017-03-23 13:25:56 +01:00
Nikolay Amiantov 82f7f8ad9a antimicro: wrap Qt application 2017-03-22 20:15:33 +03:00
c74d c2ab1fa350 heatseeker: 1.4.0 -> 1.5.1 
This patch updates the `heatseeker` package from version 1.4.0 to
version 1.5.1.

I have tested this change per nixpkgs manual section 11.1 ("Making
patches").
 2017-03-22 15:09:01 +01:00
Nikolay Amiantov 8eabb34e5f odroid-xu3-bootloader: use 1MB-capable bootloader 
(cherry picked from commit 7d66259a777fd1b1930eca26f08236f657529e25)
 2017-03-21 04:23:36 +03:00
Eelco Dolstra 5897aa771c
system-config-printer: Remove -dev paths from closure 
Workaround for #24128.
 2017-03-20 17:31:26 +01:00
Eelco Dolstra 6dd5846f1b
system-config-printer: Strip binaries in $out/etc 
This reduces its closure size from 484 to 281 MiB.
 2017-03-20 17:31:19 +01:00
Eelco Dolstra 96d7f35e96
diffoscope: Don't propagate build inputs 
This reduces the runtime closure size from 297 to 132 MiB.
 2017-03-20 17:30:55 +01:00
Nikolay Amiantov c1e279046b odroid-xu3-bootloader: init at 2015-12-04 2017-03-20 11:52:08 +03:00
Michael Raskin e16c5a8254 Merge pull request #24052 from benley/yubikey-manager 
yubikey-manager: init at 0.3.1
 2017-03-19 11:25:12 +01:00
Benjamin Staffin 24308432b7
yubikey-manager: init at 0.3.1 2017-03-19 05:30:54 -04:00
Michael Raskin d9ab289707 Merge pull request #23686 from nicknovitski/hostsblock 
init hostsblock (and kwakd)
 2017-03-19 10:00:30 +01:00
Michael Raskin 39609e3157 Merge pull request #23996 from manveru/add-phraseapp 
phraseapp-client: init at 1.4.3
 2017-03-18 20:08:45 +01:00