909 commits

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