Commit Graph

2027 Commits

Author SHA1 Message Date
R. Ryantm
047bcbcca5 v2ray-domain-list-community: 20240817092737 -> 20240823035651 2024-08-25 00:47:04 +00:00
Weijia Wang
09bca27eaa
Merge pull request #335988 from r-ryantm/auto-update/spdx-license-list-data
spdx-license-list-data: 3.24.0 -> 3.25.0
2024-08-21 02:06:58 +02:00
R. Ryantm
2ccdb31638 spdx-license-list-data: 3.24.0 -> 3.25.0 2024-08-20 04:01:59 +00:00
github-actions[bot]
0f0aff203c
Merge master into haskell-updates 2024-08-19 00:15:06 +00:00
R. Ryantm
e1b49b3af6 v2ray-domain-list-community: 20240810010807 -> 20240817092737 2024-08-18 04:44:22 +00:00
github-actions[bot]
afc10f2c19
Merge master into haskell-updates 2024-08-16 00:14:32 +00:00
R. Ryantm
66af6fde57 clash-geoip: 20240712 -> 20240812 2024-08-15 11:28:25 +00:00
github-actions[bot]
e8a5804e3c
Merge master into haskell-updates 2024-08-15 00:14:20 +00:00
github-actions[bot]
883e127c4b
Merge master into haskell-updates 2024-08-12 00:15:09 +00:00
github-actions[bot]
d1511265ba
Merge master into staging-next 2024-08-11 06:01:20 +00:00
R. Ryantm
685087de71 v2ray-domain-list-community: 20240726161926 -> 20240810010807 2024-08-11 00:24:21 +00:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it)  I hope I really got it right.
2024-08-05 11:05:55 +02:00
github-actions[bot]
0689847252
Merge master into haskell-updates 2024-08-04 00:15:45 +00:00
Nick Cao
2ca365ca51
dbip-country-lite: 2024-07 -> 2024-08 2024-08-02 15:38:40 -04:00
github-actions[bot]
d3651f9b43
Merge master into haskell-updates 2024-08-02 00:14:04 +00:00
github-actions[bot]
203fa1d4a2
Merge staging-next into staging 2024-08-02 00:02:35 +00:00
K900
a4a42b3aec Merge remote-tracking branch 'origin/staging-next' into staging 2024-08-01 08:57:50 +03:00
Nick Cao
5b783fcb9d
v2ray-domain-list-community: 20240713050854 -> 20240726161926
Diff: 2024071305...2024072616
2024-07-31 23:16:19 -04:00
maralorn
89004f5094 all-cabal-hashes: 2024-07-14T21:17:20Z -> 2024-07-31T18:11:52Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2024-07-31 23:20:33 +02:00
K900
4f29b5a16b Merge remote-tracking branch 'origin/staging-next' into staging 2024-07-31 08:57:17 +03:00
github-actions[bot]
9ebd5d0e8c
Merge master into haskell-updates 2024-07-31 00:12:53 +00:00
Sigmanificient
aab1113d4a treewide: normalize maintainers list formatting
grep -rP 'maintainers = \[\];'
2024-07-30 16:26:22 +02:00
github-actions[bot]
0b204f8f69
Merge master into haskell-updates 2024-07-30 00:14:25 +00:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Sandro
631e7de895
Merge pull request #321081 from jopejoe1/publicsuffix-list 2024-07-28 21:10:11 +02:00
sternenseemann
7d2a01c5be Merge branch master into haskell-updates 2024-07-28 16:18:39 +02:00
Martin Weinelt
983077457f
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
-	pkgs/development/python-modules/uvcclient/default.nix
-	pkgs/development/tools/rust/rust-analyzer/default.nix
2024-07-18 12:35:33 +02:00
github-actions[bot]
7393850eb5
Merge master into haskell-updates 2024-07-18 00:14:03 +00:00
R. Ryantm
c2daa97634 clash-geoip: 20240612 -> 20240712 2024-07-17 18:13:19 +00:00
github-actions[bot]
de5cfff7c1
Merge master into haskell-updates 2024-07-17 00:14:31 +00:00
github-actions[bot]
4c086d8ee0
Merge staging-next into staging 2024-07-17 00:03:16 +00:00
Artturin
a516ea8c99 Merge branch 'staging-next' into staging 2024-07-16 19:07:48 +03:00
Vladimír Čunát
7fed2c83f7
Merge #321303: dns-root-data: add DS for the new KSK-2024
...into staging
2024-07-16 08:45:05 +02:00
Nick Cao
9c73ed5689
v2ray-domain-list-community: 20240707162925 -> 20240713050854
Diff: 2024070716...2024071305
2024-07-15 17:10:39 -04:00
maralorn
163c195b68 all-cabal-hashes: 2024-06-23T10:38:31Z -> 2024-07-14T21:17:20Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2024-07-15 00:50:18 +02:00
maralorn
8c5b90372b Merge branch 'master' into haskell-updates 2024-07-15 00:01:49 +02:00
github-actions[bot]
31817540ee
Merge staging-next into staging 2024-07-14 18:01:37 +00:00
aleksana
592e3845c4 treewide: sha256 -> hash attribute for fetchgit 2024-07-14 19:10:08 +08:00
github-actions[bot]
1b04714826
Merge master into haskell-updates 2024-07-09 00:13:45 +00:00
Vladimír Čunát
4c09ae2416
Merge branch 'staging-next' into staging 2024-07-08 10:43:15 +02:00
R. Ryantm
06ecf990bc v2ray-domain-list-community: 20240624143214 -> 20240707162925 2024-07-07 19:13:47 +00:00
sternenseemann
4b9a5f3248 Merge branch master into haskell-updates 2024-07-06 14:31:05 +02:00
Martin Weinelt
e7b1ee45cf
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/tools/misc/watchlog/default.nix
2024-07-06 01:52:35 +02:00
github-actions[bot]
2c20067f5d
Merge master into haskell-updates 2024-07-05 00:13:53 +00:00
github-actions[bot]
30cfd4445f
Merge master into staging-next 2024-07-05 00:02:21 +00:00
Franz Pletz
33f3c5030a
Merge pull request #324643 from r-ryantm/auto-update/wireless-regdb 2024-07-05 01:13:00 +02:00
R. Ryantm
75978131f6 wireless-regdb: 2024.05.08 -> 2024.07.04 2024-07-04 19:04:27 +00:00
github-actions[bot]
36cbae9ff0
Merge master into staging-next 2024-07-04 18:01:19 +00:00
Nick Cao
fb4f7ae196
dbip-country-lite: 2024-06 -> 2024-07 2024-07-03 20:03:45 -04:00
Martin Weinelt
3b25e5329a
Merge pull request #317980 from mweinelt/mailcap-2.1.54
mailcap: 2.1.53 -> 2.1.54
2024-07-03 12:45:43 +02:00