Commit Graph

1512 Commits

Author SHA1 Message Date
Nick Cao
9db789fd83
v2ray-domain-list-community: 20230320093818 -> 20230407083123
Diff: 2023032009...2023040708
2023-04-08 15:23:10 +08:00
Nick Cao
e52b753d2c
v2ray-geoip: 202303272340 -> 202304060040 2023-04-08 15:22:23 +08:00
github-actions[bot]
6a7b8348a1
Merge master into haskell-updates 2023-04-06 00:11:55 +00:00
Candy Cloud
7a170a54d3 maintainers: remove candyc1oud 2023-04-05 00:29:57 +00:00
github-actions[bot]
85894d6196
Merge master into haskell-updates 2023-04-04 00:12:06 +00:00
maralorn
93cd4b43c1 all-cabal-hashes: 2023-03-31T20:07:10Z -> 2023-04-03T07:13:26Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-04-03 10:56:08 +02:00
R. Ryantm
39762330f5 ddccontrol-db: 20230223 -> 20230328 2023-04-02 17:45:15 +00:00
Dennis Gosnell
69ba0b6ca3
all-cabal-hashes: 2023-03-30T00:19:14Z -> 2023-03-31T20:07:10Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-04-01 12:34:48 +09:00
Dennis Gosnell
0ba1bbe64e
all-cabal-hashes: 2023-03-13T08:59:39Z -> 2023-03-30T00:19:14Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-03-30 09:53:27 +09:00
Dennis Gosnell
8f928cc7a0
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-30 08:41:14 +09:00
R. Ryantm
49d3f1b606 v2ray-geoip: 202303230043 -> 202303272340 2023-03-29 11:14:08 +00:00
github-actions[bot]
f41b2e5230
Merge master into haskell-updates 2023-03-29 00:14:47 +00:00
R. Ryantm
647ac3f5a4 osinfo-db: 20221130 -> 20230308 2023-03-26 07:42:49 +00:00
github-actions[bot]
bca997abb7
Merge master into haskell-updates 2023-03-25 00:12:18 +00:00
R. Ryantm
6cd5fdf84e v2ray-geoip: 202303160048 -> 202303230043 2023-03-24 09:48:44 +00:00
Dennis Gosnell
9b7cbce8b2
Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-23 07:42:17 +09:00
Nick Cao
d1156e3ca9
v2ray-domain-list-community: 20230311145412 -> 20230320093818 2023-03-21 10:05:59 +08:00
github-actions[bot]
b47aebb347
Merge master into haskell-updates 2023-03-18 00:12:33 +00:00
R. Ryantm
e07fc2b750 v2ray-geoip: 202303090050 -> 202303160048 2023-03-17 05:17:09 +00:00
github-actions[bot]
01e9cabdad
Merge master into haskell-updates 2023-03-16 00:14:18 +00:00
github-actions[bot]
6ff24bf612
Merge master into haskell-updates 2023-03-15 00:13:19 +00:00
Martin Weinelt
6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
R. Ryantm
4777ea72ca clash-geoip: 20230212 -> 20230312 2023-03-13 19:27:01 +00:00
Martin Weinelt
bb14c4255b Merge remote-tracking branch 'origin/master' into staging-next 2023-03-13 17:14:19 +00:00
sternenseemann
b645a1d84a all-cabal-hashes: 2023-03-01T16:43:25Z -> 2023-03-13T08:59:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-03-13 11:37:18 +01:00
github-actions[bot]
b68d8e3f47
Merge master into haskell-updates 2023-03-13 00:13:22 +00:00
Vladimír Čunát
1dd94ad62f
Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
Nick Cao
08bcde01e6
v2ray-domain-list-community: 20230227064844 -> 20230311145412
Diff: 2023022706...2023031114
2023-03-12 09:49:08 +08:00
github-actions[bot]
140a35879a
Merge master into staging-next 2023-03-11 12:01:11 +00:00
sternenseemann
f2ae2be316 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-03-11 12:24:46 +01:00
R. Ryantm
dabb4a5369 v2ray-geoip: 202303020053 -> 202303090050 2023-03-11 05:41:18 +00:00
github-actions[bot]
216e95c761
Merge master into haskell-updates 2023-03-06 00:14:03 +00:00
Martin Weinelt
8a085cd8e3 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-05 15:36:16 +01:00
Martin Weinelt
c021277a75
Merge pull request #219387 from Yarny0/dtv-scan-tables
dtv-scan-tables: use linuxtv-version, drop tvheadend-version
2023-03-05 14:15:14 +00:00
R. Ryantm
c37822e034 v2ray-geoip: 202302230047 -> 202303020053 2023-03-05 07:26:09 +00:00
Yarny0
d19eea3c3b dtv-scan-tables: use linuxtv-version, drop tvheadend-version 2023-03-03 18:59:44 +01:00
github-actions[bot]
736c488efe
Merge staging-next into staging 2023-03-01 18:01:48 +00:00
sternenseemann
a8abc9e550 all-cabal-hashes: 2023-02-19T09:15:19Z -> 2023-03-01T16:43:25Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2023-03-01 18:41:14 +01:00
github-actions[bot]
4b691f3ab3
Merge master into haskell-updates 2023-03-01 00:16:43 +00:00
github-actions[bot]
51c18e4be1
Merge staging-next into staging 2023-02-28 06:01:38 +00:00
Nick Cao
c7d9f8854b
Merge pull request #218589 from NickCao/v2ray-dlc
v2ray-domain-list-community: 20230202101858 -> 20230227064844
2023-02-28 11:00:26 +08:00
github-actions[bot]
ce1777b04a
Merge master into haskell-updates 2023-02-28 00:13:36 +00:00
github-actions[bot]
40707bbbb3
Merge staging-next into staging 2023-02-27 18:02:06 +00:00
Franz Pletz
8a737b1249
Merge pull request #218346 from r-ryantm/auto-update/wireless-regdb 2023-02-27 13:23:54 +01:00
github-actions[bot]
5e46cfeba0
Merge staging-next into staging 2023-02-27 12:01:41 +00:00
Nick Cao
ea232651a1
v2ray-domain-list-community: 20230202101858 -> 20230227064844
Diff: 2023020210...2023022706
2023-02-27 18:25:09 +08:00
sternenseemann
80cff3a5b2 Merge remote-tracking branch 'origin/master' into haskell-updates 2023-02-26 20:45:50 +01:00
R. Ryantm
953997c5c2 ddccontrol-db: 20230124 -> 20230223 2023-02-26 08:44:04 +00:00
github-actions[bot]
de3f71e277
Merge staging-next into staging 2023-02-26 06:02:30 +00:00
github-actions[bot]
81c06fad73
Merge master into haskell-updates 2023-02-26 00:14:44 +00:00