3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1169 commits

Author SHA1 Message Date
sternenseemann da80bef7ba all-cabal-hashes: 2022-03-08T11:03:28Z -> 2022-03-09T16:42:26Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-09 17:55:06 +01:00
sternenseemann 33f275b4c2 all-cabal-hashes: 2022-03-03T10:08:52Z -> 2022-03-08T11:03:28Z
* Regenerate package set

* Adjust overrides for upgrades of ghc-lib* and Cabal.
2022-03-08 13:57:59 +01:00
Malte Brandy cb8de4139a Merge branch 'master' into haskell-updates 2022-03-05 20:52:26 +01:00
github-actions[bot] 61655037aa
Merge master into staging-next 2022-03-05 18:01:16 +00:00
Renaud 23ce610123
Merge pull request #161958 from c0bw3b/data/spdx_all_formats
spdx-license-list-data: make all formats available
2022-03-05 14:41:35 +01:00
github-actions[bot] 4ae95d3027
Merge master into haskell-updates 2022-03-04 00:12:11 +00:00
sternenseemann 63d53c31bb all-cabal-hashes: 2022-03-02T22:17:55Z -> 2022-03-03T10:08:52Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-03 12:40:43 +01:00
github-actions[bot] 0b6df04503
Merge master into staging-next 2022-03-03 06:05:53 +00:00
sternenseemann 79a75f971c all-cabal-hashes: 2022-02-27T02:04:39Z -> 2022-03-02T22:17:55Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-02 23:24:42 +01:00
R. Ryantm a5ae949520 v2ray-geoip: 202202170030 -> 202203020509 2022-03-02 18:52:49 +00:00
sternenseemann f2ff3e9ecb all-cabal-hashes: 2022-02-25T10:27:38Z -> 2022-02-27T02:04:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-27 10:39:26 +01:00
c0bw3b 88198555d0 spdx-license-list-data: make all formats available
Since the whole lot is quite big, split this derivation into multiple
outputs (one output for each file format).

And update to v3.16

Co-authored-by: Alvar Penning <post@0x21.biz>
2022-02-26 15:13:14 +01:00
sternenseemann 9510787372 all-cabal-hashes: 2022-02-23T21:28:02Z -> 2022-02-25T10:27:38Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-25 12:50:24 +01:00
github-actions[bot] befe838e87
Merge master into haskell-updates 2022-02-24 00:09:57 +00:00
github-actions[bot] cd6011bf17
Merge master into staging-next 2022-02-24 00:02:03 +00:00
sternenseemann fab0d31f43 all-cabal-hashes: 2022-02-22T04:07:26Z -> 2022-02-23T21:28:02Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
and maintainers/scripts/haskell/regenerate-hackage-packages.sh.
2022-02-23 22:43:48 +01:00
Jan Tojnar 9a6974d579 osinfo-db: 20211216 → 20220214
https://gitlab.com/libosinfo/osinfo-db/-/commits/v20220214
2022-02-23 20:30:21 +01:00
R. Ryantm c4cfcc559f wireless-regdb: 2021.08.28 -> 2022.02.18 2022-02-23 06:02:54 +00:00
sternenseemann 05232c1b7a all-cabal-hashes: 2022-02-17T20:36:23Z -> 2022-02-22T04:07:26Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-22 12:18:28 +01:00
Vladimír Čunát 32d8acf3b3
Merge #151247: tzdata: fix for darwin sandbox (into staging) 2022-02-22 12:00:02 +01:00
github-actions[bot] a56ab263df
Merge master into haskell-updates 2022-02-20 00:11:55 +00:00
Mario Rodas e6b7245fc3
Merge pull request #159663 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20210312 -> 20211216
2022-02-19 15:49:19 -05:00
Bobby Rong 0725034675
Merge pull request #160844 from r-ryantm/auto-update/v2ray-geoip
v2ray-geoip: 202202100032 -> 202202170030
2022-02-19 14:53:44 +08:00
R. Ryantm abf750fd2d ddccontrol-db: 20220119 -> 20220216 2022-02-19 07:32:54 +01:00
R. Ryantm 6f893105a0 v2ray-geoip: 202202100032 -> 202202170030 2022-02-19 06:17:54 +00:00
github-actions[bot] a0dce50252
Merge master into haskell-updates 2022-02-19 00:10:47 +00:00
sternenseemann 19bdc1a4ab all-cabal-hashes: 2022-02-14T17:17:31Z -> 2022-02-17T20:36:23Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-18 18:24:22 +01:00
Nikolay Amiantov 3965d4c962 geolite-legacy: 2017-12-02 -> 2022-01-25
Use database from mailfud.org, with Arch Linux package as a snapshot.
2022-02-18 11:09:20 +03:00
sternenseemann aeb2d5e2bc all-cabal-hashes: 2022-02-06T15:34:38Z -> 2022-02-14T17:17:31Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-14 18:32:04 +01:00
github-actions[bot] 0f3d35981c
Merge master into haskell-updates 2022-02-14 00:08:17 +00:00
R. Ryantm 1555480a4a v2ray-geoip: 202202030030 -> 202202100032 2022-02-13 11:40:33 +00:00
R. Ryantm 550284efe2 osinfo-db: 20210312 -> 20211216 2022-02-12 21:25:28 +00:00
github-actions[bot] 0648f0d8a3
Merge master into haskell-updates 2022-02-11 00:09:24 +00:00
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Malte Brandy d659bfd023 all-cabal-hashes: 2022-01-31T19:23:21Z -> 2022-02-06T15:34:38Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-06 23:56:34 +01:00
Malte Brandy 3d9faff0b0 Merge branch 'master' into haskell-updates 2022-02-06 23:09:03 +01:00
Vladimír Čunát 3dfddd89c6
Merge branch 'master' into staging-next
Trivial conflict in pkgs/top-level/aliases.nix
2022-02-06 10:29:49 +01:00
Nick Cao f327a0de15
v2ray-domain-list-community: 20220114024213 -> 20220201175515 2022-02-06 10:41:46 +08:00
github-actions[bot] 62580dc6fb
Merge master into haskell-updates 2022-02-06 00:12:03 +00:00
github-actions[bot] c86cbc2a8a
Merge master into staging-next 2022-02-05 18:01:08 +00:00
R. Ryantm 4ef8f177a4 v2ray-geoip: 202201270031 -> 202202030030 2022-02-05 13:35:29 +00:00
github-actions[bot] aee8ca6639
Merge staging-next into staging 2022-02-01 00:02:21 +00:00
Malte Brandy 95a2d28f1a all-cabal-hashes: 2022-01-27T16:52:24Z -> 2022-01-31T19:23:21Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-31 21:44:24 +01:00
Malte Brandy b73e03f9ba Merge branch 'master' into haskell-updates 2022-01-31 21:09:56 +01:00
github-actions[bot] ed5ed282df
Merge staging-next into staging 2022-01-31 18:06:44 +00:00
R. Ryantm 06add8131e ddccontrol-db: 20210812 -> 20220119 2022-01-31 09:21:07 -08:00
github-actions[bot] 524447ebae
Merge master into haskell-updates 2022-01-30 00:08:42 +00:00
github-actions[bot] 3656f37a2e
Merge staging-next into staging 2022-01-29 06:01:48 +00:00
R. Ryantm 019bc5f7a1 v2ray-geoip: 202201200035 -> 202201270031 2022-01-29 03:09:44 +00:00
github-actions[bot] ce560ad476
Merge master into haskell-updates 2022-01-29 00:07:52 +00:00
Jan Tojnar 2da5ce4ab3 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix
2022-01-28 14:05:11 +01:00
Jan Tojnar 8152911f61
Merge pull request #149570 from r-ryantm/auto-update/poppler-glib
poppler: 21.06.1 -> 22.01.0
2022-01-28 11:42:30 +01:00
Malte Brandy 70de31784c all-cabal-hashes: 2022-01-24T10:21:35Z -> 2022-01-27T16:52:24Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-27 18:02:09 +01:00
Jan Tojnar 490b9b0fa0 poppler-data: clean up
https://lists.freedesktop.org/archives/poppler/2021-September/014871.html
2022-01-27 17:49:12 +01:00
Sandro Jäckel e0c98448bb mime-types: drop, gentoo replaced it with mailcap, marked for removal 2022-01-26 14:30:10 -08:00
Malte Brandy 4742183dcd Merge branch 'master' into haskell-updates 2022-01-25 21:32:29 +01:00
github-actions[bot] 6fee71d339
Merge master into staging-next 2022-01-24 12:01:16 +00:00
Ellie Hermaszewska 626b1ef8ec
all-cabal-hashes: 2022-01-18T22:54:05Z -> 2022-01-24T10:21:35Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-24 19:39:53 +08:00
github-actions[bot] 3c20f80ae5
Merge master into haskell-updates 2022-01-22 00:07:43 +00:00
github-actions[bot] 69b5682348
Merge master into staging-next 2022-01-21 06:01:27 +00:00
R. Ryantm 115521dbdc v2ray-geoip: 202201130034 -> 202201200035 2022-01-21 03:03:00 +00:00
github-actions[bot] 934d058a48
Merge master into haskell-updates 2022-01-20 00:08:47 +00:00
github-actions[bot] b74b591fbe
Merge master into staging-next 2022-01-20 00:01:46 +00:00
Andreas Rammhold 31e5b8dc21
Remove myself from maintainers
I don't have time and energy to deal with all of this anymore.
2022-01-20 00:24:52 +01:00
github-actions[bot] 28abf69ffd
Merge master into staging-next 2022-01-19 12:01:24 +00:00
R. Ryantm b9a0726261 v2ray-geoip: 202201060033 -> 202201130034 2022-01-19 06:40:59 +00:00
github-actions[bot] 1b54e5bb50
Merge master into staging-next 2022-01-19 06:01:24 +00:00
Ellie Hermaszewska 5f8b849418
all-cabal-hashes: 2022-01-14T12:47:41Z -> 2022-01-18T22:54:05Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-19 09:42:41 +08:00
github-actions[bot] 2d19cc436b
Merge master into haskell-updates 2022-01-16 00:09:16 +00:00
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
Ellie Hermaszewska e4cf20c00f
all-cabal-hashes: 2022-01-11T06:28:14Z -> 2022-01-14T12:47:41Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-14 22:50:06 +08:00
github-actions[bot] d15d1eee10
Merge master into haskell-updates 2022-01-12 00:08:56 +00: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
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 4326f3ec84
all-cabal-hashes: 2022-01-05T00:50:25Z -> 2022-01-11T06:28:14Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-11 15:14:39 +08: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 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
github-actions[bot] 44dc8255ad
Merge master into haskell-updates 2022-01-08 00:08:05 +00:00
github-actions[bot] b48a41c77c
Merge master into staging-next 2022-01-07 06:01:27 +00:00
Ben Siraphob 9a58b51e6a
treewide: fix homepages with permanent redirect to https 2022-01-07 09:57:54 +07:00
ajs124 eb9b64fc32 cacert: 3.71 -> 3.74 2022-01-06 22:46:17 +01: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
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
Dennis Gosnell e122507667
Merge remote-tracking branch 'origin/master' into haskell-updates 2022-01-01 13:29:15 +09:00
Nick Cao 0382c9a9ce
v2ray-domain-list-community: 20211119143108 -> 20211228022859 2022-01-01 12:01:44 +08:00
R. Ryantm 746f4a3568 v2ray-geoip: 202112160030 -> 202112300030 2021-12-31 20:16:42 +00:00
Dennis Gosnell 28f2bea62c
all-cabal-hashes: 2021-12-27T15:07:56Z -> 2021-12-28T00:33:48Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-28 09:49:24 +09:00
github-actions[bot] 8ce4686310
Merge master into staging-next 2021-12-27 18:01:11 +00:00
sternenseemann f7a3ebf051 all-cabal-hashes: 2021-12-21T13:58:08Z -> 2021-12-27T15:07:56Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-27 16:17:15 +01:00
github-actions[bot] e5ae98c9e2
Merge master into haskell-updates 2021-12-26 00:09:07 +00:00
R. RyanTM 05cfc5fdab
poppler_data: 0.4.10 -> 0.4.11 (#149621) 2021-12-25 17:05:20 -05:00
Sergei Trofimovich f394545b13
tzdata: 2021c -> 2021e (#151446) 2021-12-25 16:54:42 -05:00
github-actions[bot] a7f62c75af
Merge master into staging-next 2021-12-21 18:01:15 +00:00
sternenseemann a845bdf341 all-cabal-hashes: 2021-12-09T20:50:23Z -> 2021-12-21T13:58:08Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-21 15:08:21 +01:00
Dmitry Kalinkin ccdaaa0788
tzdata: fix for darwin sandbox 2021-12-18 19:08:43 -05:00
github-actions[bot] 0c19ae0aba
Merge master into haskell-updates 2021-12-19 00:08:41 +00:00
github-actions[bot] 2add1758ab
Merge master into staging-next 2021-12-18 18:01:03 +00:00
Nick Cao b8ea60f47b
v2ray-domain-list-community: fix cross compilation 2021-12-18 21:15:05 +08:00
github-actions[bot] 2189a53dad
Merge master into haskell-updates 2021-12-17 00:07:55 +00:00
Dmitry Kalinkin 889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
R. Ryantm 858df33c59 v2ray-geoip: 202112090029 -> 202112160030 2021-12-16 16:36:04 +00:00
github-actions[bot] d3da112c8c
Merge master into haskell-updates 2021-12-15 00:08:01 +00:00
github-actions[bot] 0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Nick Cao 7747c15593
v2ray-geoip: init at 202112090029 2021-12-14 14:22:51 +08:00
github-actions[bot] 92aabc6576
Merge master into staging-next 2021-12-10 00:01:53 +00:00
Malte Brandy 02d2a9f55f
all-cabal-hashes: 2021-12-08T21:36:39Z -> 2021-12-09T20:50:23Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-09 22:31:38 +01:00
Alyssa Ross c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Malte Brandy c8234d693b
all-cabal-hashes: 2021-12-07T20:15:21Z -> 2021-12-08T21:36:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-08 23:01:43 +01:00
sternenseemann 49eba10372 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-08 21:50:23 +01:00
github-actions[bot] ac0d4017c5
Merge master into staging-next 2021-12-08 12:01:20 +00:00
Malte Brandy 25c0241b8a
all-cabal-hashes: 2021-12-02T21:05:02Z -> 2021-12-07T20:15:21Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-07 21:20:13 +01:00
R. Ryantm 491ef7707d scowl: 2019.10.06 -> 2020.12.07 2021-12-07 01:01:43 +00:00
github-actions[bot] 41895efeb5
Merge master into staging-next 2021-12-06 12:01:16 +00:00
sternenseemann 5f9cdd06ef Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-06 11:17:24 +01:00
Mauricio Collares d93f7e5de8 elliptic_curves: use Python 3 2021-12-05 22:59:22 -08:00
Mauricio Collares 367eb04e2d conway_polynomials: use Python 3 2021-12-05 22:59:22 -08:00
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
Alyssa Ross 01bce76b11
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/applications/virtualization/qemu/default.nix
2021-11-30 18:54:47 +00: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
Jörg Thalheim 2372b2861e iana-etc: 20210225 -> 20211124 2021-11-28 12:45:27 +01: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
github-actions[bot] 90a3ecee8f
Merge master into staging-next 2021-10-02 00:04:43 +00:00
ajs124 d014e1c7e5 tzdata: add myself as maintainer 2021-10-02 01:34:47 +02:00
ajs124 1143d2ca24 tzdata: 2021b -> 2021c 2021-10-02 01:20:12 +02:00
sternenseemann d3f87c81cb all-cabal-hashes: 2021-09-29T20:58:23Z -> 2021-10-01T17:27:40Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-10-01 21:27:24 +02:00
sterni b7ee74fff0
Merge pull request #140146 from nomeata/joachim/haskell-maintainership
Add myself as maintainer for a few Haskell packages
2021-10-01 14:41:35 +02:00
github-actions[bot] d52d86a965
Merge staging-next into staging 2021-10-01 12:01:52 +00:00
github-actions[bot] c641792c36
Merge master into staging-next 2021-10-01 12:01:14 +00:00
Antonio Yang 82155ff501
rime-array: 2016-09-01 -> 2021-08-24 (#140008)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-01 11:20:50 +02:00
ajs124 5a9b23f539 cacert: 3.66 -> 3.71 2021-09-30 21:16:26 +02:00
github-actions[bot] 2dfffe79b2
Merge staging-next into staging 2021-09-30 00:02:24 +00:00
github-actions[bot] 1994a3055b
Merge master into staging-next 2021-09-30 00:01:51 +00:00
sternenseemann 0280f0990a all-cabal-hashes: 2021-09-19T21:23:33Z -> 2021-09-29T20:58:23Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-09-29 23:27:34 +02:00
ajs124 ec96691d78 tzdata: 2021a -> 2021b 2021-09-26 23:48:26 +02:00
sternenseemann 414d4ab627 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-09-24 16:26:28 +02:00