Commit Graph

472 Commits

Author SHA1 Message Date
Bignaux Ronan
39ab7a0778 soulseekqt: 2016-1-17 -> 2018-1-30 (#44460) 2018-08-04 17:24:52 +02:00
Lluís Batlle i Rossell
f54b387b63 Merge remote-tracking branch 'central/master' into viric_clean 2018-07-28 19:25:14 +02:00
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Lluís Batlle i Rossell
66d7126255 Take me (viric) out of most maintenance
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
2018-07-22 21:50:19 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
R. RyanTM
6750cb525f frostwire-bin: 6.6.7 -> 6.7.0 (#43344)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/frostwire/versions.
2018-07-11 18:29:57 +02:00
aszlig
b916ed31f2
twister: Use boost with Python support
Since 772eef9168, Boost by default doesn't
support Python anymore, so we need to override it with Python support.

Signed-off-by: aszlig <aszlig@nix.build>
2018-07-01 19:40:40 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Andrey Golovizin
42e1a21793 ktorrent: fix build with Qt 5.11 2018-06-15 17:43:08 +02:00
Jörg Thalheim
31e0e3caaf
Merge pull request #41944 from erosennin/ktorrent-cmake-3.11
ktorrent: fix build with CMake 3.11
2018-06-15 14:32:09 +01:00
Yegor Timoshenko
011cc930d2 deluge: add patch for libtorrent >=0.16 compat 2018-06-14 20:47:13 +00:00
Andrey Golovizin
0b8e92a7fd ktorrent: fix build with CMake 3.11 2018-06-14 06:37:30 +02:00
Mario Rodas
d5ca8dea78 synapse-bt: fix darwin build 2018-06-09 17:14:38 -05:00
Vladyslav M
e92c428593 synapse-bt: init at 2018-06-04 (#41402) 2018-06-03 19:10:38 +02:00
Francesco Gazzetta
b25c25170d zeronet: init at 0.6.2 (#40883) 2018-06-02 11:01:01 +02:00
Anton Latukha
c97fcb4d2b qbittorrent: 4.1.0 -> 4.1.1 (#41252) 2018-06-01 06:02:27 +00:00
volth
8b984ba61e
frostwire: disable auto-update 2018-05-31 22:10:44 +00:00
volth
2bd46c6b80
frostwire-bin: 6.6.5 -> 6.6.7 2018-05-31 21:34:21 +00:00
volth
75f20c2e3e
frostwire: 6.6.3 -> 6.6.7 2018-05-31 21:33:15 +00:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Philipp
22cd5eb643 gnunet-svn: remove outdated package (#40401)
Gnunet switched develpoment from svn to git and removed the svn repositories.
2018-05-12 17:35:53 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
R. RyanTM
cfdcc03feb qbittorrent: 4.0.4 -> 4.1.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qbittorrent/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.1.0 with grep in /nix/store/dyvbm73pl2qs0khv1yzyfsxsyf8kx7yi-qbittorrent-4.1.0
- directory tree listing: https://gist.github.com/a5b770d088c453aa2a25dc90cfc3c348
2018-05-06 22:00:49 -07:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
R. RyanTM
66aedd583e transmission-gtk: 2.93 -> 2.94
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/transmission-gtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-edit -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-edit --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-show -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-show --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-cli -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-cli --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-gtk -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-gtk --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-edit-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-edit-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-show-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-show-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-cli-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-cli-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-gtk-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-gtk-wrapped --help’ got 0 exit code
- found 2.94 with grep in /nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94
- directory tree listing: https://gist.github.com/4473480bb991ef18fee4200012b9a449
2018-05-02 21:37:30 +02:00
Will Dietz
4b7b083bcb treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux
Include all linux platforms.
2018-04-30 18:12:10 -05:00
Will Dietz
855e0463ab tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux
"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
2018-04-30 18:08:48 -05:00
Philipp Steinpaß
49003e880c gnunet: Add gnunet_git. 2018-04-29 13:26:40 +02:00
Matthew Justin Bauer
455e4c8d5b
Merge pull request #38906 from xvapx/upd/tribler
tribler: 7.0.1 -> 7.0.2
2018-04-27 15:03:53 -05:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Marti Serra
e9baa47a3b tribler: 7.0.1 -> 7.0.2 2018-04-22 10:42:10 +02:00
Matthew Justin Bauer
78cfa7bbd0
Merge pull request #38976 from volth/patch-124
tixati: 2.55 -> 2.57
2018-04-19 11:59:15 -05:00
R. RyanTM
d4cc20c0cc frostwire-bin: 6.6.3 -> 6.6.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/frostwire/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.6.5 with grep in /nix/store/6cgry9k7i6ni9a7axglsm5akmibryimi-frostwire-6.6.5
- directory tree listing: https://gist.github.com/e29014b6db646e0dd934f79b2e387703
2018-04-17 05:07:21 -07:00
volth
fa9359110b
tixati: 2.55 -> 2.57 2018-04-15 21:38:32 +00:00
volth
5a1da02976 frostwire-bin: update sha256 2018-03-13 09:54:51 +01:00
volth
b20fe4a99d frostwire: a stricter regex, just in case 2018-03-13 09:54:51 +01:00
volth
cedfe31648 frostwire: restore download-and-unpack derivation as frostwire-bin 2018-03-13 09:54:51 +01:00
volth
0596a7c6d6 frostwire: fixed meta.platforms 2018-03-13 09:54:51 +01:00
volth
a28464cba7 frostwire: 6.4.5 -> 6.6.3-build-253 2018-03-13 09:54:51 +01:00
Bignaux Ronan
96a3f1b546 soulseekqt: init at 2016-1-17 2018-03-06 15:21:50 +01:00
Michiel Leenaars
475adadd4e tribler: 7.0.0rc3 -> 7.0.1 2018-02-28 12:31:49 +01:00
Robin Gloster
a2a922d5c8
transmission: 2.92 -> 2.93 2018-02-26 12:22:09 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
svsdep
2992e26ca8 qbittorrent: 4.0.3 -> 4.0.4 2018-02-21 19:02:55 +02:00
Andreas Rammhold
50f48fce09
transmission: fix RCE via dns rebinding attach
For further details see [1] & [2].

[1] https://github.com/transmission/transmission/pull/468
[2] http://www.openwall.com/lists/oss-security/2018/01/12/1
2018-01-15 00:22:31 +01:00
Orivej Desh
5661a1d599
Merge pull request #33404 from corngood/transgui-fix
transgui: fix crash at startup with file argument
2018-01-06 03:21:55 +00:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
David McFarland
0ee70af836 transgui: fix crash at startup with file argument 2018-01-03 20:11:15 -04:00
adisbladis
91f15c9c72
qbittorrent: 4.0.1 -> 4.0.3 2018-01-04 00:51:07 +01:00
Andreas Rammhold
9731756205
deluge: use libtorrentRasterbar instead of libtorrentRasterbar_1_0 2018-01-04 00:40:18 +01:00
David McFarland
62af52bbf1 transgui: 5.0.1-svn-r986 -> 5.0.1-svn-r988 2017-12-20 12:41:39 -04:00
gnidorah
a9746ab839
transmission_gtk: use wrapGAppsHook 2017-12-04 17:32:11 +01:00
José Romildo Malaquias
a3ae91aa2f qbittorrent: 3.3.16 -> 4.0.1 2017-11-22 10:02:40 -02:00
Orivej Desh
ad8483252d qbittorrent: fix build
Probably failing since #31357
2017-11-09 12:21:07 +00:00
Thomas Tuegel
a8538307e5
Merge branch 'master' into qt-5-tmp 2017-11-07 07:33:47 -06:00
Thomas Tuegel
0b4564fdb1
qbittorrent: no longer need to set QT_QMAKE 2017-11-07 07:18:47 -06:00
Orivej Desh
0c104e40cb
Merge pull request #30558 from volth/tixati-2.55
tixati: init at 2.55
2017-11-05 04:22:17 +00:00
Joachim F
36e19373f7 Merge pull request #30510 from xvapx/tribler-update
tribler: 7.0.0-rc2 -> 7.0.0-rc3
2017-10-26 20:57:17 +00:00
volth
3cb89a81b7 vuze: init at 5750 (#30557) 2017-10-25 10:36:30 +02:00
volth
bc2aaeb75c tixati: unfree license 2017-10-21 07:30:22 +00:00
Volth
318b3fb34e tixati: init at 2.55 2017-10-19 00:47:37 +00:00
Marti Serra
b6b4783ca8 tribler: 7.0.0-rc2 -> 7.0.0-rc3 2017-10-17 13:30:26 +02:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Yegor Timoshenko
bc334e1599 qbittorrent: 3.3.15 -> 3.3.16, drop patch, enable parallel build 2017-10-01 00:19:56 +00:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Paul Hendry
f814c3d090 ktorrent: Add missing meta.license 2017-09-16 20:26:54 -07:00
Eelco Dolstra
bcd382f032
tribler: 7.0.0-beta -> 7.0.0-rc2
Also, fix the xcb plugin error
(https://github.com/NixOS/nixpkgs/issues/24256) and add service-identity which is a required dependency now.
2017-09-10 12:07:24 +02:00
Peter Hoeg
17f4cb4eb8 ktorrent: 5.0.1 -> 5.1.0 2017-09-05 18:26:52 +08:00
Grant Wu
fa5e343242 deluge: 1.3.13 -> 1.3.15
Change libtorrentRasterbar dependency to 1.0.x series (required for
1.3.x series)
Move Deluge out of pythonPackages (it doesn't support Python 3)
2017-08-30 19:25:30 +02:00
Jörg Thalheim
4b8435dcee Merge pull request #28578 from kevincox/qb
qbittorrent: 3.3.13 -> 3.3.15
2017-08-29 11:09:13 +01:00
Jörg Thalheim
9d74fd3e07 frostwire: add java to PATH
fixes #28547
2017-08-27 08:55:04 +01:00
Kevin Cox
a75d04a970
qbittorrent: 3.3.13 -> 3.3.15
This version contains among other things a fix for a too restrictive
XSS filter. See the full change log at https://www.qbittorrent.org/news.php
2017-08-25 20:46:04 +01:00
aszlig
58c0d63100
twister: Fix build against GCC 6.x
This applies upstream commit miguelfreitas/twister-core@dd4f5a1769.

Tested only by building and executing "twisterd --help", but no serious
testing done otherwise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-08-25 18:32:02 +02:00
aszlig
c905b7895c
twister: 0.9.30 -> 0.9.34
From the upstream changelog:

Version 0.9.34:

 * quick fix to "Assertion mapInfo.count" failed, don't mess with these
   addrman structures!

Version 0.9.33:

 * fix serious connectivity problem: not trying to connect to >=0.9.30
   peers with random ports.

Version 0.9.31:

 * backport from upstream (arvidn/libtorrent@677e642):
   fixed uTP vulnerability from

The fixes in 0.9.31 are a bit more serious and it actually contains two
fixes from what I've been able to dig through:

 * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5685
 * https://www.us-cert.gov/ncas/alerts/TA14-017A

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-08-25 18:31:44 +02:00
Matthew Justin Bauer
2eacddf0dc treewide: homepage URL fixes (#28475)
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
2017-08-22 20:50:04 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Robin Gloster
c1ca5acf19
retroshare: 0.5.5c -> 0.6.2 2017-08-04 04:05:46 +02:00
Franz Pletz
b794459727
ldcpp: remove, old and abandoned
Latest release from 2011 and needs patching to build with openssl 1.1.
2017-08-04 04:05:41 +02:00
Robin Gloster
b515286714
eiskaltdcpp: 2.2.9 -> 2.2.10, add upstream openssl patches 2017-08-04 02:39:22 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Vincent Laporte
3a227e673a mldonkey: 3.1.5 -> 3.1.6 2017-07-08 15:21:42 +02:00
romildo
fd92bd0d80 qbittorrent: 3.3.12 -> 3.3.13 2017-07-03 16:36:55 -03:00
Pascal Wittmann
24ec6634f4 Merge pull request #27010 from rasendubi/qbittorrent-qmake
qbittorrent: fix build
2017-07-03 21:22:53 +02:00
Frederik Rietdijk
8f5cf685ad ktorrent: fix build 2017-07-03 10:10:17 +02:00
Alexey Shmalko
85a8323e8f
qbittorrent: fix build
The qbittorrent has been broken by
210f688802, which adds `qmake` as a
build input. `qmake` is overriding the default configure phase (which
should be `./configure ...` for qbittorrent) so build goes wrong.

Remove `qmake` from build inputs (basically, reverting the said
commit).
2017-07-01 14:29:30 +03:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Jörg Thalheim
41de162f0d
eiskaltdcpp: fix miniupnpc build 2017-06-18 09:17:42 +01:00
Jörg Thalheim
864ef0997b
gnunet: enable conversation
fixes #25829
2017-05-16 19:57:41 +01:00
José Romildo Malaquias
88fe719e64 qbittorrent: 3.3.11 -> 3.3.12 (#25350) 2017-05-01 16:17:15 +01:00
Robert Helgesson
4c171319f5
transmission-remote-gtk: fix broken tray applet icons
This uses `wrapGAppsHook` and `hicolor_icon_theme` to let the tray
applet find the icons.
2017-04-26 00:02:56 +02: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
Joachim Fasting
a49df2a894
tribler: fixup revision
Using `rev = "v${revision}"` results in a "bad reference" error;
use the plain revision instead.
2017-03-23 12:55:57 +01:00
Marti Serra
ad75bffb06
tribler: from 6.4.3 to 7.0.0-beta
removed old unused dependencies,
changed enablePlayer to true by default,
added myself as maintainer.
2017-03-22 15:34:24 +01:00
ndowens
fbe960a635 transmission-remote-gtk: 1.2 -> 1.3.1 2017-03-17 17:31:59 -05:00
José Romildo Malaquias
196f64d675 qbittorrent: 3.3.10 -> 3.3.11 (#23703) 2017-03-12 15:48:26 +01:00
Arseniy Seroka
ae3b6811cc Merge pull request #23472 from ndowens/frostwire
frostwire: 6.0.0 -> 6.4.5
2017-03-04 20:26:50 +03:00
ndowens
3fdd726b16 ncdc: 1.19.1 -> 1.20 2017-03-04 08:59:50 -06:00
ndowens
6744f3a986 frostwire: 6.0.0 -> 6.4.5 2017-03-03 19:59:56 -06:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
b1d78393bd
Remove kde4.ktorrent
- Already updated to KDE 5 in Nixpkgs
2017-02-24 16:49:01 -06:00
romildo
53c2e38e0d qbittorrent: 3.3.7 -> 3.3.10 2017-02-17 02:45:15 +01:00
Matthew Bauer
6695954d48
transmission: fix building on Darwin
This sets "--disable-mac" so that we use GTK instead of the macOS
backend. The macOS backend should work but currently it breaks with xcbuild.
2017-01-07 17:59:14 -06:00
Matthew Bauer
976aed886b
transmission: add enableDaemon flag 2017-01-07 17:59:05 -06:00
Matthew Bauer
30eed55410
transmission: add enableCli flag 2017-01-07 17:58:52 -06:00
Matthew Bauer
cae067f17a
transmission: add enableSystemd flag
This flag can be used to enable systemd daemon support in transmission.
2017-01-07 17:58:40 -06:00
Frederik Rietdijk
99402f6a06 twister: use python2 2016-11-24 22:28:03 +01:00
Eelco Dolstra
516e177d98 ktorrent: Add 5.0.1 2016-11-21 22:03:46 +01:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
makefu
004a5a2047
opentracker: 2014-08-03 -> 2016-10-02
* change git url to new official repo
* add sample configuration to package
* use licenses.beerware
* add maintainer
2016-10-03 20:04:00 +02:00
Tuomas Tynkkynen
6bca04c57b retroshare06: Disable parallel build
http://hydra.nixos.org/build/40998820/nixlog/1/raw
2016-09-23 12:45:21 +03:00
Franz Pletz
2628ea4446
qbittorrent: 3.3.5 -> 3.3.7 2016-09-13 18:03:46 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Kranium Gikos Mendoza
01fa27a84c freenet: 1470 -> 1475 2016-08-21 08:32:13 +08: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
63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Rahul Gopinath
af074c0972 gnunet: cleanup patching
Do not use loop and sed since sed can take a list of files.
2016-07-04 17:10:22 -07:00
Rahul Gopinath
b31ab67a81 gnunet: ensure that zlib is actually linked
Fixes #14969
2016-07-04 16:51:14 -07:00
Ram Kromberg
0253f7eafb transgui: init at 5.0.1-svn-r986 2016-07-01 13:51:47 +03:00
Kranium Gikos Mendoza
e8dcd4a9d5 qbittorrent: 3.3.4 -> 3.3.5 2016-06-27 17:00:33 +08:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Thomas Tuegel
7299f68a05 qbittorrent: don't use qmakeHook
Qt now configures QMake for all builds so there is no need to invoke
`qmakeHook` just to get a working `qmake`.
2016-05-30 16:30:06 -05:00
obadz
70286f1348 transmission: fix build with systemd 230 2016-05-28 13:49:19 +01:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Joachim Fasting
397b356383 Merge pull request #15323 from joachifm/libgd
gd: 2.0.35 -> 2.1.1
2016-05-15 14:12:28 +02:00
Sebastian Schwarz
d2ab0431df transmission_remote_cli: init at 1.7.1 2016-05-15 00:06:42 +02:00
Joachim Fasting
2113b7389a
mldonkey: add libjpeg to build inputs
Possibly jpeg used to be propagated from gd but is no longer after
f8bdd7969d.
2016-05-14 07:43:05 +02:00
Thomas Tuegel
e60eb28873 firestr: mark broken 2016-05-09 10:01:46 -05: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
Simon Vandel Sillesen
05f2ebe16d qBittorrent: fix qmake not found in qbittorrent build
Thanks to @romildo for finding the configure fix.
2016-05-01 15:05:56 +02:00
Simon Vandel Sillesen
63d016b335 qbittorrent: 3.3.3 -> 3.3.4 2016-04-28 18:09:55 +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
Tuomas Tynkkynen
2f6c2ecd47 eiskaltdcpp: Use pcre-cpp (fixes build)
http://hydra.nixos.org/build/34967606/nixlog/1/raw
2016-04-27 13:38:27 +03:00
Nikolay Amiantov
04e1b8eac4 retroshare: move to qmake4Hook 2016-04-20 18:55:47 +03:00
Nikolay Amiantov
2f2e9b06b5 retroshare06: move to qmake4Hook 2016-04-20 18:55:47 +03: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
Joachim Fasting
4393e6f619 transmission: build transmission-cli
As of version 2.92, transmission-cli is no longer built by default (it
is deprecated).  This breaks the bittorrent vmtest.  For now, explicitly
enable the cli.
2016-03-13 07:08:01 +01:00
Christoph Hrdinka
c5695bc8be transmission: 2.90 -> 2.92 2016-03-08 15:40:17 +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
Domen Kožar
756604cc08 transmission: 2.84 -> 2.90 2016-02-29 13:08:33 +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
Simon Vandel Sillesen
71ab92a396 qbittorrent: 3.3.1 -> 3.3.3 2016-01-21 19:15:04 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Shell Turner
f229791454 freenet: rewrite wrapper to not depend on PATH 2016-01-05 01:06:54 +00:00
Simon Vandel Sillesen
fecea0b305 qbittorrent: 3.2.3 -> 3.3.1
* upstream has switched to qt5 as default, so also done here
* Adds a patch to use the qt lrelease tool correct
2016-01-02 22:47:28 +01: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
Thomas Tuegel
fc13f37f2c firestr: Qt 5 infrastructure update 2015-12-20 07:56:50 -06:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Domen Kožar
4b0fcf8ea1 Merge pull request #11553 from FRidh/pil
WIP: remove PIL as dependency
2015-12-08 22:15:05 +01:00
Frederik Rietdijk
9455476f47 tribler: use pillow instead of pil
Program opens. Didn't test any further.
2015-12-08 16:30:25 +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
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
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Chris Double
2756b088d8 Update freenet to build 1470.
This stores freenet data files in ~/.local/share/freenet by default,
or $XDG_DATA_HOME/freenet if set.
2015-10-25 18:46:09 +13:00
Lluís Batlle i Rossell
c1e6e97f6b Updating twisterd to 0.9.30
(cherry picked from commit f2264ec42a9792091639eef1050b08403f368ff2)
2015-10-07 11:37:59 +02:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +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
Carter Charbonneau
170177ad26 retroshare: 0.6-svn-7445 -> 0.6-git-fabc3a3 (close #9542) 2015-09-20 20:44:55 +02:00
devhell
49a5d06d3c transmission-remote-gtk: 1.1.1 -> 1.2
This commit includes some rework since the original googlecode
repository redirects to the GitHub page.

Built and tested successfully on local.

From the Changelog:
```
* Wed Jun 11 2014 1.2
- A basic RSS reader which uses libmrss.
- Fix some 32bit platforms reporting 0 connected peers and unknown ETA.
- Resolve some GTK deprecations.
- Fix a crash in port test callback.
- Fix decimal marker in status bar version.
- Support for GeoIPCity.dat.
- Fix a crash when removing lots of columns (something changed in GTK).
- Optional and non-default support for validating SSL certs.
- Remove all GTK2 support.
- Allow alt-speed limits to override global speed limits in the statusbar
  display.
```
2015-09-19 21:18:22 +01:00
Eelco Dolstra
916793cf13 Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Domen Kožar
fb16b908bc qbittorrent: partial revert of 1d78f31b76
It still fails on 32bit:
http://hydra.nixos.org/build/25460116/nixlog/1/raw

(cherry picked from commit 57391b7322d97aa03158c730aec318cb0e8d2b2d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 20:23:28 +02:00
Eelco Dolstra
9013dc5826 inotifyTools -> inotify-tools
Fixes #9456.
2015-09-01 10:52:47 +02:00
Simon Vandel Sillesen
1d78f31b76 qBittorrent: 3.1.11 -> 3.2.3 2015-08-13 04:07:08 +02:00
Eelco Dolstra
bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219
Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
John Chee
225ae4c5f8 tribler: strip pngs (close #8810)
This prevents libpng exceptions from being thrown.
Accepted upstream: https://github.com/Tribler/tribler/pull/1561
2015-07-18 10:11:03 +02:00
John Chee
962f68f390 tribler: 5.5.x-25411 -> 6.4.3 2015-07-11 15:09:46 -07:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Pascal Wittmann
3838f1d490 firestr: fix build (qt5.multimedia was missing) 2015-05-31 19:13:28 +02:00
Eelco Dolstra
bfedb4940c transmission: Fix build
http://hydra.nixos.org/build/22182663
2015-05-13 16:05:34 +02:00
Domen Kožar
b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
Emery Hemingway
8b7a05cba6 firestr: initial package at 0.8
http://firestr.com/
2015-04-26 14:57:22 -04:00
Joachim Fasting
d8e0dfdc5b ldcpp: reimplement using mkDerivation
Also add libnotify support
2015-04-24 11:54:38 +02:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel
e9c0bdb93e qbittorrent: add gui & webui optionals 2015-02-15 17:43:39 -05:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Kosyrev Serge
b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Emery Hemingway
86213a1f23 transmission-remote-gtk: meta fixup (close #5420) 2014-12-21 10:35:24 +01:00
Arseniy Seroka
3477bc9a47 fix some hashes 2014-11-30 02:25:41 +03:00
Vincent Laporte
4ec6e0c935 mldonkey: adds license information 2014-11-19 08:26:43 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Arseniy Seroka
a20e2d8f93 Merge pull request #4779 from gavinrogers/master
frostwire: initial working package
2014-11-04 23:03:52 +03:00
Gavin Rogers
cb68376fcd frostwire: initial working package
This installs from the official frostwire tarball. Similar to the
jdiskreport package. Everything works fine on the systems I've tried.

I've made myself the maintainer.
Also upgraded it to 6.0.0 as it was released stable.
2014-11-04 18:57:01 +00:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
William A. Kennington III
8f8712b1e1 qbittorrent: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Domen Kožar
b0294578eb add opentracker: free bittorrent tracker project. It aims for minimal resource usage and is intended to run at your wlan router 2014-10-07 17:06:46 +02:00
Domen Kožar
7706c08287 qbittorrent: disable parallel building due to failures 2014-10-02 00:21:50 +02:00
Nathaniel Baxter
eb3d744af9 qbittorrent: Fixup meta data. 2014-09-25 12:52:23 +10:00
Nathaniel Baxter
d5604d07c2 qbittorrent: Bump version to 3.1.10. 2014-09-25 11:09:55 +10:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Vladimír Čunát
7050914ed2 eiskaltdcpp: set platforms.all, fix description
Close #3051.
2014-08-14 21:11:20 +02:00
Florian Richter
f5aa55a3f9 Add eiskaltdcpp, a p2p client for the DC protocol 2014-08-14 21:11:20 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00