924 commits

Author	SHA1	Message	Date
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
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
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