Commit Graph

4363 Commits

Author SHA1 Message Date
github-actions[bot]
15494ec8f1
Merge master into staging-next 2021-12-25 12:01:18 +00:00
Bobby Rong
7883f6a958
Merge pull request #151968 from r-ryantm/auto-update/stdman
stdman: 2020.11.17 -> 2021.12.21
2021-12-25 19:47:19 +08:00
github-actions[bot]
f5da7cc8e1
Merge master into staging-next 2021-12-24 12:01:23 +00:00
Vanilla
d1df4401f9
flat-remix-gnome: 20211202 -> 20211223 2021-12-24 16:22:27 +08:00
R. Ryantm
5afab5f582 stdman: 2020.11.17 -> 2021.12.21 2021-12-24 05:47:25 +00:00
github-actions[bot]
03b5b0daac
Merge master into staging-next 2021-12-22 12:01:18 +00:00
Bobby Rong
5f42bb01bb
Merge pull request #150131 from r-ryantm/auto-update/sarasa-gothic
sarasa-gothic: 0.34.7 -> 0.35.2
2021-12-22 19:19:15 +08:00
github-actions[bot]
a7f62c75af
Merge master into staging-next 2021-12-21 18:01:15 +00:00
Emery Hemingway
6e54f42bcc unfonts-core: init at 1.0.2-080608 2021-12-21 16:43:04 +01:00
sternenseemann
6749674284 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-21 14:32:10 +01:00
R. Ryantm
0fdd80b61e flat-remix-gtk: 20211130 -> 20211201 2021-12-21 11:06:57 +00:00
github-actions[bot]
e426655e91
Merge master into haskell-updates 2021-12-20 00:08:29 +00:00
github-actions[bot]
2e447628d8
Merge master into staging-next 2021-12-19 06:01:16 +00:00
Bobby Rong
2db6c0be92
Merge pull request #151007 from romildo/upd.marwaita
marwaita: 11.3 -> 12.0
2021-12-19 11:03:36 +08:00
github-actions[bot]
0c19ae0aba
Merge master into haskell-updates 2021-12-19 00:08:41 +00:00
github-actions[bot]
80f539aa69
Merge master into staging-next 2021-12-19 00:01:40 +00:00
Janne Heß
79c0393baf
Merge pull request #151195 from romildo/upd.luna-icons
luna-icons: 1.7 -> 1.8
2021-12-18 21:35:12 +01:00
github-actions[bot]
2add1758ab
Merge master into staging-next 2021-12-18 18:01:03 +00:00
José Romildo
843729d487 luna-icons: 1.7 -> 1.8 2021-12-18 11:04:18 -03:00
Nick Cao
b8ea60f47b
v2ray-domain-list-community: fix cross compilation 2021-12-18 21:15:05 +08:00
github-actions[bot]
2189a53dad
Merge master into haskell-updates 2021-12-17 00:07:55 +00:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
José Romildo
14abdc67db marwaita: 11.3 -> 12.0 2021-12-16 16:44:22 -03:00
Ryan Mulligan
3b15136f74
Merge pull request #150987 from r-ryantm/auto-update/v2ray-geoip
v2ray-geoip: 202112090029 -> 202112160030
2021-12-16 11:12:04 -08:00
sternenseemann
a15b2e876b s6-man-pages: 2.11.0.0.2 -> 2.11.0.0.5 2021-12-16 17:36:44 +01:00
R. Ryantm
858df33c59 v2ray-geoip: 202112090029 -> 202112160030 2021-12-16 16:36:04 +00:00
github-actions[bot]
d3da112c8c
Merge master into haskell-updates 2021-12-15 00:08:01 +00:00
github-actions[bot]
0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Nick Cao
7747c15593
v2ray-geoip: init at 202112090029 2021-12-14 14:22:51 +08:00
github-actions[bot]
b36624c080
Merge master into haskell-updates 2021-12-14 00:07:51 +00:00
github-actions[bot]
784572e7cf
Merge master into staging-next 2021-12-13 18:01:18 +00:00
José Romildo Malaquias
ceef03d9d8
Merge pull request #141992 from fufexan/orchis-theme
orchis-theme: 2021-06-25 -> 2021-12-13
2021-12-13 13:52:56 -03:00
Mihai Fufezan
a4faf5e1d4
orchis-theme: 2021-06-25 -> 2021-12-13
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-12-13 14:10:45 +02:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
github-actions[bot]
56efc0028a
Merge master into haskell-updates 2021-12-13 00:07:50 +00:00
Janne Heß
b979768afd
Merge pull request #150322 from Alexnortung/nordzy-cursor-theme 2021-12-12 20:03:45 +01:00
Dmitry Kalinkin
1dcb22acc9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gdown/default.nix
2021-12-12 00:00:04 -05:00
Mario Rodas
8a35362ea6
Merge pull request #149882 from r-ryantm/auto-update/man-pages
man-pages: 5.12 -> 5.13
2021-12-11 22:34:49 -05:00
github-actions[bot]
5708a53249
Merge master into haskell-updates 2021-12-12 00:08:22 +00:00
Alexander Nortung
5a6e995a46 nordzy-cursor-theme: init at 0.1.0 2021-12-11 23:38:40 +01:00
github-actions[bot]
4620f3d0e3
Merge master into staging-next 2021-12-11 06:01:15 +00:00
R. Ryantm
79740d1f2e gnome-user-docs: 41.0 -> 41.1 2021-12-11 03:39:21 +01:00
R. Ryantm
b424fe8854 sarasa-gothic: 0.34.7 -> 0.35.2 2021-12-10 20:59:32 +00:00
github-actions[bot]
92aabc6576
Merge master into staging-next 2021-12-10 00:01:53 +00:00
Malte Brandy
02d2a9f55f
all-cabal-hashes: 2021-12-08T21:36:39Z -> 2021-12-09T20:50:23Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-09 22:31:38 +01:00
sternenseemann
33ccff5813 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-09 21:32:06 +01:00
R. Ryantm
b176613253 man-pages: 5.12 -> 5.13 2021-12-09 16:43:52 +00:00
github-actions[bot]
35a3e58b28
Merge master into staging-next 2021-12-09 12:01:25 +00:00
José Romildo Malaquias
e3d3b00193
Merge pull request #149757 from r-ryantm/auto-update/numix-icon-theme-square
numix-icon-theme-square: 21.04.14 -> 21.11.29
2021-12-09 07:27:03 -03:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00