Update to python3 and fix ssl.wrap_socket removal in 3.12
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
supportedSystems = with flake-utils.lib.system; [ x86_64-linux i686-linux aarch64-linux ];
|
supportedSystems = with flake-utils.lib.system; [ x86_64-linux i686-linux aarch64-linux ];
|
||||||
in {
|
in {
|
||||||
overlay = final: prev: {
|
overlay = final: prev: {
|
||||||
drastikbot = prev.python311.pkgs.buildPythonApplication rec {
|
drastikbot = prev.python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "drastikbot";
|
pname = "drastikbot";
|
||||||
version = "v2.1";
|
version = "v2.1";
|
||||||
|
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
cp -r $src/src/* $out
|
cp -r $src/src/* $out
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
makeWrapper ${prev.python311}/bin/python3 $out/bin/drastikbot \
|
makeWrapper ${prev.python3}/bin/python3 $out/bin/drastikbot \
|
||||||
--prefix PYTHONPATH : ${with prev.python311.pkgs; makePythonPath [requests beautifulsoup4]} \
|
--prefix PYTHONPATH : ${with prev.python3.pkgs; makePythonPath [requests beautifulsoup4]} \
|
||||||
--add-flags "$out/drastikbot.py"
|
--add-flags "$out/drastikbot.py"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -205,7 +205,9 @@ class Drastikbot():
|
|||||||
self.irc_socket = socket.create_connection(
|
self.irc_socket = socket.create_connection(
|
||||||
(self.var.host, self.var.port), 300)
|
(self.var.host, self.var.port), 300)
|
||||||
if self.var.ssl:
|
if self.var.ssl:
|
||||||
self.irc_socket = ssl.wrap_socket(self.irc_socket)
|
context = ssl.create_default_context()
|
||||||
|
self.irc_socket = context.wrap_socket(
|
||||||
|
self.irc_socket, server_hostname=self.var.host)
|
||||||
except OSError:
|
except OSError:
|
||||||
if self.var.sigint:
|
if self.var.sigint:
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user