Commit Graph

1720 Commits

Author SHA1 Message Date
Alyssa Ross
afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
github-actions[bot]
fe1578be1e
Merge master into haskell-updates 2023-11-08 00:12:22 +00:00
github-actions[bot]
1505981287
Merge master into staging-next 2023-11-07 18:00:55 +00:00
R. Ryantm
12c615ff53 papirus-folders: 1.12.1 -> 1.13.1 2023-11-07 09:19:10 +00:00
github-actions[bot]
1b00b5e528
Merge master into haskell-updates 2023-11-03 00:12:22 +00:00
github-actions[bot]
75a11d85b8
Merge master into staging-next 2023-11-03 00:02:23 +00:00
Nick Cao
7d9faaaee5
Merge pull request #265004 from NickCao/dbip-country-lite
dbip-country-lite: 2023-10 -> 2023-11
2023-11-02 18:50:20 -04:00
Nick Cao
eadd295688
v2ray-domain-list-community: 20231030084219 -> 20231031055637
Diff: 2023103008...2023103105
2023-11-02 08:36:53 -04:00
Nick Cao
5480ad590d
dbip-country-lite: 2023-10 -> 2023-11 2023-11-02 08:29:30 -04:00
github-actions[bot]
97868dae8e
Merge master into staging-next 2023-10-31 06:00:58 +00:00
github-actions[bot]
0c46b29501
Merge master into haskell-updates 2023-10-31 00:12:20 +00:00
Nick Cao
db6fb9e9d3
v2ray-domain-list-community: 20231015073627 -> 20231030084219
Diff: 2023101507...2023103008
2023-10-30 12:16:50 -04:00
github-actions[bot]
425871e878
Merge master into haskell-updates 2023-10-29 00:12:51 +00:00
github-actions[bot]
52b6b90243
Merge master into staging-next 2023-10-28 18:00:57 +00:00
Renaud
3fb974cbba
Merge pull request #259747 from oxzi/spdx-license-list-data-3.22
spdx-license-list-data: 3.21 -> 3.22
2023-10-28 15:22:43 +02:00
github-actions[bot]
4c838ddf14
Merge master into staging-next 2023-10-27 18:01:08 +00:00
R. Ryantm
aa7451c12d clash-geoip: 20230912 -> 20231012 2023-10-27 02:55:24 +00:00
github-actions[bot]
cb8c0b6ac0
Merge master into haskell-updates 2023-10-23 00:12:11 +00:00
github-actions[bot]
3d9ca9d8e3
Merge staging-next into staging 2023-10-22 18:01:34 +00:00
Nick Cao
695e41565e
Merge pull request #262745 from NickCao/v2ray-geoip
v2ray-geoip.generator: unstable-2023-03-27 -> unstable-2023-10-11
2023-10-22 12:44:34 -04:00
Nick Cao
9e23098421
v2ray-geoip.generator: pin to buildGo120Module 2023-10-22 09:38:42 -04:00
Nick Cao
0383e928a1
v2ray-geoip.generator: unstable-2023-03-27 -> unstable-2023-10-11
Diff: 9321a7f5e3...3182dda7b3
2023-10-22 09:37:15 -04:00
github-actions[bot]
0fa884ae1f
Merge staging-next into staging 2023-10-22 06:01:35 +00:00
Nick Cao
4ed0fc839a
sing-geosite: pin to buildGo120Module 2023-10-21 21:26:34 -04:00
maralorn
e5997282a3
all-cabal-hashes: 2023-10-04T18:27:12Z -> 2023-10-21T19:49:07Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-10-22 02:31:45 +02:00
github-actions[bot]
f301759f9f
Merge master into haskell-updates 2023-10-18 00:12:08 +00:00
github-actions[bot]
c99731d9ac
Merge staging-next into staging 2023-10-17 18:01:44 +00:00
Nick Cao
d21b7391a1
v2ray-domain-list-community: 20231011001633 -> 20231015073627
Diff: 2023101100...2023101507
2023-10-16 21:58:18 -04:00
github-actions[bot]
fe082e6d4b
Merge master into haskell-updates 2023-10-17 00:12:29 +00:00
github-actions[bot]
de49fc16bc
Merge staging-next into staging 2023-10-16 12:01:54 +00:00
7c6f434c
11ab1183fb
Merge pull request #261348 from peterhoeg/u/rgb
xorg-rgb: 1.0.6 -> 1.1.0
2023-10-16 11:37:28 +00:00
Peter Hoeg
c4f8ad5071 xorg-rgb: 1.0.6 -> 1.1.0 2023-10-16 10:09:47 +02:00
github-actions[bot]
d49bdad524
Merge master into haskell-updates 2023-10-15 00:13:07 +00:00
github-actions[bot]
62370ea07d
Merge staging-next into staging 2023-10-15 00:03:07 +00:00
Weijia Wang
08f197bed5
Merge pull request #259690 from r-ryantm/auto-update/ddccontrol-db
ddccontrol-db: 20230911 -> 20231004
2023-10-15 01:35:35 +02:00
github-actions[bot]
fcbc81b282
Merge master into haskell-updates 2023-10-12 00:10:18 +00:00
github-actions[bot]
630f45884e
Merge staging-next into staging 2023-10-11 18:01:37 +00:00
Nick Cao
1648c8d66e
v2ray-domain-list-community: 20230926092720 -> 20231011001633
Diff: 2023092609...2023101100
2023-10-10 22:02:53 -04:00
Tobias Mayer
69308fb32f shared-mime-info: 2.2 -> 2.3
Also adds a patch for clang_16 compat.
2023-10-08 23:36:21 +02:00
Alvar Penning
109c6a5f5c spdx-license-list-data: 3.21 -> 3.22
- https://github.com/spdx/license-list-data/releases/tag/v3.22
- https://github.com/spdx/license-list-XML/releases/tag/v3.22
2023-10-08 11:42:32 +02:00
R. Ryantm
2788f1b04e ddccontrol-db: 20230911 -> 20231004 2023-10-08 05:02:44 +00:00
maralorn
144f8a1bcd
all-cabal-hashes: 2023-09-13T23:29:30Z -> 2023-10-04T18:27:12Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-10-04 22:21:17 +02:00
github-actions[bot]
ea0284a3da
Merge master into haskell-updates 2023-10-03 00:12:01 +00:00
Nick Cao
906982808d
dbip-country-lite: 2023-09 -> 2023-10 2023-10-01 11:34:50 -04:00
github-actions[bot]
23bb2be564
Merge master into haskell-updates 2023-09-29 00:11:52 +00:00
Nick Cao
c5aab8968d
Merge pull request #257451 from NickCao/v2ray-domain-list-community
v2ray-domain-list-community: 20230913074035 -> 20230926092720
2023-09-28 16:56:27 -04:00
github-actions[bot]
6982839dbf
Merge master into haskell-updates 2023-09-28 00:12:12 +00:00
R. Ryantm
c513031504 clash-geoip: 20230812 -> 20230912 2023-09-27 00:50:49 +00:00
Nick Cao
6978105c28
v2ray-domain-list-community: 20230913074035 -> 20230926092720
Diff: 2023091307...2023092609
2023-09-26 09:50:07 -04:00
github-actions[bot]
0da5b5291d
Merge master into haskell-updates 2023-09-24 00:12:49 +00:00