Commit Graph

11546 Commits

Author SHA1 Message Date
github-actions[bot]
04e48fbe4f
Merge staging-next into staging 2021-09-13 18:01:51 +00:00
github-actions[bot]
ce44d09c85
Merge master into staging-next 2021-09-13 18:01:17 +00:00
Ryan Mulligan
cf11c97010
Merge pull request #137486 from r-ryantm/auto-update/mkgmap-splitter
mkgmap-splitter: 598 -> 642
2021-09-13 09:55:18 -07:00
Ryan Mulligan
c96f9eff9e
Merge pull request #137485 from r-ryantm/auto-update/mkgmap
mkgmap: 4608 -> 4806
2021-09-13 09:54:59 -07:00
github-actions[bot]
12eb8fbbba
Merge staging-next into staging 2021-09-13 06:02:09 +00:00
github-actions[bot]
d6f028d12d
Merge master into staging-next 2021-09-13 06:01:28 +00:00
Ryan Mulligan
43361d3695
Merge pull request #135890 from r-ryantm/auto-update/nwg-drawer
nwg-drawer: 0.1.7 -> 0.1.8
2021-09-12 18:40:46 -07:00
Anderson Torres
5e8507393b
Merge pull request #137537 from r-ryantm/auto-update/yambar
yambar: 1.6.2 -> 1.7.0
2021-09-12 21:36:27 -03:00
github-actions[bot]
fef6f602e6
Merge staging-next into staging 2021-09-12 18:01:50 +00:00
github-actions[bot]
a13bf1828b
Merge master into staging-next 2021-09-12 18:01:21 +00:00
R. RyanTM
12259ba1b4 yambar: 1.6.2 -> 1.7.0 2021-09-12 14:38:54 +00:00
Sandro
d6469da20b
Merge pull request #137493 from r-ryantm/auto-update/obsidian
obsidian: 0.12.12 -> 0.12.15
2021-09-12 16:35:12 +02:00
Sandro
cb17825b8a
Merge pull request #137529 from bobby285271/notejot 2021-09-12 16:19:36 +02:00
Bobby Rong
f460ae5aaa
notejot: 3.1.2 -> 3.1.5 2021-09-12 21:33:36 +08:00
Sandro Jäckel
d279bf9767
taskopen: modernize 2021-09-12 15:25:31 +02:00
github-actions[bot]
7267016c66
Merge staging-next into staging 2021-09-12 12:01:42 +00:00
github-actions[bot]
acd45cb351
Merge master into staging-next 2021-09-12 12:01:10 +00:00
Maximilian Bosch
f2175a917e
Merge pull request #135179 from r-ryantm/auto-update/taskopen
taskopen: 1.1.4 -> 1.1.5
2021-09-12 12:43:43 +02:00
R. RyanTM
252edd9d16 obsidian: 0.12.12 -> 0.12.15 2021-09-12 07:18:00 +00:00
R. RyanTM
13911f0cc4 mkgmap-splitter: 598 -> 642 2021-09-12 06:27:24 +00:00
R. RyanTM
95b152745d mkgmap: 4608 -> 4806 2021-09-12 06:22:16 +00:00
github-actions[bot]
8bc930ca39
Merge staging-next into staging 2021-09-12 00:02:23 +00:00
github-actions[bot]
3f2255106a
Merge master into staging-next 2021-09-12 00:01:45 +00:00
Sandro
a05ed53b2c
Merge pull request #137254 from samalws/master
wike: init at 1.5.6
2021-09-11 21:55:21 +02:00
Sandro
b8347941fe
Merge pull request #137201 from figsoda/joshuto
joshuto: init at 0.9.0
2021-09-11 21:27:44 +02:00
figsoda
ebc030ce75 joshuto: init at 0.9.0 2021-09-11 14:23:31 -04:00
github-actions[bot]
d370d9ee99
Merge staging-next into staging 2021-09-11 18:01:51 +00:00
github-actions[bot]
c435b0e35f
Merge master into staging-next 2021-09-11 18:01:16 +00:00
Sam Alws
7fad7281d8 wike: init at 1.5.6 2021-09-11 13:51:43 -04:00
Sandro Jäckel
50d04198ca
gofu: init at unstable-2021-09-11 2021-09-11 19:03:48 +02:00
Sandro
91333fe5c9
Merge pull request #136977 from andresilva/rofi-emoji-2.2.0
rofi-emoji: 2.1.2 -> 2.2.0
2021-09-11 15:56:00 +02:00
Sandro
095cdd6e0b
Merge pull request #137375 from SuperSandro2000/calibre 2021-09-11 15:48:29 +02:00
Sandro
b30f86337e
Merge pull request #137255 from raboof/k4dirstat-update-to-3.3.0
k4dirstat: 3.2.2 -> 3.3.0
2021-09-11 15:36:41 +02:00
Sandro Jäckel
8a3900198f
calibre: remove unused input 2021-09-11 14:26:37 +02:00
Sandro
24290db5f4
Merge pull request #137331 from dsg22/feature-calibre-add-jeepney-dependency 2021-09-11 14:23:54 +02:00
github-actions[bot]
ff5297bcd3
Merge staging-next into staging 2021-09-11 12:01:45 +00:00
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
Davíð Steinn Geirsson
0f54dbf54f calibre: Add python3Packages.jeepney as dependency
Required for sending books to my Kobo Aura ereader.
2021-09-11 00:59:19 +00:00
github-actions[bot]
fa42e187e1
Merge staging-next into staging 2021-09-10 18:01:52 +00: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