github-actions[bot]
4170ee273c
Merge master into staging-next
2021-09-11 12:01:12 +00:00
Sandro
c2d175cf8f
Merge pull request #135195 from r-ryantm/auto-update/logseq
2021-09-11 13:22:48 +02:00
Sandro
442814e7bf
Merge pull request #137310 from xfix/skytemple_1_3_0
2021-09-11 12:58:09 +02:00
Alyssa Ross
56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/compilers/ghc/8.10.7.nix
pkgs/development/compilers/ghc/8.8.4.nix
I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
Sandro
255aa0d09f
Merge pull request #137366 from NixOS/pkg/masterpdfeditor
2021-09-11 12:31:06 +02:00
Doron Behar
b13ce4ae6b
masterpdfeditor: 5.7.20 -> 5.7.90
...
Unmark as broken.
2021-09-11 11:48:32 +03:00
Sandro Jäckel
30f537a5fb
zk-shell: switch to python3, cleanup
2021-09-11 08:46:27 +02:00
Konrad Borowski
b435e06df0
skytemple: 1.2.5 -> 1.3.0
2021-09-11 06:33:20 +02:00
Mario Rodas
144b3d064e
Merge pull request #137251 from marsam/init-sqls
...
sqls: init at 0.2.19
2021-09-10 23:02:35 -05:00
Mario Rodas
3a84bf77ea
Merge pull request #137244 from marsam/update-gallery-dl
...
gallery-dl: 1.18.3 -> 1.18.4
2021-09-10 22:17:36 -05:00
github-actions[bot]
36ce45efae
Merge master into staging-next
2021-09-10 18:01:17 +00:00
Sandro
18d57944aa
Merge pull request #135282 from r-ryantm/auto-update/senv
...
senv: 0.5.0 -> 0.7.0
2021-09-10 19:28:01 +02:00
Sandro
91a4081ce4
Merge pull request #136848 from bbigras/anytype
...
anytype: 0.18.59 -> 0.18.68
2021-09-10 19:19:21 +02:00
Sandro
cc3184940f
Merge pull request #136091 from TravisDavis-ops/nhentai
2021-09-10 19:07:15 +02:00
github-actions[bot]
912b8082df
Merge master into staging-next
2021-09-10 00:01:31 +00:00
Lassulus
b385171df1
Merge pull request #136195 from 0x4A6F/master-dasel
...
dasel: 1.19.0 -> 1.20.0
2021-09-10 01:14:51 +02:00
Bruno Bigras
a91582264c
anytype: 0.18.59 -> 0.18.68
2021-09-09 11:13:11 -04:00
github-actions[bot]
fc5d1c0828
Merge master into staging-next
2021-09-09 12:01:24 +00:00
Nikolay Korotkiy
3e78857051
josm: 18118 → 18193
2021-09-09 12:48:43 +02:00
github-actions[bot]
77893d86c2
Merge master into staging-next
2021-09-09 06:01:04 +00:00
Artturi
96791c9131
Merge pull request #137056 from Artturin/ulaunchershebang
...
ulauncher: patchShebangs and do not double wrap
2021-09-09 03:24:06 +03:00
Luke Granger-Brown
764a52ba7e
Merge pull request #135414 from trofi/fix-imake-vendor
...
imake: do not skip Linux* vendor definitions
2021-09-08 23:16:41 +01:00
Mario Rodas
0aedbf2bd9
gallery-dl: add marsam to maintainers
2021-09-08 04:20:00 +00:00
Mario Rodas
b77012c1d0
gallery-dl: 1.18.3 -> 1.18.4
...
https://github.com/mikf/gallery-dl/releases/tag/v1.18.4
2021-09-08 04:20:00 +00:00
Artturin
7df8ba4012
ulauncher: patchShebangs and do not double wrap
2021-09-08 05:26:05 +03:00
github-actions[bot]
80cab1d056
Merge master into staging-next
2021-09-07 18:01:08 +00:00
Bruno Bigras
0d4dd66d6e
obsidian: pin electron 13
...
fix #136992
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
2021-09-07 11:49:37 -04:00
Vladimír Čunát
09f5763784
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
Anderson Torres
2be182ab81
Merge pull request #136829 from r-ryantm/auto-update/bibletime
...
bibletime: 3.0.1 -> 3.0.2
2021-09-07 01:55:24 -03:00
Jörg Thalheim
76491d0c3b
Merge pull request #136746 from r-ryantm/auto-update/worker
...
worker: 4.8.1 -> 4.9.0
2021-09-07 03:52:12 +01:00
Sergei Trofimovich
bace74bbf8
xcruiser: explicitly set LIBDIR and CONFDIR
...
In preparation to fix long-standing `imake` bug #135337 we need
to set `LIBDIR` and `CONFDIR` away from incorrectly embedded
`xorg-cf-files`. Before #135337 the package worked by chance.
Issue: https://github.com/NixOS/nixpkgs/issues/135337
2021-09-06 07:46:13 +01:00
Sergei Trofimovich
1333bd9ac0
xxkb: explicitly set LIBDIR and CONFDIR
...
In preparation to fix long-standing `imake` bug #135337 we need
to set `LIBDIR` and `CONFDIR` away from incorrectly embedded
`xorg-cf-files`. Before #135337 the package worked by chance.
Issue: https://github.com/NixOS/nixpkgs/issues/135337
2021-09-06 07:46:12 +01:00
R. RyanTM
ac461b815e
bibletime: 3.0.1 -> 3.0.2
2021-09-06 01:39:58 +00:00
github-actions[bot]
75dc00dbd8
Merge master into staging-next
2021-09-05 18:00:57 +00:00
Ryan Mulligan
5f287467ed
Merge pull request #136745 from r-ryantm/auto-update/xplr
...
xplr: 0.14.5 -> 0.14.7
2021-09-05 06:02:06 -07:00
Martin Weinelt
f777eddfce
plover.dev: 4.0.0.dev8 -> 4.0.0.dev10
...
Also unpins the aging python36Packages.
2021-09-05 15:00:37 +02:00
Sandro Jäckel
081a0fa202
variety: use python3Packages instead of python37Packages
2021-09-05 15:00:36 +02:00
github-actions[bot]
5b6c2380ad
Merge master into staging-next
2021-09-05 12:01:20 +00:00
Fabian Affolter
7a08a9b2fb
Merge pull request #136754 from manojkarthick/reddsaver-v0.4.0
...
reddsaver: 0.3.3 -> 0.4.0
2021-09-05 09:55:15 +02:00
Manoj Karthick
d5327b6de2
reddsaver: 0.3.3 -> 0.4.0
2021-09-04 23:25:06 -07:00
github-actions[bot]
a791a00dd8
Merge master into staging-next
2021-09-05 06:01:27 +00:00
R. RyanTM
6a57a78ec0
worker: 4.8.1 -> 4.9.0
2021-09-05 04:19:29 +00:00
R. RyanTM
2d1908ac0b
xplr: 0.14.5 -> 0.14.7
2021-09-05 04:07:08 +00:00
Sandro
33d3282b12
Merge pull request #130028 from cab404/super-slicer-2-3-56-7
...
super-slicer: 2.3.56.5 -> 2.3.56.8
2021-09-05 04:01:08 +02:00
github-actions[bot]
5993483dcb
Merge master into staging-next
2021-09-05 00:01:33 +00:00
Vladimir Serov
c879a416bb
super-slicer: 2.3.56.5 -> 2.3.56.8
2021-09-04 23:00:11 +03:00
davidak
7c6e80f5c2
Merge pull request #136702 from bobby285271/notejot
...
notejot: 3.1.1 -> 3.1.2
2021-09-04 20:04:15 +02:00
github-actions[bot]
6c9e0f15dc
Merge master into staging-next
2021-09-04 18:01:10 +00:00
Maximilian Bosch
4e2861e270
Merge pull request #136510 from Kranzes/bump-hugo
...
hugo: 0.87.0 -> 0.88.0
2021-09-04 18:51:33 +02:00
Bobby Rong
f04979d632
notejot: 3.1.1 -> 3.1.2
2021-09-04 22:54:44 +08:00