Commit graph

10232 commits

Author SHA1 Message Date
github-actions[bot] dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Nikolay Korotkiy 5c3a1c2808 nnn: 3.6 → 4.0 2021-04-15 11:34:01 -04:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Sandro 609765dd85
Merge pull request #119095 from friedelino/upd-googlearth 2021-04-14 21:17:11 +02:00
lewo 51c9228cc5
Merge pull request #119161 from r-ryantm/auto-update/simplenote
simplenote: 2.8.0 -> 2.9.0
2021-04-14 20:34:36 +02:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Frido Friedemann af7ac408a1 googleearth-pro: init at 7.3.3.7786 2021-04-14 06:40:49 +02:00
Pierre Labadens 433582addc
clight: 4.2 → 4.5 2021-04-13 16:54:15 +02:00
1000101 50d3824728 stretchly: 1.2.0 -> 1.5.0 2021-04-13 13:03:34 +02:00
Mario Rodas cc7a19c7ed
Merge pull request #119056 from r-ryantm/auto-update/navi
navi: 2.14.0 -> 2.15.0
2021-04-13 00:12:08 -05:00
Ryan Mulligan 551bbeddea
Merge pull request #118229 from r-ryantm/auto-update/logseq
logseq: 0.0.15 -> 0.0.16
2021-04-12 19:52:14 -07:00
Karthik Iyengar 89f7a2a5aa unipicker: unstable-2018-07-10 -> 2.0.1 2021-04-13 03:10:47 +05:30
Pascal Bach 0c896e754d
Merge pull request #118383 from fortuneteller2k/update-lutris
lutris: 0.5.7.1 -> 0.5.8.3
2021-04-12 21:56:42 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Sandro 08dcbd34f4
Merge pull request #119237 from symphorien/pdfarrangerupdate
pdfarranger: 1.7.0 -> 1.7.1
2021-04-12 20:07:50 +02:00
Robin Gloster 3e2d34b8a8
qlcplus: fix build
Fixes #118174
2021-04-12 12:26:38 -05:00
Symphorien Gibol 176735899e pdfarranger: 1.7.0 -> 1.7.1 2021-04-12 18:25:21 +02:00
Maximilian Bosch 730a2d3ab1
Merge pull request #119143 from r-ryantm/auto-update/qdirstat
qdirstat: 1.7 -> 1.7.1
2021-04-12 17:55:57 +02:00
Fabian Affolter 8a6fac4b02
qdirstat: specify license 2021-04-12 17:51:09 +02:00
Sandro ec2157bc32
Merge pull request #117500 from dotlambda/pytrainer-2.0.2
pytrainer: 2.0.1 -> 2.0.2
2021-04-12 16:52:04 +02:00
Sandro 52034d0393
Merge pull request #119192 from 0x4A6F/master-dasel
dasel: 1.13.6 -> 1.14.0
2021-04-12 15:25:51 +02:00
0x4A6F fd980c588a
dasel: 1.13.6 -> 1.14.0 2021-04-12 08:56:57 +02:00
Mario Rodas 28a3299425 navi: fix build on darwin 2021-04-12 04:20:00 +00:00
Sandro e6b721a13a
Merge pull request #114776 from michojel/megaFix-4.4.0 2021-04-12 04:20:23 +02:00
Julien Moutinho a1bc838a5e
blender: install with python3Packages.requests, fixes #97250 (#118987)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-12 04:12:40 +02:00
Sandro 186151f303
Merge pull request #118769 from p-h/add-foxitreader 2021-04-12 01:44:25 +02:00
R. RyanTM 004cbe406a simplenote: 2.8.0 -> 2.9.0 2021-04-11 15:50:12 +00:00
R. RyanTM 4862923786 qdirstat: 1.7 -> 1.7.1 2021-04-11 14:20:15 +00:00
Ryan Mulligan 39156b1bad
Merge pull request #119059 from r-ryantm/auto-update/obsidian
obsidian: 0.11.9 -> 0.11.13
2021-04-10 17:29:31 -07:00
Michal Minář c9b141a3b2 megasync: 4.3.5.0 -> 4.4.0.0
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2021-04-10 20:06:12 +02:00
R. RyanTM ea4b7bdc57 obsidian: 0.11.9 -> 0.11.13 2021-04-10 16:53:54 +00:00
R. RyanTM c295eedd06 navi: 2.14.0 -> 2.15.0 2021-04-10 16:26:17 +00:00
AndersonTorres bd9c23dcb3 udiskie: 2.3.2 -> 2.3.3 2021-04-09 21:05:52 -03:00
fortuneteller2k b9e4b2f679 lutris: 0.5.7.1 -> 0.5.8.3 2021-04-10 07:20:57 +08:00
github-actions[bot] 824aac3428
Merge staging-next into staging 2021-04-09 06:05:57 +00:00
github-actions[bot] 496c7d3e9d
Merge master into staging-next 2021-04-09 06:05:54 +00:00
Dmitry Kalinkin 219590673c
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
Anderson Torres a60f46b491
Merge pull request #118857 from plabadens/free42-3.0.2
free42: 3.0.1 -> 3.0.2
2021-04-08 23:23:54 -03:00
Sandro d5b46bbaa0
Merge pull request #118723 from oxalica/bump/electron-cash 2021-04-09 02:32:04 +02:00
Pierre Labadens c60e80494b
free42: 3.0.1 -> 3.0.2
Add plabadens as a maintainer.
2021-04-09 00:10:12 +02:00
github-actions[bot] 85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Anderson Torres 71433ce823
Merge pull request #118468 from plabadens/master
free42: add desktop item
2021-04-08 13:09:09 -03:00
Pierre Labadens 37515f7df0
free42: add desktop items
Add a desktop item for both the `free42bin1 and `free42dec` variant of
Free42.
2021-04-08 17:50:21 +02:00
Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
Robert Schütz fc83244455 metadata-cleaner: 1.0.3 -> 1.0.4 2021-04-08 15:20:42 +02:00
Sandro 21264a9367
Merge pull request #116651 from jumper149/master
blucontrol-wrapper: init
2021-04-08 14:26:11 +02:00
Philippe Hürlimann 73d596e3f7 foxitreader: init at 2.4.4.0911 2021-04-08 12:37:46 +02:00
github-actions[bot] 0ba1008684
Merge master into staging-next 2021-04-08 06:05:39 +00:00
Christian Kögler 8a17db4c8a
qcad: 3.26.0.1 -> 3.26.1.0 (#118397) 2021-04-08 02:31:05 +02:00
github-actions[bot] 8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00