Commit Graph

4462 Commits

Author SHA1 Message Date
github-actions[bot]
ed9751296d
Merge master into staging-next 2022-01-15 18:01:07 +00:00
José Romildo Malaquias
e924173cf3
Merge pull request #154092 from NickCao/adapta-backgrounds
adapta-backgrounds: fix cross compilation and set strictDeps
2022-01-15 12:05:43 -03:00
Nick Cao
e8a7b9cd20
v2ray-domain-list-community: 20211228022859 -> 20220114024213 2022-01-15 20:28:55 +08:00
github-actions[bot]
a6317e795d
Merge master into staging-next 2022-01-15 06:01:01 +00:00
José Romildo
d14c567830 luna-icons: 1.8 -> 1.9 2022-01-14 06:56:16 -03:00
Dmitry Kalinkin
a56da82f7a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/restfly/default.nix
2022-01-13 21:39:05 -05:00
Renaud
5279ca8975
Merge pull request #154746 from romildo/upd.qogir-icon-theme
qogir-icon-theme: 2021-10-14 -> 2022-01-12
2022-01-13 14:35:38 +01:00
github-actions[bot]
a6928c74cc
Merge master into staging-next 2022-01-13 12:01:29 +00:00
Bobby Rong
717e6b1a4a
Merge pull request #154428 from r-ryantm/auto-update/victor-mono
victor-mono: 1.5.1 -> 1.5.2
2022-01-13 15:00:03 +08:00
github-actions[bot]
a8b75d6f2f
Merge master into staging-next 2022-01-13 00:01:59 +00:00
Renaud
983e670995
Merge pull request #154596 from r-ryantm/auto-update/kora-icon-theme
kora-icon-theme: 1.4.9 -> 1.5.0
2022-01-12 19:56:48 +01:00
José Romildo
49d5367d0e qogir-icon-theme: 2021-10-14 -> 2022-01-12 2022-01-12 08:10:22 -03:00
Alyssa Ross
d77022e114
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
	nixos/doc/manual/release-notes/rl-2205.section.md
2022-01-11 16:35:43 +00:00
R. Ryantm
8283c311f8 kora-icon-theme: 1.4.9 -> 1.5.0 2022-01-11 16:15:45 +00:00
Alyssa Ross
23f24c95d7 shared-mime-info: 2.1 -> unstable-2021-12-03
We need https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162
("migrate from itstool to msgfmt for creating translated XML") to fix
the build with Meson 0.60.0.

Signed-off-by: Patrick Hilhorst <git@hilhorst.be>
2022-01-11 12:51:09 +00:00
Ellie Hermaszewska
14921f050a
Merge pull request #153536 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2022-01-11 15:13:59 +08:00
github-actions[bot]
47c5df190a
Merge staging-next into staging 2022-01-11 06:02:00 +00:00
R. Ryantm
8cc125972e victor-mono: 1.5.1 -> 1.5.2 2022-01-11 05:01:12 +00:00
R. Ryantm
b2dea1626e v2ray-geoip: 202112300030 -> 202201060033 2022-01-11 03:00:57 +00:00
github-actions[bot]
1f4785f32c
Merge master into haskell-updates 2022-01-11 00:08:39 +00:00
github-actions[bot]
0f8ce42c1f
Merge staging-next into staging 2022-01-10 06:01:45 +00:00
zowoq
00d2701b97 v2ray, v2ray-domain-list-community: switch to go_1_17, update vendorSha256 2022-01-10 12:44:07 +10:00
Jan Tojnar
f7aa55946b Merge branch 'staging-next' into staging
; Conflicts:
;	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
;	nixos/doc/manual/release-notes/rl-2205.section.md
;	pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
github-actions[bot]
d79785deed
Merge master into haskell-updates 2022-01-10 00:08:34 +00:00
Bobby Rong
c0e55c5888
Merge pull request #154140 from wineee/rime-data
rime-data: 0.38.20210628 -> 0.38.20211002
2022-01-09 22:53:14 +08:00
rewine
08e6b80248 rime-data: 0.38.20210628 -> 0.38.20211002 2022-01-09 21:51:48 +08:00
sternenseemann
0d065994f6 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-01-09 12:12:34 +01:00
Nick Cao
c73d90790c
adapta-backgrounds: fix cross compilation and set strictDeps 2022-01-09 09:55:51 +08:00
Dmitry Kalinkin
d16e166b47
Merge pull request #153769 from helsinki-systems/upd/nss
nss: 3.73.1 -> 3.74
2022-01-08 20:00:53 -05:00
Dmitry Kalinkin
477540469e
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gradient-utils/default.nix
	pkgs/development/python-modules/gradient/default.nix
2022-01-08 02:39:35 -05:00
github-actions[bot]
44dc8255ad
Merge master into haskell-updates 2022-01-08 00:08:05 +00:00
José Romildo Malaquias
489f421e96
Merge pull request #153497 from romildo/upd.graphite-gtk-theme
graphite-gtk-theme: init at unstable-2022-01-04
2022-01-07 20:15:01 -03:00
Jonathan Ringer
86f9a32c4c
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/hydra/default.nix
2022-01-07 10:31:29 -08:00
José Romildo
6b9d877c85 graphite-gtk-theme: init at unstable-2022-01-04 2022-01-07 14:16:46 -03:00
Ben Siraphob
5e09daba1b
comic-relief: update homepage 2022-01-07 16:45:54 +07:00
github-actions[bot]
b48a41c77c
Merge master into staging-next 2022-01-07 06:01:27 +00:00
Ben Siraphob
e9e90a941b
treewide: replace http://web.archive.org with https://web.archive.org 2022-01-07 09:58:36 +07:00
Ben Siraphob
9a58b51e6a
treewide: fix homepages with permanent redirect to https 2022-01-07 09:57:54 +07:00
github-actions[bot]
0b82df1624
Merge master into haskell-updates 2022-01-07 00:08:36 +00:00
ajs124
eb9b64fc32 cacert: 3.71 -> 3.74 2022-01-06 22:46:17 +01:00
github-actions[bot]
8a0e129af2
Merge master into staging-next 2022-01-06 06:01:38 +00:00
Dmitry Kalinkin
9e8519777b
gnome-icon-theme: mark as broken on darwin 2022-01-05 02:16:03 -05:00
github-actions[bot]
4b70e0e343
Merge master into staging-next 2022-01-05 06:01:16 +00:00
Dennis Gosnell
7269b84957
all-cabal-hashes: 2021-12-28T00:33:48Z -> 2022-01-05T00:50:25Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-05 10:49:47 +09:00
Martin Weinelt
11a0b61783 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-03 23:21:08 +01:00
github-actions[bot]
4acff2bbde
Merge master into haskell-updates 2022-01-03 00:08:40 +00:00
R. RyanTM
82a3519a78
unicode-character-database: 13.0.0 -> 14.0.0
(#138892)
2022-01-02 10:08:44 +01:00
github-actions[bot]
b0c76508ef
Merge master into haskell-updates 2022-01-02 00:08:53 +00:00
Thiago Kenji Okada
1b50adacbf
Merge pull request #153076 from ericdallo/bump-dracula-theme
dracula-theme: 2.0 -> 3.0
2022-01-01 12:20:43 -03:00
Bobby Rong
b322fa1db2
Merge pull request #153027 from NickCao/v2ray-dlc
v2ray-domain-list-community: 20211119143108 -> 20211228022859
2022-01-01 12:52:09 +08:00