Commit Graph

1254 Commits

Author SHA1 Message Date
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
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
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