github-actions[bot]
287ecf6b5f
Merge master into haskell-updates
2021-12-03 00:07:58 +00:00
Malte Brandy
3619ce1071
all-cabal-hashes: 2021-11-18T20:32:52Z -> 2021-12-02T21:05:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-03 00:53:13 +01:00
github-actions[bot]
3c6eb8fe49
Merge master into staging-next
2021-11-30 18:01:33 +00:00
Peng Mei Yu
640e54cda9
maintainers: Rename pengmeiyu to pmy
2021-11-29 18:39:31 +08:00
github-actions[bot]
b529eccbb3
Merge master into staging-next
2021-11-26 18:01:19 +00:00
Sandro
d145e77525
Merge pull request #146943 from oxzi/spdx-license-list-data-3.15
2021-11-26 13:30:33 +01:00
github-actions[bot]
fc6ab3024e
Merge master into staging-next
2021-11-24 12:01:20 +00:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
...
Conflicts:
nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
sternenseemann
fb67ad2eea
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-11-22 19:44:23 +01:00
github-actions[bot]
28641f51dc
Merge master into staging-next
2021-11-22 18:01:08 +00:00
Nick Cao
c71ccc045c
v2ray-domain-list-community: 20211103073737 -> 20211119143108
2021-11-22 21:21:52 +08:00
github-actions[bot]
9e1911e222
Merge master into staging-next
2021-11-22 12:01:27 +00:00
Bobby Rong
87d7bd1733
Merge pull request #143619 from r-ryantm/auto-update/ddccontrol-db
...
ddccontrol-db: 20210804 -> 20210812
2021-11-22 15:10:24 +08:00
Alvar Penning
73fa88190f
spdx-license-list-data: 3.14 -> 3.15
2021-11-22 00:15:53 +01:00
github-actions[bot]
9747d437c5
Merge staging-next into staging
2021-11-19 00:02:17 +00:00
github-actions[bot]
c83cfc58e5
Merge master into staging-next
2021-11-19 00:01:26 +00:00
sternenseemann
e8f81dc183
all-cabal-hashes: 2021-11-12T03:22:57Z -> 2021-11-18T20:32:52Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-18 21:37:48 +01:00
Robert Hensing
9005cb8835
Merge pull request #145841 from l0b0/fix-indentation
...
Fix indentation
2021-11-18 00:38:59 +01:00
Philipp Kern
7481bc7a31
publicsuffix-list: 2019-05-24 -> 2021-09-03 ( #136680 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-15 11:35:15 +01:00
Victor Engmark
57b496ea98
misc: Replace tab indentation with spaces
...
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
github-actions[bot]
c6ab946042
Merge master into haskell-updates
2021-11-13 00:07:15 +00:00
Sandro
e7c332ade0
Merge pull request #137691 from r-ryantm/auto-update/wireless-regdb
2021-11-12 17:38:44 +01:00
(cdep)illabout
9568b05c76
all-cabal-hashes: 2021-11-05T06:34:09Z -> 2021-11-12T03:22:57Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-12 13:00:07 +09:00
github-actions[bot]
1309d8da51
Merge master into haskell-updates
2021-11-06 00:06:48 +00:00
Sandro
285d6b1fdb
Merge pull request #140555 from NickCao/v2ray-domain-list-community
2021-11-05 14:10:17 +01:00
(cdep)illabout
bd742755f1
all-cabal-hashes: 2021-10-23T04:57:02Z -> 2021-11-05T06:34:09Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-11-05 15:42:34 +09:00
Nick Cao
aefde7c02a
v2ray-domain-list-community: init at 20211103073737
2021-11-03 17:03:17 +08:00
sternenseemann
b0f72c142c
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-11-02 11:44:15 +01:00
R. Ryantm
9567b928fa
ddccontrol-db: 20210804 -> 20210812
2021-10-29 09:43:17 +00:00
github-actions[bot]
59156778b4
Merge master into staging-next
2021-10-23 06:01:03 +00:00
Ellie Hermaszewska
b65bb811cf
all-cabal-hashes: 2021-10-18T14:27:09Z -> 2021-10-23T04:57:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-23 13:42:42 +08:00
github-actions[bot]
b0a41194a1
Merge master into staging-next
2021-10-18 18:01:14 +00:00
Ellie Hermaszewska
bd74d5b007
all-cabal-hashes: 2021-10-15T10:42:20Z -> 2021-10-18T14:27:09Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-18 22:53:48 +08:00
Martin Weinelt
a415d5dd2e
Merge remote-tracking branch 'origin/master' into staging-next
2021-10-15 23:10:08 +02:00
Malte Brandy
f2deb6ead2
all-cabal-hashes: 2021-10-11T20:00:11Z -> 2021-10-15T10:42:20Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-15 13:58:21 +02:00
github-actions[bot]
5065827878
Merge staging-next into staging
2021-10-12 00:02:05 +00:00
Malte Brandy
8fad89e4a3
all-cabal-hashes: 2021-10-08T09:46:02Z -> 2021-10-11T20:00:11Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-11 22:09:26 +02:00
Luke Granger-Brown
856913b191
Merge pull request #136777 from lukegb/buildcatrust
...
use buildcatrust to generate trust stores
2021-10-09 03:39:49 +01:00
github-actions[bot]
5da3c99f54
Merge staging-next into staging
2021-10-08 12:02:03 +00:00
Malte Brandy
2491951642
all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-08T09:46:02Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-08 12:00:59 +02:00
Luke Granger-Brown
91e4957081
cacert: extract certdata.txt from main package
...
This allows users to specify custom CAs without needing to download the
entirety of the NSS source code - just certdata.txt, which should end up
in cache.nixos.org.
2021-10-08 01:21:57 +00:00
Luke Granger-Brown
906f44cef3
cacert: port to use buildcatrust
...
This introduces the ability to have additional certificates in the trust
store using an override, similar to how the blacklist is done. If the
certificates are provided in OpenSSL TRUSTED CERTIFICATE form, then
those trust bits will be respected.
It also adds a p11-kit compatible trust store output.
2021-10-08 00:56:49 +00:00
sternenseemann
df720f8b7f
Merge remote-tracking branch 'origin/master' into haskell-updates
2021-10-05 14:10:47 +02:00
github-actions[bot]
0b1fa10263
Merge staging-next into staging
2021-10-05 12:01:39 +00:00
Luke Granger-Brown
c55acca2a8
Merge pull request #139554 from NixOS/staging-next
...
staging-next 2021-09-26
2021-10-05 12:55:59 +01:00
Malte Brandy
2a9f449dff
all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-05T05:41:58Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-05 08:54:03 +02:00
sternenseemann
a5c8b9f166
all-cabal-hashes: 2021-10-01T17:27:40Z -> 2021-10-02T21:03:40Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-02 23:55:47 +02:00
Martin Weinelt
bd9a5bbca1
Merge pull request #140068 from helsinki-systems/upd/nss
2021-10-02 19:32:47 +02:00
Martin Weinelt
51ddf0d5c1
Merge pull request #140213 from helsinki-systems/upd/tzdata
2021-10-02 16:50:55 +02:00
github-actions[bot]
b38a46cddd
Merge staging-next into staging
2021-10-02 00:06:56 +00:00
