Commit graph

11 commits

Author SHA1 Message Date
Jan Tojnar 380c030740 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/aiohttp-socks/default.nix
;	pkgs/development/python-modules/emv/default.nix
;	pkgs/development/python-modules/mocket/default.nix
;	pkgs/development/python-modules/types-protobuf/default.nix
2021-12-31 07:26:03 +01:00
Austin Butler ac796bf814 python3Packages.aiohttp-socks: 0.6.0 -> 0.7.1 2021-12-30 09:38:48 -08:00
Jonathan Ringer 60b0c51200
python3Packages.aiohttp-socks: 0.6.0 -> 0.7.1 2021-12-14 12:02:45 -08:00
Michael Lingelbach 9c220bb2e8 pythonPackages.aiohttp-socks: 0.3.9 -> 0.6.0 2021-05-07 14:25:23 -07:00
R. RyanTM e76a81f19c python37Packages.aiohttp-socks: 0.3.7 -> 0.3.9 2020-05-06 09:48:11 -07:00
R. RyanTM 49ac78ae3e python37Packages.aiohttp-socks: 0.3.6 -> 0.3.7 2020-04-06 11:48:11 -07:00
R. RyanTM b56496945f python37Packages.aiohttp-socks: 0.3.4 -> 0.3.6 2020-03-25 10:16:08 -07:00
R. RyanTM ef9939e36f python37Packages.aiohttp-socks: 0.3.3 -> 0.3.4 2020-01-22 17:06:56 -08:00
Mario Rodas fdf2020620
python37Packages.aiohttp-socks: 0.3.2 -> 0.3.3 2019-12-26 04:20:00 -05:00
R. RyanTM 4ffda2a033 python37Packages.aiohttp-socks: 0.2.2 -> 0.3.2 2019-12-23 22:49:28 -08:00
Clemens Fruhwirth 6fefd37f63 pythonPackages.aiohttp-socks: init at 0.2.2
Co-authored-by: nyanloutre <paul@nyanlout.re>
2019-01-22 17:04:12 +01:00