nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-30 17:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
224,049 Commits 184 Branches 125 Tags 9.8 GiB
f1e3278849
Commit Graph

1492 Commits

Author SHA1 Message Date
R. RyanTM
d3cf60344b zotero: 5.0.73 -> 5.0.77 (#72693) 2019-11-07 23:29:28 +01:00
Marek Mahut
c9dbfad745
Merge pull request #72428 from mmahut/flexibee 
flexibee: 2019.3.0.3 -> 2019.3.0.7 and adding the server binary
 2019-11-07 19:44:35 +01:00
Jonathan Ringer
062a4d4081 paperwork`: add missing dependency 2019-11-04 01:54:26 -08:00
Marek Mahut
0534e9c4b3 flexibee: 2019.3.0.3 -> 2019.3.0.7 2019-11-03 16:43:55 +01:00
Marek Mahut
ee71de7240 flexibee: adding flexibee-server 2019-11-03 16:43:55 +01:00
Jan Tojnar
946ef1723b
Merge pull request #62137 from tbenst/pympress 
pympress: init at 1.2.0
 2019-10-30 15:09:15 +01:00
Tyler Benster
6b9a6f29b7
pympress: init at 1.4.0 
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
 2019-10-30 13:31:02 +01:00
Mario Rodas
66b7ad13c9
Merge pull request #71867 from r-ryantm/auto-update/todoman 
todoman: 3.6.0 -> 3.7.0
 2019-10-30 01:50:26 -05:00
José Romildo Malaquias
a3d3864b02
Merge pull request #72174 from danieldk/softmaker-office-972 
softmaker-office: 970 -> 972
 2019-10-29 11:57:02 -03:00
Jörg Thalheim
91f4d7a818 kmymoney: 5.0.5 -> 5.0.7 2019-10-29 02:30:04 -07:00
Daniël de Kok
1de992c4d1 softmaker-office: 970 -> 972 
Changes:
https://www.softmaker.com/en/servicepacks-office-changelog
 2019-10-28 17:00:15 +01:00
R. RyanTM
a6b64a828d qownnotes: 19.9.16 -> 19.10.10 (#71866) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
 2019-10-25 17:58:42 +02:00
Aaron Andersen
f1ea0a173f
Merge pull request #71303 from Flakebi/master 
skrooge: Fix build
 2019-10-25 04:03:14 -04:00
R. RyanTM
4e8c77b9bf todoman: 3.6.0 -> 3.7.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/todoman/versions
 2019-10-23 14:38:56 -07:00
Daniël de Kok
6f6331dbb3 softmaker-office: fix product unlock error 
SoftMaker/FreeOffice collects some system information upon unlocking the
product. But in doing so, it attempts to execute /bin/ls. If the execve
syscall fails, the whole unlock procedure fails. This works around that
by rewriting /bin/ls to the proper path.

SoftMaker Office restarts itself upon some operations, such changing the
theme and unlocking. Unfortunately, we do not have control over its
environment then and it will fail with an error. Starting SoftMaker
Office from scratch will then work.

Fixes #71228
 2019-10-20 19:36:35 +02:00
Flakebi
1d5661cd80
skrooge: Fix build 2019-10-18 11:15:31 +02:00
José Romildo Malaquias
a81a6b3d72 freeoffice: 970 -> 971 2019-10-16 08:44:58 -03:00
Marek Mahut
1261bb9177
Merge pull request #70580 from r-ryantm/auto-update/flexibee 
flexibee: 2019.2.5 -> 2019.3.0.3
 2019-10-15 15:54:02 +01:00
worldofpeace
f0e5192fe2 spice-up: fix build with vala 0.46 
See: https://github.com/Philip-Scott/Spice-up/pull/288
 2019-10-14 16:49:39 -04:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1548439
 2019-10-13 13:31:33 +02:00
kjuvi
5075996b59 envelope: init at 0.0.4 
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
 2019-10-12 18:05:44 -04:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
worldofpeace
bdb851ee2d pantheon: use latest vala 
elementary OS's ecosystem is curated around Ubuntu's LTS releases.
This means the development platform for their curated applications
always includes a LTS version of vala (in 18.04 it's 0.40).
Because of how vala development works it suspect some of these
applications to have serious issues if complied with the latest vala.
However in the past year or so, for Pantheon at least, I don't think
their applications will have much issues with latest vala, and if there
is I don't think they'd be difficult to fix. In this single regard they've
become more responsive since their preferred language is vala.

As for the curated applications I have less of this confidence in.
So I'd have to be accept less applications, but that's something
I'm willing to compromise on. And this is easily reversible or
could be done on a per-application basis. And nix already makes
this trivial.
 2019-10-09 22:47:37 -04:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken 
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
 2019-10-08 17:14:26 +02:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
R. RyanTM
9f850a282f flexibee: 2019.2.5 -> 2019.3.0.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flexibee/versions
 2019-10-06 23:12:43 -07:00
worldofpeace
e1f961dc80
Merge pull request #70377 from Kjuvi/timetable 
timetable: 1.0.8 -> 1.0.9
 2019-10-05 11:25:59 +00:00
R. RyanTM
43fe77c0e8 qownnotes: 19.8.6 -> 19.9.16 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
 2019-10-04 23:51:53 +02:00
Quentin Vaucher
2691337a68 timetable: 1.0.8 -> 1.0.9 2019-10-04 11:59:55 +02:00
Robin Gloster
3a887ed60d
Merge pull request #69996 from r-ryantm/auto-update/zim 
zim: 0.71.1 -> 0.72.0
 2019-10-03 22:00:48 +02:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Tor Hedin Brønner
8fa7740aa7 planner: fix build with glib-2.62 2019-09-30 19:39:50 +02:00
Tor Hedin Brønner
8ff1d64b43 gnucash: fix build with glib-2.62 2019-09-30 19:39:48 +02:00
R. RyanTM
46b3bf07b2 watson: 1.7.0 -> 1.8.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/watson/versions
 2019-09-29 03:42:12 -07:00
R. RyanTM
1304139d0c zim: 0.71.1 -> 0.72.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/zim/versions
 2019-09-29 02:32:12 -07:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Marek Mahut
1cf3496def
Merge pull request #69615 from r-ryantm/auto-update/ledger-autosync 
ledger-autosync: 1.0.0 -> 1.0.1
 2019-09-27 22:02:34 +02:00
Linus Heckemann
dd2701e82d
Merge pull request #69595 from r-ryantm/auto-update/impressive 
impressive: 0.12.0 -> 0.12.1
 2019-09-27 14:32:49 +02:00
Aaron Andersen
8d314c1f11
Merge pull request #69596 from r-ryantm/auto-update/homebank 
homebank: 5.2.7 -> 5.2.8
 2019-09-27 06:11:16 -04:00
R. RyanTM
c52d22dc22 ledger-autosync: 1.0.0 -> 1.0.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/ledger-autosync/versions
 2019-09-26 17:04:51 -07:00
R. RyanTM
433a62e25f homebank: 5.2.7 -> 5.2.8 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
 2019-09-26 15:11:26 -07:00
R. RyanTM
806219644a impressive: 0.12.0 -> 0.12.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/impressive/versions
 2019-09-26 15:08:13 -07:00
R. RyanTM
ef49489551 gnucash: 3.6 -> 3.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
 2019-09-26 11:56:26 -07:00
Jan Tojnar
f80e55fc2e
gtk3.setupHook: clear icon-theme.cache in preFixup (#68552) 
gtk3.setupHook: clear icon-theme.cache in preFixup
 2019-09-22 16:30:42 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
worldofpeace
9a9760d88e
Merge pull request #69143 from Taneb/fix-kexi 
kexi: patch error due to Qt 5.13
 2019-09-21 12:03:48 -04:00
Nathan van Doorn
550d67cc0b kexi: patch error due to Qt 5.13 2019-09-20 10:17:53 +01:00
worldofpeace
b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible 
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
 2019-09-18 22:47:26 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
worldofpeace
710212e761
Merge pull request #68982 from symphorien/nixos-unstable 
paperwork: include setuptools to fix startup
 2019-09-17 20:30:46 -04:00
Symphorien Gibol
944aa2bb0d paperwork: include setuptools to fix startup 2019-09-17 22:35:43 +02:00
worldofpeace
446dd2543d scribusUnstable: drop harfbuzz 2019-09-17 13:43:50 -04:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
José Romildo Malaquias
a85b938495
Merge pull request #67775 from danieldk/softmaker-office 
Add Softmaker Office and FreeOffice
 2019-09-14 21:59:40 -03:00
Will Dietz
89c0e459b3
Merge pull request #68751 from dtzWill/update/todoman-3.6.0 
todoman: 3.5.0 -> 3.6.0
 2019-09-14 14:13:10 -05:00
Maximilian Bosch
0d5806fefd
paperless: fix cors header 
`django-cors-headers` 3.x (which is used in nixpkgs) requires a scheme
for allowed hosts. Upstream uses 2.4, however we create the python env
with Nix, so the source needs to be patched accordingly.
 2019-09-14 14:59:00 +02:00
Daniel Schaefer
cbab4663f3 paperless: Use pytest_4 in django-crispy-forms 
Doesn't build with pytest_5
 2019-09-14 14:20:50 +02:00
Will Dietz
15cafa9e10
todoman: 3.5.0 -> 3.6.0 
https://github.com/pimutils/todoman/releases/tag/v3.6.0
 2019-09-13 22:29:12 -05:00
worldofpeace
02cab2d031 scribusUnstable: fix build 
We use harfbuzzFull because that includes the icu build which
this depends on.

Fixes #68548
 2019-09-13 17:51:01 -04:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Peter Hoeg
6759d15465
Merge pull request #68512 from nspin/pr/stdenv-spelling 
stdenv: fix misspellings of dontPatchELF
 2019-09-12 17:04:49 +08:00
Nick Spinale
d2333beb86 stdenv: fix misspellings of dontPatchELF 2019-09-11 13:10:09 +00:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Aluísio Augusto Silva Gonçalves
d8d68e1af1 fava: 1.10 -> 1.11 2019-09-06 21:16:52 +02:00
Daniël de Kok
accc62a98c freeoffice: 966 -> 970 
Changes:

- Adds support for saving documents to the DOC, XLS, and PPT formats.
- TextMaker adds support for saving to the OpenDocument format.
- Adds a dark mode.
 2019-09-06 16:33:02 +02:00
Daniël de Kok
11184dee46 freeoffice: init at 966 2019-09-06 07:44:07 +02:00
Daniël de Kok
97390d648d softmaker-office: init at 970 2019-09-06 07:44:07 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g 
GTK was renamed.
 2019-09-06 02:54:53 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Aristid Breitkreuz
bafe56c685
gnucash: fix cmake configure phase, missing "include(CheckSymbolExists)" (#68026) 2019-09-03 22:31:50 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Marek Mahut
5865e1f487
Merge pull request #67822 from Kjuvi/master 
timetable: 1.0.6 -> 1.0.8
 2019-08-31 22:30:09 +02:00
Quentin Vaucher
e1c44d481c timetable: 1.0.6 -> 1.0.8 2019-08-31 11:09:21 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Florian Klink
1d6005e113 jameica: 2.8.2 -> 2.8.4 2019-08-27 13:45:44 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Marek Mahut
b7de7869be
Merge pull request #67159 from r-ryantm/auto-update/zotero 
zotero: 5.0.71 -> 5.0.73
 2019-08-22 23:11:35 +02:00
R. RyanTM
538d38f3c3 zotero: 5.0.71 -> 5.0.73 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zotero/versions
 2019-08-20 21:22:43 -07:00
Will Dietz
9a2c2418db
qownnotes: 19.7.3 -> 19.8.6, use qt's mkDerivation 2019-08-20 00:52:35 -05:00
Will Dietz
4a69c974f3
vnote: fix by using qt's mkDerivation, 2.6 -> 2.7.2 
https://github.com/tamlok/vnote/releases/tag/v2.7.2
https://github.com/tamlok/vnote/releases/tag/v2.7.1
https://github.com/tamlok/vnote/releases/tag/v2.7
 2019-08-19 16:50:26 -05:00
Peter Hoeg
ab93b22808 zanshin: 2017-11-25 -> 2019-07-28 2019-08-19 22:35:27 +08:00
gnidorah
741cab4c66 mytetra: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
Aluísio Augusto Silva Gonçalves
2bc8c6705e
libreoffice-still: 6.1.5.2 -> 6.2.6.2 2019-08-18 12:56:29 -03:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Aluísio Augusto Silva Gonçalves
b90c63f50d
libreoffice-fresh: 6.2.4.2 -> 6.3.0.4 2019-08-17 10:35:39 -03:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Justin Humm
c39818d3dc
scribusUnstable: 2019-01-16 -> 1.5.5 
changelog: https://bugs.scribus.net/changelog_page.php?version_id=106

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
 2019-08-10 16:41:23 +02:00
Marek Mahut
202399f34e flexibee: init at 2019.2.5 2019-08-07 15:04:10 +02:00
Mario Rodas
3ca68197f5
Merge pull request #66170 from r-ryantm/auto-update/tudu 
tudu: 0.10.2 -> 0.10.3
 2019-08-06 06:23:43 -05:00
R. RyanTM
f4bc95f26b tudu: 0.10.2 -> 0.10.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tudu/versions
 2019-08-06 00:09:59 -07:00
worldofpeace
b044b6814f
Merge pull request #65914 from worldofpeace/update/elementary-appcenter 
Update pantheon appcenter apps
 2019-08-05 12:01:59 -04:00
R. RyanTM
08aa9c9aa4 homebank: 5.2.6 -> 5.2.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
 2019-08-04 07:27:55 -07:00
worldofpeace
ac17e43d8d aesop: 1.1.1 -> 1.1.2 
https://github.com/lainsce/aesop/releases/tag/1.1.2
 2019-08-04 04:23:13 -04:00
Orivej Desh
32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
markuskowa
1eac842476
Merge pull request #65173 from r-ryantm/auto-update/qownnotes 
qownnotes: 19.6.1 -> 19.7.3
 2019-07-24 13:04:36 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Nick Novitski
7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
R. RyanTM
6496134c44 zotero: 5.0.67 -> 5.0.71 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zotero/versions
 2019-07-20 17:24:36 -07:00
R. RyanTM
bd161bbef4 qownnotes: 19.6.1 -> 19.7.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
 2019-07-20 07:29:45 -07:00
Frederik Rietdijk
a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
R. RyanTM
db7a7d626a kmymoney: 5.0.4 -> 5.0.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/kmymoney/versions
 2019-07-15 12:32:45 -07:00
Frederik Rietdijk
22cb7f25f2 Merge master into staging-next 2019-07-11 09:40:10 +02:00
Jonathan Ringer
70b6df196a treesheets: 2018-8-18 -> 1.0.1 2019-07-10 23:00:59 +01:00
Frederik Rietdijk
da96a4119f Merge staging-next into staging 2019-07-10 08:52:50 +02:00
Frederik Rietdijk
fb6260fcf7
Merge pull request #64236 from NixOS/staging-next 
Staging next
 2019-07-10 08:52:04 +02:00
Frederik Rietdijk
7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Will Dietz
9921afa53f
trilium: (0.32.4,0.33.5) -> 0.33.6 2019-07-09 07:01:24 -05:00
Vladimír Čunát
0746c4dbb4
Merge branch 'master' into staging-next 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
 2019-07-06 13:44:40 +02:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps 
Wrap Qt applications
 2019-07-05 14:38:10 -05:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
markuskowa
d8adf54f25
Merge pull request #64206 from r-ryantm/auto-update/skrooge 
skrooge: 2.19.1 -> 2.20.0
 2019-07-03 21:35:29 +02:00
Frederik Rietdijk
25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
R. RyanTM
192f3e0bbb skrooge: 2.19.1 -> 2.20.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/skrooge/versions
 2019-07-02 16:45:06 -07:00
Aaron Andersen
1e5237bce8
Merge pull request #64035 from r-ryantm/auto-update/gnucash 
gnucash: 3.5 -> 3.6
 2019-07-01 16:32:59 -04:00
R. RyanTM
839a149f88 gnucash: 3.5 -> 3.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
 2019-07-01 09:09:02 -07:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Nathan Yong
4976d7ec3f watson: use pytest for testing 2019-07-01 13:20:13 +10:00
Nathan Yong
50855c5141 watson: use expected pname in NixOS package 2019-07-01 13:18:56 +10:00
Nathan Yong
f7710fdd8e watson: 1.5.2 -> 1.7.0 2019-07-01 12:25:43 +10:00
kjuvi
0c739fd88c timetable: init at 1.0.6 2019-06-26 23:06:59 +02:00
Vladimír Čunát
772d2d03f9
Merge #63555: gnumeric: fix darwin build by upstream patch 2019-06-23 09:16:14 +02:00
Vladimír Čunát
12bdb0dc3f
gnumeric: fix darwin build by upstream patch 2019-06-23 09:13:46 +02:00
Aluísio Augusto Silva Gonçalves
50229a5f6f
libreoffice-fresh: 6.2.3.2 -> 6.2.4.2 2019-06-21 09:28:56 -03:00
markuskowa
8cf9342e2f
Merge pull request #63474 from r-ryantm/auto-update/zotero 
zotero: 5.0.66 -> 5.0.67
 2019-06-20 14:20:16 +02:00
Ryan Mulligan
3422a7a352
Merge pull request #63410 from r-ryantm/auto-update/qownnotes 
qownnotes: 19.5.7 -> 19.6.1
 2019-06-18 13:26:25 -07:00
R. RyanTM
ecf9cd3513 zotero: 5.0.66 -> 5.0.67 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zotero/versions
 2019-06-18 12:12:55 -07:00
R. RyanTM
283990035d qownnotes: 19.5.7 -> 19.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/qownnotes/versions
 2019-06-17 20:39:41 -07:00
worldofpeace
0adf3d58b3
Merge pull request #63312 from r-ryantm/auto-update/notes-up 
notes-up: 2.0.1 -> 2.0.2
 2019-06-17 06:21:12 -04:00
R. RyanTM
da916b5b96 notes-up: 2.0.1 -> 2.0.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/notes-up/versions
 2019-06-17 02:49:41 -07:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Izorkin
315c020d79 libreoffice: build with mysql.connector-c 2019-06-15 11:23:27 +03:00
Vladimír Čunát
b6e10d79e9
Merge #62798: gnumeric: 1.12.44 -> 1.12.45 2019-06-13 16:21:00 +02:00
Renaud
1ace3842d4
Merge pull request #62349 from r-ryantm/auto-update/atlassian-cli 
atlassian-cli: 8.2.0 -> 8.5.0
 2019-06-10 15:59:16 +02:00
Vladimír Čunát
7bf37e1f8b
Merge #61817: docear: init at 1.2.0 2019-06-09 15:25:54 +02:00
Will Dietz
1a9a7fb7c8
trilium: 0.32.3 -> 0.32.4 2019-06-06 22:01:44 -05:00
Will Dietz
fd21f3fb47
gnumeric: 1.12.44 -> 1.12.45 
http://www.gnumeric.org/announcements/1.12/gnumeric-1.12.45.html
 2019-06-06 21:59:38 -05:00
Will Dietz
a4113fe531
trilium: 0.30.8 -> 0.32.3 2019-06-04 15:18:08 -05:00
Mario Rodas
36de7f4181
Merge pull request #62621 from jerith666/timetrap-t 
timetrap: restore "t" executable
 2019-06-04 05:49:18 -05:00
worldofpeace
73e3b77d3d
Merge pull request #62575 from r-ryantm/auto-update/spice-up 
spice-up: 1.8.1 -> 1.8.2
 2019-06-03 16:13:28 -04:00
Ryan Mulligan
106e639b91
Merge pull request #62598 from r-ryantm/auto-update/zim 
zim: 0.71.0 -> 0.71.1
 2019-06-03 05:50:52 -07:00
R. RyanTM
376b9675eb zim: 0.71.0 -> 0.71.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/zim/versions
 2019-06-03 03:39:20 -07:00
R. RyanTM
3803b5d714 spice-up: 1.8.1 -> 1.8.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spice-up/versions
 2019-06-02 22:00:46 -07:00
Will Dietz
ae71c13a92
Merge pull request #62552 from r-ryantm/auto-update/qownnotes 
qownnotes: 19.4.5 -> 19.5.7
 2019-06-02 22:54:44 -05:00
R. RyanTM
fc5b800a7a qownnotes: 19.4.5 -> 19.5.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
 2019-06-02 17:46:27 -07:00
Pascal Wittmann
d808fbd239
Merge pull request #62435 from r-ryantm/auto-update/homebank 
homebank: 5.2.5 -> 5.2.6
 2019-06-02 08:42:35 +02:00
R. RyanTM
24a5767f62 homebank: 5.2.5 -> 5.2.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
 2019-06-01 14:33:28 -07:00
Will Dietz
f6c482cb4b
vnote: 2.5 -> 2.6 2019-06-01 01:07:37 -05:00
R. RyanTM
b97ffda1a9 atlassian-cli: 8.2.0 -> 8.5.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/atlassian-cli/versions
 2019-05-31 21:29:05 -07:00
Roman Kuznetsov
07cac4f9be
vnote: init at 2.5 2019-05-29 12:39:00 +02:00
Renato Alves
bd95c913b8
docear: init at 1.2.0 
Stable URLs are only provided for older versions.
 2019-05-27 03:53:57 +02:00
Matt McHenry
3ac37478b9 timetrap: restore "t" executable 
lost in 44a554792d
 2019-05-23 09:18:23 -04:00
Mario Rodas
ef29606a82
Merge pull request #61815 from r-ryantm/auto-update/homebank 
homebank: 5.2.4 -> 5.2.5
 2019-05-22 00:27:55 -05:00
R. RyanTM
464e7cd885 homebank: 5.2.4 -> 5.2.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/homebank/versions
 2019-05-21 10:08:57 -07:00
Robin Gloster
d40443ba6d
Merge pull request #60517 from manveru/timetrap-update 
timetrap: use bundlerApp
 2019-05-18 09:32:05 +00:00
Will Dietz
0954c36972 kmymoney: 5.0.1 -> 5.0.4 (#60059) 
* kmymoney: 5.0.1 -> 5.0.4

* kmymoney: patch included

* kmymoney: add sqlcipher for db encryption support
 2019-05-09 20:07:12 +02:00
Renaud
cdcc4b2b3d
Merge pull request #61163 from tbenst/mendeley 
mendeley: 1.19.1 -> 1.19.5
 2019-05-09 17:34:53 +02:00
tbenst
a69b9b672c mendeley: 1.19.1 -> 1.19.5 2019-05-08 15:02:01 -07:00
worldofpeace
bb7e5566c7
Merge pull request #44086 from erikarvstedt/paperless 
paperless: add package and service
 2019-05-08 17:17:49 -04:00
Erik Arvstedt
0231273a57
paperless: init at 2.7.0 2019-05-08 09:26:31 +02:00
Renaud
2fb1b3156f
Merge pull request #60932 from c0bw3b/patches-cleanup 
[treewide] delete (some) unused patches
 2019-05-07 23:34:04 +02:00
Will Dietz
d90da9197a libreoffice-fresh: 6.2.2.2 -> 6.2.3.2 2019-05-06 23:38:11 -05:00
Michael Raskin
7770495cd7
Merge pull request #59148 from volth/gcc.arch.v3 
compilation for particular x86_64 architecture
 2019-05-05 19:12:12 +00:00
royneary
fb0481903f libreoffice: install unopkg for libreoffice-still too 2019-05-05 13:23:08 +02:00
royneary
7bee906a5b libreoffice: install the unopkg extension management tool 2019-05-05 12:26:09 +02:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
volth
091de095c9 -mno-fma is x86_64 only; it hinders aarch64 compilation 2019-05-04 15:31:02 +00:00
Alyssa Ross
b896b267de
Merge pull request #60509 from manveru/ledger-web-update 
ledger-web: use bundlerApp
 2019-05-04 13:18:37 +00:00
Alyssa Ross
3a2be59dff
Merge pull request #60795 from manveru/ppl-address-book-update 
ppl-address-book: delete
 2019-05-04 12:57:52 +00:00
worldofpeace
974476615c
Merge pull request #60793 from worldofpeace/elementary-appcenter-apps-update 
Update elementary appcenter apps
 2019-05-03 20:18:01 -04:00
Michael Fellinger
cd1bfc3045 ppl-address-book: delete 2019-05-03 18:47:17 +02:00
R. RyanTM
3b11620157 qownnotes: 19.4.1 -> 19.4.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/qownnotes/versions
 2019-05-02 23:14:31 +02:00
worldofpeace
d004fc65bb spice-up: 1.8.0 -> 1.8.1 
https://github.com/Philip-Scott/Spice-up/releases/tag/1.8.1
 2019-05-02 15:01:38 -04:00
worldofpeace
37f742f7e6 aesop: 1.1.0 -> 1.1.1 
https://github.com/lainsce/aesop/releases/tag/1.1.1
 2019-05-02 15:01:38 -04:00
worldofpeace
c71e632151 notes-up: 2.0.0. -> 2.0.1 
https://github.com/Philip-Scott/Notes-up/releases/tag/2.0.1
 2019-05-02 15:01:38 -04:00
Michael Fellinger
44a554792d timetrap: use bundlerApp 2019-04-30 18:55:17 +02:00
Michael Fellinger
553c703918 ledger-web: use bundlerApp 2019-04-30 17:58:57 +02:00
volth
5ad79dc4bb compilation for particular x86_64 architecture 2019-04-30 14:28:04 +00:00
Frederik Rietdijk
2f936f85d8 Merge master into staging-next 2019-04-29 13:46:20 +02:00
Will Dietz
1f0d3623da
Merge pull request #60046 from dtzWill/update/skrooge-2.19.0 
skrooge: 2.18.0 -> 2.19.1
 2019-04-27 22:24:26 -05:00
Will Dietz
754639669e
Merge pull request #60050 from dtzWill/update/kexi-3.2.0 
kproperty,kreport,kexi: 3.1.0 -> 3.2.0
 2019-04-27 22:22:27 -05:00
Pascal Wittmann
3c874c4f4e
zim: 0.70 -> 0.71.0 2019-04-27 13:09:40 +02:00
Frederik Rietdijk
883232c00d Merge master into staging-next 2019-04-27 07:01:38 +02:00
Matthias Beyer
31bee0cc7c
wordgrinder: Fix build 
First I tried to fix the build like this:

> This fixes the build of the wordgrinder package by disabling the build
> of "xwordgrinder", the non-curses frontend of wordgrinder.
>
> For re-enabling the build, this patch shall be reverted and then go on
> from there.
>
> I opted for disabling the x frontend of this program because the whole
> purpose of this is to use a curses writing program (at least for me).
> It seems that hacking around the new build system in nixpkgs is a
> non-trivial task and I wanted to get this package out of the door as
> fast as possible because I already delayed the fix by a few days (or is
> it weeks already), so this is the simple fix.
>
> If someone wants to have the X frontend again, I can invest more time at
> some point.

But then the almighty aszlig came around and told me how to do it right. So here
we go, with a patch from me that is acutally from aszlig (see #60122).

This fixes the build.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: aszlig <aszlig@nix.build>
Fixes: 6b2bd330fa ("wordgrinder: Fix sha256 hash")
Fixes: 19a3abc1b8 ("wordgrinder: 0.7.1 -> 0.7.2")
Merges: https://github.com/NixOS/nixpkgs/pull/60122
Cc: @devhell
 2019-04-26 09:05:05 +02:00
Will Dietz
a0ca4ef082 kexi: patch already applied :) 2019-04-26 00:50:27 -05:00
Will Dietz
d2119663c3 kexi: 3.1.0 -> 3.2.0 2019-04-26 00:50:27 -05:00
Will Dietz
6e4fa85446
Merge pull request #56259 from dtzWill/feature/minetime 
minetime: init at 1.4.12
 2019-04-25 23:22:30 -05:00
Renaud
7c5cb3e99f
Merge pull request #59445 from r-ryantm/auto-update/atlassian-cli 
atlassian-cli: 8.0.0 -> 8.2.0
 2019-04-24 21:54:44 +02:00
Will Dietz
cbd1ef54fb skrooge: 2.19.0 -> 2.19.1 2019-04-24 09:25:23 -05:00
Matthew Bauer
84d00355e8 Merge remote-tracking branch 'NixOS/master' into staging 2019-04-23 22:00:42 -04:00
Will Dietz
fc6c5fdfed minetime: 1.4.12 -> 1.5.1, better entrypoint name, drop unused 32bit 
https://github.com/marcoancona/MineTime/releases/tag/v1.5.1
https://github.com/marcoancona/MineTime/releases/tag/v1.5.0
 2019-04-23 20:43:04 -05:00
Will Dietz
9db228d506 minetime: 1.4.11 -> 1.4.12 2019-04-23 20:40:54 -05:00
Will Dietz
a7065d315d minetime: 1.4.10 -> 1.4.11 
https://github.com/marcoancona/MineTime/releases/tag/v1.4.11
 2019-04-23 20:40:54 -05:00
Will Dietz
25fb5d553c minetime: init at 1.4.10, using appimageTools 2019-04-23 20:40:53 -05:00
Will Dietz
9f50259ea6 trilium: 0.30.6 -> 0.30.8 
https://github.com/zadam/trilium/releases/tag/v0.30.8
https://github.com/zadam/trilium/releases/tag/v0.30.7
 2019-04-22 15:23:08 -05:00
Will Dietz
a9fca8aadf skrooge: 2.18.0 -> 2.19.0 2019-04-22 15:09:08 -05:00
Jan Tojnar
d3259ed673
Merge branch 'master' into staging 2019-04-20 12:49:01 +02:00
Aaron Andersen
8c881a1bb5
Merge pull request #59521 from r-ryantm/auto-update/gnucash 
gnucash: 3.4 -> 3.5
 2019-04-18 21:09:32 -04:00
R. RyanTM
55542f0cfb zotero: 5.0.60 -> 5.0.66 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zotero/versions
 2019-04-18 08:43:31 +02:00
Matthew Bauer
f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes 
treewide: update homepages to https where available
 2019-04-15 20:47:30 -04:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available 
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
 2019-04-15 10:10:05 -04:00
R. RyanTM
49b84c3907 homebank: 5.2.3 -> 5.2.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
 2019-04-14 16:29:45 -07:00
R. RyanTM
26db3956e3 gnucash: 3.4 -> 3.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/gnucash/versions
 2019-04-14 13:51:13 -07:00
R. RyanTM
68577a59bf atlassian-cli: 8.0.0 -> 8.2.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/atlassian-cli/versions
 2019-04-14 00:28:26 -07:00
aszlig
6b2bd330fa
wordgrinder: Fix sha256 hash 
The hash used for fetchFromGitHub was on the archive itself, however
fetchFromGitHub is actually a wrapper of fetchzip:

hash mismatch in fixed-output derivation '...-source':
  wanted: sha256:1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf
  got:    sha256:08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal

When using nix-prefetch-url without the --unpack argument, I get:

1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf

And with the --unpack argument:

08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal

Just to be 100% sure the contents are the same, I also diffed the
contents of the former tarball with the outputs of the unpacked dir and
they're the same.

I didn't actually test the package (which doesn't build right now
anyway), but now at least the source checksum is fixed :-)

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthiasbeyer
 2019-04-11 14:58:02 +02:00
Timo Kaufmann
bd50fc942b
Merge pull request #56809 from jpathy/patch-2 
Zotero: Fix to use patchelf instead of FHS Env.
 2019-04-11 00:31:31 +02:00
Ryan Mulligan
2b377504e7
Merge pull request #57359 from dtzWill/update/scribus-1.4.8 
scribus: 1.4.7 -> 1.4.8, dep fixups
 2019-04-09 20:18:48 -07:00
Pascal Wittmann
14105fd257
Merge pull request #59127 from matthiasbeyer/update-my-packages 
Update my packages
 2019-04-09 13:47:31 +02:00
Silvan Mosberger
cb601bbfed
Merge pull request #58626 from jabranham/ledger 
ledger: 3.1.2 -> 3.1.3
 2019-04-08 21:47:43 +02:00
Matthias Beyer
19a3abc1b8 wordgrinder: 0.7.1 -> 0.7.2 2019-04-08 10:13:47 +02:00
Pascal Wittmann
d5934d3dfc
zim: 0.69.1 -> 0.70 2019-04-06 18:06:36 +02:00
Will Dietz
f3724d77a1 qownnotes: 19.3.4 -> 19.4.1 (#59040) 2019-04-06 10:14:58 +00:00
xeji
ba01392d91
Merge pull request #58946 from marzipankaiser/fix/grisbi-update 
grisbi: 1.0.4 -> 1.2.1
 2019-04-04 22:46:43 +02:00
Marcial Gaißert
c67332cbee
grisbi: add missing dependency libgsf 
Without libgsf, the build fails
 2019-04-03 23:02:28 +02:00
Marcial Gaißert
9e696227b8
grisbi: 1.0.4 -> 1.2.1 2019-04-03 23:02:16 +02:00
Carles Pagès
44346895b1 calligra: mark broken 
Fails to start, kde home not found.
 2019-04-02 01:06:20 +02:00
Alex Branham
641ef35b6a
ledger: 3.1.2 -> 3.1.3 2019-03-31 11:39:41 -05:00
worldofpeace
ba25c931a3 notes-up: 1.6.3 -> 2.0.0 
Changelog: https://github.com/Philip-Scott/Notes-up/compare/1.6.3..2.0.0

https://github.com/Philip-Scott/Notes-up/releases/tag/2.0.0
 2019-03-30 22:04:09 -04:00
Will Dietz
9a5cd6cdfb qownnotes: 19.3.0 -> 19.3.4 2019-03-29 17:58:07 -05:00
Will Dietz
6d7d5759fc trilium: 0.30.4 -> 0.30.6 2019-03-29 02:33:48 -05:00
Maximilian Bosch
315643e12b
Merge pull request #58004 from r-ryantm/auto-update/atlassian-cli 
atlassian-cli: 7.8.0 -> 8.0.0
 2019-03-27 19:34:05 +01:00
Will Dietz
17688c1417 libreoffice-fresh: 6.2.1.2 -> 6.2.2.2 (#58236) 
* libreoffice-fresh: 6.2.1.2 -> 6.2.2.2
 2019-03-25 06:32:45 +00:00
Jan Tojnar
97eb65324d treewide: no gnome aliases 2019-03-24 14:46:50 -04:00
Tomas Hlavaty
fa144d2361 libreoffice: japanese added 2019-03-24 08:39:38 +01:00
Michael Raskin
b8ed97001e libreoffice: wrapper: fallback to /tmp if /run is not usable 2019-03-23 12:16:53 +01:00
R. RyanTM
92bd44df8e atlassian-cli: 7.8.0 -> 8.0.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/atlassian-cli/versions
 2019-03-20 22:24:38 -07:00
worldofpeace
3e88dfd47f aesop: 1.0.7 -> 1.1.0 
https://github.com/lainsce/aesop/releases/tag/1.0.8
https://github.com/lainsce/aesop/releases/tag/1.1.0
 2019-03-20 23:10:33 -04:00
Pascal Wittmann
27201851d6
homebank: 5.2.2 -> 5.2.3 2019-03-16 14:57:52 +01:00
R. RyanTM
7de7c5972e cb2bib: 1.9.9 -> 2.0.0 (#55907) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cb2bib/versions
 2019-03-15 23:11:23 +01:00
Michael Raskin
d8d9a520b3
Merge pull request #57266 from NixOS/libreoffice-update 
libreoffice: 6.1.4.2 -> 6.1.5.2, 6.2.1.2
 2019-03-15 08:05:54 +00:00
Michael Raskin
ab56044f22 libreoffice: 6.1.4.2 -> 6.1.5.2, 6.2.1.2 2019-03-14 06:00:05 +01:00
jpathy
453c91af6e
Fix desktop file. 2019-03-14 09:56:39 +05:30
R. RyanTM
419e25e0ef qownnotes: 19.2.3 -> 19.3.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/qownnotes/versions
 2019-03-11 17:12:23 -07:00
Will Dietz
e3e0f79b9f scribus: 1.4.7 -> 1.4.8, dep fixups 
* Needs hunspell not aspell, not sure when
* bake in gs path to avoid warning on launch
* python-pillow for print preview, per README

https://www.scribus.net/scribus-1-4-8-released/
 2019-03-11 04:45:09 -05:00
Will Dietz
7911b288c3 trilium: 0.29.1 -> 0.30.4 (#57056) 
https://github.com/zadam/trilium/releases/tag/v0.30.4
 2019-03-08 21:45:41 +01:00
Jan Tojnar
d3ff902e94
webkit: move to aliases 2019-03-06 00:20:55 +01:00
Kjuvi
f271f943e0 spice-up: 1.7.0 -> 1.8.0 2019-03-05 22:57:51 +01:00
jpathy
142260c991
Zotero: Fix to use patchelf instead of FHS Env. 
Removed buildFHSUserEnv to use `patchelf` on prebuilt binaries and libs. Should fix issue #48814.
 2019-03-04 15:25:17 +05:30
R. RyanTM
5d8f93a5da fava: 1.9 -> 1.10 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fava/versions
 2019-03-01 20:18:41 -08:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible 
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
 2019-02-26 14:10:49 +00:00
Frederik Rietdijk
c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00