Commit graph

5017 commits

Author SHA1 Message Date
xeji 9e87b56dd1
zathura: 0.4.0 -> 0.4.1 (#47140)
This fixes the synctex-related build failure with texlive 2018
(currently on 18.09).
2018-09-22 14:17:34 +02:00
R. RyanTM a454984adb mediainfo: 18.08 -> 18.08.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/mediainfo/versions
2018-09-20 18:39:37 +02:00
José Romildo Malaquias 0c631248c1 tint2: 16.4 -> 16.6.1 (#46994) 2018-09-20 18:37:33 +02:00
adisbladis 42f486703d
overmind: 2.0.0.beta1 -> 1.2.1
Newer version has some weird failure cases related to PATH
2018-09-20 10:10:07 +08:00
Michael Weiss e8a35913e1 jekyll: 3.8.3 -> 3.8.4 (security) 2018-09-19 19:16:16 +02:00
Michael Weiss 265c5fc485 gollum: 4.1.2 -> 4.1.3 2018-09-19 19:07:20 +02:00
Frederik Rietdijk de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Pascal Wittmann 536b49f46c
calibre: 3.30.0 -> 3.31.0 2018-09-16 19:26:12 +02:00
Elis Hirwing 36ec1db42d sequeler: 0.6.1 -> 0.6.2 (#46692)
Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.2
2018-09-15 16:09:49 +02:00
Peter Hoeg ffd478454d xca: 2.1.0 -> 2.1.1 2018-09-14 16:23:18 +08:00
Sarah Brofeldt 098ecfba8f
Merge pull request #46590 from eadwu/glava/1.5.1
glava: 1.4.5 -> 1.5.1
2018-09-14 08:53:26 +02:00
Jan Tojnar b3d079f34a
Merge pull request #46365 from worldofpeace/elementary-variety
add various elementary thirdparty applications
2018-09-14 02:17:26 +02:00
Uli Baum 1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
Edmund Wu bdac537a87
glava: 1.4.5 -> 1.5.1 2018-09-12 21:40:23 -04:00
R. RyanTM d8b1223da9 tilix: 1.8.3 -> 1.8.5 (#46180)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tilix
2018-09-12 22:57:25 +02:00
R. RyanTM c3c4270267 worker: 3.15.1 -> 3.15.2 (#46155)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
worker
2018-09-12 22:41:44 +02:00
Alexandre Peyroux 899b7663b0
masterpdfeditor: 5.1.12 -> 5.1.36 2018-09-12 21:35:16 +02:00
Joachim Fasting 1e379f29f7
electrum: 3.1.3 -> 3.2.3 2018-09-12 21:22:23 +02:00
Matthieu Coudron 14d9857604 pythonPackages.khard: zsh autocompletion
'cos that's cool
2018-09-11 18:43:15 +09:00
Michael Fellinger bc7c56f2a4 taskjuggler: 3.5.0 -> 3.6.0 2018-09-11 03:06:29 +02:00
Toon Nolten a2bb5d6917 ranger: 1.9.1 -> 1.9.2 (#46454)
* ranger: 1.9.1 -> 1.9.2

* Change maintainer attribute name to match usage
2018-09-10 11:48:49 +02:00
xeji 868f2561b5
Merge pull request #46456 from samueldr/auto/dbeaver/nixpkgs-unstable/5.2.0
dbeaver: 5.1.6 -> 5.2.0
2018-09-10 08:20:07 +02:00
Samuel Dionne-Riel cf3795a25e dbeaver: 5.1.6 -> 5.2.0 2018-09-09 20:34:47 -04:00
worldofpeace 59821548f0 notejot: init at 1.4.5 2018-09-09 18:34:31 -04:00
Jörg Thalheim c2871fcca5
Merge pull request #46386 from etu/update-sequeler
sequeler: 0.6.0 -> 0.6.1
2018-09-09 15:03:11 +01:00
Samuel Dionne-Riel ca80826d30
Merge pull request #46150 from ysndr/fix/solaar
Fix: Build solaar with pythonPackages
2018-09-08 18:17:47 -04:00
Elis Hirwing 39ed38f017
sequeler: 0.6.0 -> 0.6.1
Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.1
2018-09-08 20:24:31 +02:00
R. RyanTM cd20437f81
josm: 14066 -> 14178
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
josm
2018-09-08 13:42:49 +02:00
lewo 84e4cfcda0
Merge pull request #46246 from r-ryantm/auto-update/mediainfo-gui
mediainfo-gui: 18.05 -> 18.08
2018-09-07 23:01:25 +02:00
lewo 1164885985
Merge pull request #46245 from r-ryantm/auto-update/mediainfo
mediainfo: 18.05 -> 18.08
2018-09-07 23:00:05 +02:00
R. RyanTM c8c091f093 mediainfo-gui: 18.05 -> 18.08
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mediainfo-gui
2018-09-06 17:26:08 -07:00
R. RyanTM a1f5f62b29 mediainfo: 18.05 -> 18.08
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mediainfo
2018-09-06 17:17:48 -07:00
Profpatsch 3e45b61a99 lib/trivial: add a few examples of usage of assertMsg/assertOneOf 2018-09-06 18:14:27 +02:00
Yannik Sander 1245621497 build with pythonPackages 2018-09-06 14:56:24 +02:00
Jörg Thalheim b285ea77c2
Merge pull request #46034 from teto/khal_zsh_completion
khal: add zsh completion
2018-09-06 07:56:37 +01:00
Samuel Dionne-Riel a394d08f11 qmapshack: 1.11.1 -> 1.12.0 (#46084) 2018-09-05 08:39:29 +02:00
Bart Brouns 6b74b16579 kitty: 0.11.3 -> 0.12.0 (#46067) 2018-09-04 23:44:04 +02:00
Vladimír Čunát 1428d00aa4
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
2018-09-04 13:06:45 +02:00
Matthieu Coudron 61df695f65 khal: add zsh completion 2018-09-04 19:27:47 +09:00
Jan Tojnar 726e749961
sequeler: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:41 +02:00
Jan Tojnar ef01ca3ade
tootle: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:41 +02:00
Jan Malakhovski a402c8f295 fbreader: 0.99.4 -> 0.99.6, switch to fetchFromGitHub, add more build options (#45840)
This, apparently, is not an official release (it's tagged, but the tarball is not
available on the official site), but this repo is the official repo mentioned on
the official site.

This fixes a bunch of very annoying bugs present in 0.99.4, e.g.

```
$ FBReader filename
```

does not crash anymore. Yay!
2018-09-02 21:47:06 +02:00
Roman Volosatovs 720c163a55 kitty: Add terminfo attr (#45953) 2018-09-02 21:07:31 +02:00
Gabriel Ebner 4d3ed9f5d5 gpxsee: 4.19 -> 5.17 2018-09-02 12:17:22 +02:00
Frederik Rietdijk b910b697f6 Merge master into staging 2018-09-02 12:10:33 +02:00
xeji a3434cf4e5
Merge pull request #45921 from markuskowa/homepages
Cleanup homepage links
2018-09-02 08:39:30 +02:00
Markus Kowalewski e9d904af55
timewarrior: update homepage 2018-09-02 00:23:23 +02:00
Markus Kowalewski de43e1346f
pinfo: remove dead homepage link 2018-09-02 00:19:38 +02:00
Markus Kowalewski 8dbe16b523
pdfshuffler: update homepage 2018-09-02 00:15:39 +02:00
Markus Kowalewski bb6263af72
orpie: update homepage 2018-09-02 00:13:21 +02:00
xeji 62e3355a91
Merge pull request #45909 from markuskowa/licenses-12
Add licenses
2018-09-01 19:09:40 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Vladimír Čunát 342d3db703
Merge branch 'staging-next'
The failure diff seems good-enough on Hydra now.
2018-09-01 17:02:15 +02:00
Markus Kowalewski 0c0656bcdc
xpdf: add license, update homepage 2018-09-01 17:02:14 +02:00
Markus Kowalewski bf0a571725
xchm: add license 2018-09-01 17:02:13 +02:00
Markus Kowalewski 0bd9864dd8
xautoclick: add license 2018-09-01 17:02:13 +02:00
Markus Kowalewski e134ce139e
wordnet: add license 2018-09-01 17:02:13 +02:00
Markus Kowalewski e279a7858e
terminal-notifier: add license 2018-09-01 17:02:13 +02:00
Markus Kowalewski c7808a9013
posterazor: add license 2018-09-01 17:02:13 +02:00
Markus Kowalewski f48d5dae41
pdf-quench: add license 2018-09-01 17:02:12 +02:00
Markus Kowalewski 5194e10968
nut: add licenses 2018-09-01 17:02:12 +02:00
Markus Kowalewski 4f67eabc19
mop: add license 2018-09-01 17:01:51 +02:00
Markus Kowalewski 7ddb87eb5a
krename: add license 2018-09-01 17:01:50 +02:00
Markus Kowalewski b986430d02
gxneur: add licenses 2018-09-01 17:01:46 +02:00
Markus Kowalewski c809cfb197
gphoto2fs: add license + homepage 2018-09-01 16:55:08 +02:00
Markus Kowalewski 98440749c1
goldendict: add license 2018-09-01 16:11:19 +02:00
Markus Kowalewski e350e31691
golden-cheetah: add license 2018-09-01 16:11:19 +02:00
Bignaux Ronan 003b15132c navit: 0.5.1 -> 0.5.3 (#45899) 2018-09-01 14:06:47 +02:00
Jörg Thalheim a749193586
Merge pull request #45870 from bignaux/navit
Navit
2018-09-01 12:09:38 +01:00
R. RyanTM 21e1547d9c gpsprune: 19 -> 19.1 (#45831)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gpsprune
2018-09-01 12:23:25 +02:00
Frederik Rietdijk 4134048b6f Merge master into staging-next 2018-09-01 10:41:58 +02:00
Robert Schütz 0b3f257e06 octoprint: pin pylru to 1.0.9 2018-09-01 10:41:37 +02:00
R. RyanTM 3f2209fe99 mdp: 1.0.13 -> 1.0.14 (#45819)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mdp
2018-08-31 19:58:07 +02:00
Andrew Childs 98787edf30 curaengine: patch for compatibility with cmake 3.12 (#45869) 2018-08-31 16:10:37 +02:00
John Ericson 2c4a75e9ef
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
2018-08-31 09:56:10 -04:00
Bignaux Ronan 9cd5e292e3 navit: 5.0.1 -> 5.0.2 2018-08-31 14:14:07 +02:00
Ivan Malison 9a93fa292f notify-osd-customizable: init at 0.9.35+16.04.20160415 (#43226) 2018-08-31 09:27:08 +02:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Jan Tojnar 4caab41c1b
Merge pull request #37693 from jtojnar/min-nix-two
treewide: Re-add reverted Nix 2 syntax features
2018-08-30 18:50:22 +01:00
Timo Kaufmann bee03c1b0e
Merge pull request #45793 from r-ryantm/auto-update/urh
urh: 2.2.3 -> 2.2.4
2018-08-30 19:33:59 +02:00
Jan Tojnar 0d90e014d6
Revert "qpdfview: remove placeholder usage"
This reverts commit 9e503e039b.
2018-08-30 18:18:31 +02:00
R. RyanTM 41488c2d30 urh: 2.2.3 -> 2.2.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
urh
2018-08-30 09:01:45 -07:00
Alyssa Ross 7b4c7c4b59 extract_url: init at 1.6.2 (#45624)
Squashed from:
* extract_url: init at 1.6.2
* extract_url: purify build
* extract_url: move src to more conventional place
* extract_url: don't unnecessarily propagate
* extract_url: use installFlags instead of patch
* extract_url: use URL literal instead of string
* extract_url: fix make flags style
* extract_url: remove PodChecker dependency
2018-08-30 17:10:00 +02:00
Jörg Thalheim b470ed6b78 alacritty: 2018-07-20 -> 2018-08-30 2018-08-30 08:26:44 +01:00
Jan Tojnar 9a4240f8fb
font-manager: 0.7.3 → 0.7.3.1
Switch to fresher vala
2018-08-30 02:01:17 +02:00
Jörg Thalheim e4881e221b finalterm: remove non-working version (#45737)
This is abandom-ware: https://worldwidemann.com/finally-terminated/
and it coredumps on startup
2018-08-29 11:13:54 +02:00
Jörg Thalheim c198bd3b72
Merge pull request #45710 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.6
dbeaver: 5.1.5 -> 5.1.6
2018-08-28 17:13:50 +01:00
Samuel Dionne-Riel 452ce3915d dbeaver: 5.1.5 -> 5.1.6 2018-08-28 11:47:59 -04:00
R. RyanTM 5de659ce89 urlscan: 0.8.9 -> 0.9.0 (#45532)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urlscan/versions.
2018-08-28 00:31:03 +02:00
Bignaux Ronan 30ab2300bc navit: fix plugins 2018-08-27 23:26:06 +02:00
Jörg Thalheim 718ee42eb9
Merge pull request #45657 from bignaux/navit
navit: add supports, xkdb, and many fixes
2018-08-27 11:39:44 +01:00
Bignaux Ronan 866f9bb578 navit: add supports, xkdb, and many fixes 2018-08-27 12:05:25 +02:00
Pascal Wittmann 9dedda16e9
calibre: 3.29.0 -> 3.30.0 2018-08-26 22:06:25 +02:00
Graham Christensen cca5717170
Merge pull request #45623 from bignaux/xkbd
xkbd: init at 0.8.18
2018-08-26 10:57:59 -04:00
Bignaux Ronan 63257c88c3 xkbd: init at 0.8.18 2018-08-26 15:06:52 +02:00
Florian Klink a3099c9d35 subsurface: 4.7.5 -> 4.8.1 (#45640)
Currently build is broken due to some invalid use of incomplete type 'class QHeaderView':
https://hydra.nixos.org/build/76951177/nixlog/2

CC: @bkchr
2018-08-26 14:45:06 +02:00
Elis Hirwing a2a3a41db6
sequeler: 0.5.9 -> 0.6.0
Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.0
2018-08-25 08:35:57 +02:00
R. RyanTM bd1ebb0fa0 clipmenu: 5.4.0 -> 5.5.0 (#45604)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipmenu/versions.
2018-08-24 23:02:20 +02:00
R. RyanTM 9e0cb36d18 xpad: 5.0.0 -> 5.1.0 (#45529)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xpad/versions.
2018-08-24 10:05:21 +02:00
Vladimír Čunát 7db611f2af
Merge branch 'staging'
Includes libX11 security update.
2018-08-24 09:19:43 +02:00
Valentin Heidelberger 69512da185 keepassxc 2.3.3 -> 2.3.4 (#45482) 2018-08-22 23:51:56 +02:00
Vladimír Čunát e78fd23564
Merge branch 'master' into staging
Hydra: ?compare=1474932
2018-08-22 20:57:14 +02:00
Bignaux Ronan 77085f8324 navit: svn-5576 -> 0.5.1 (#45465) 2018-08-22 20:10:32 +02:00
Mario Rodas 96bf79c2a1 1password: 0.5.1 -> 0.5.3 (#45452) 2018-08-22 12:32:24 +02:00
Matthew Bauer f7bc33abf0 Revert "treewide: fixup breakage due to absolute compiler path"
This reverts commit d0888d1503.
2018-08-22 01:14:53 +02:00
Will Dietz 6097029455 tootle: init 0.1.5 (#45431) 2018-08-21 22:49:21 +02:00
Vladimír Čunát 765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Vladimír Čunát d0888d1503
treewide: fixup breakage due to absolute compiler path
Some packages just can't handle them #44767.  It was tempting to try
to abstract this in some way, but I didn't do that ATM.
2018-08-21 12:34:33 +02:00
Johannes Frankenau 78c8520c86 hugo: 0.47 -> 0.47.1 (#45419) 2018-08-21 11:57:35 +02:00
Sarah Brofeldt 1c77b79071
Merge pull request #45401 from tex/master
kitty: 0.11.2 -> 0.11.3
2018-08-21 10:02:11 +02:00
Milan Svoboda dd3090f3b0 kitty: 0.11.2 -> 0.11.3 2018-08-20 20:49:10 +02:00
Joachim F 203cd959ce
Merge pull request #41989 from CharlesHD/submit/dozenal
dozenal: init at version v12010904
2018-08-20 17:20:00 +00:00
Thomas Mader 3771ffd82e tilix: 1.8.1 -> 1.8.3 2018-08-20 18:46:31 +02:00
CharlesHD 78e94456fd dozenal: init at version v12010904 2018-08-20 11:23:02 +02:00
CharlesHD 0e159e042e hdate: init at version 1.6.02 2018-08-20 11:16:21 +02:00
Jörg Thalheim f520d7ce8c
Merge pull request #45033 from Infinisil/update/buku
buku: 3.7 -> 3.8
2018-08-20 10:01:56 +01:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
R. RyanTM a5c1eeab20 chirp: 20180707 -> 20180815 (#45259)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/chirp-daily/versions.
2018-08-20 00:16:58 +02:00
Silvan Mosberger dce1332c5a
buku: 3.7 -> 3.8 2018-08-20 00:14:56 +02:00
R. RyanTM a11fa70848 krusader: 2.7.0 -> 2.7.1 (#45205)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krusader/versions.
2018-08-19 23:06:49 +02:00
Jörg Thalheim e2915cec9c
Merge pull request #45277 from jfrankenau/update-hugo
hugo: 0.46 -> 0.47
2018-08-18 18:12:16 +01:00
Jörg Thalheim b9fafcfc30
Merge pull request #44323 from hax404/add/qsstv
qsstv: init 9.2.6
2018-08-18 08:24:07 +01:00
Samuel Dionne-Riel e4561a275f
Merge pull request #44784 from r-ryantm/auto-update/gramps
gramps: 4.2.8 -> 5.0.0
2018-08-17 22:14:33 -04:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Matthew Bauer 4ff7702082
Merge pull request #45183 from matthewbauer/macdevelop
Assorted darwin/macOS fixes
2018-08-17 10:29:12 -05:00
Johannes Frankenau 88dc9002dd hugo: 0.46 -> 0.47 2018-08-17 17:25:34 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Mathis Antony 92b016572f
overmind: add which runtime dependency 2018-08-17 15:31:04 +08:00
Jörg Thalheim d3e3b77e97
Merge pull request #45177 from r-ryantm/auto-update/nnn
nnn: 1.8 -> 1.9
2018-08-17 07:30:22 +02:00
Matthew Bauer 030760a994 doomseeker: fix on darwin 2018-08-16 22:44:08 -05:00
R. RyanTM 97b444c295 nnn: 1.8 -> 1.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nnn/versions.
2018-08-16 20:39:49 -07:00
Jörg Thalheim 092fba0c5e
Merge pull request #45139 from r-ryantm/auto-update/urlscan
urlscan: 0.8.7 -> 0.8.9
2018-08-17 00:52:38 +02:00
Jörg Thalheim be3ff0c0c0
Merge pull request #45153 from r-ryantm/auto-update/rtv
rtv: 1.23.0 -> 1.24.0
2018-08-17 00:35:50 +02:00
R. RyanTM 489f23149f rtv: 1.23.0 -> 1.24.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/rtv/versions.
2018-08-16 13:49:52 -07:00
Sage a2e24ae192 eureka-editor: Init at 1.21 (#44171) 2018-08-16 20:36:57 +00:00
R. RyanTM d0e87cbfaf xterm: 333 -> 335 (#45120)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions.
2018-08-16 21:48:05 +02:00
R. RyanTM 0bed16300c urlscan: 0.8.7 -> 0.8.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urlscan/versions.
2018-08-16 12:17:38 -07:00
Jan Tojnar a82ea67994
Merge pull request #43633 from jfrankenau/fix-icon-cache
pulseeffects, lightdm-gtk-greeter, gxmessage, viking: depend on hicolor-icon-theme
2018-08-16 09:30:11 +02:00
Jan Tojnar c03d0b52ac
evilvte: mark as insecure 2018-08-16 00:52:25 +02:00
Eric Wolf ff9a38ee89 ptask: prevent building on darwin as this fails as of now 2018-08-15 12:00:43 +02:00
Eric Wolf b2cf9529d6 ptask: remove usage of nonexistent function is_error
see https://github.com/json-c/json-c/issues/304
2018-08-15 08:00:55 +02:00
Silvan Mosberger 8b9054e6e4
translate-shell: 0.9.6.7 -> 0.9.6.8 2018-08-14 19:56:20 +02:00
Jan Tojnar fe51bf322c
Merge pull request #44820 from michaelpj/fix/redshift-geoclue-agents
redshift/geoclue/localtime: progress in fixing agent confusion
2018-08-14 17:13:09 +02:00
Michael Peyton Jones a1762065c3
redshift: install desktop files, and use absolute paths in them to avoid confusing geoclue agent 2018-08-14 15:53:39 +01:00
xeji abf21a27cb
Merge pull request #44954 from markuskowa/qradiolink
qradiolink: init at 0.5.0
2018-08-14 02:26:25 +02:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Peter Hoeg 6afd19e699 masterpdfeditor: 5.1.00 -> 5.1.12 2018-08-13 17:16:26 +08:00
Sarah Brofeldt 92bb84220f
Merge pull request #44958 from samueldr/auto/dbeaver/nixpkgs-unstable/5.1.5
dbeaver: 5.1.4 -> 5.1.5
2018-08-13 09:15:22 +02:00
Samuel Dionne-Riel 4677b5e4d8 dbeaver: 5.1.4 -> 5.1.5 2018-08-12 21:50:33 -04:00