Compare commits

1 Commits

Author SHA1 Message Date
352af99693 Try Actions
Some checks failed
Check Flake / check-flake (push) Failing after 15s
2023-04-23 20:07:44 -06:00
4 changed files with 32 additions and 10 deletions

View File

@@ -0,0 +1,24 @@
name: Check Flake
on: [push]
env:
DEBIAN_FRONTEND: noninteractive
jobs:
check-flake:
runs-on: ubuntu-latest
steps:
- name: Install sudo
run: apt-get update && apt-get install sudo
- name: Install Nix
uses: https://github.com/cachix/install-nix-action@v20
- name: Checkout the repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Check Flake
run: nix flake check --show-trace

8
flake.lock generated
View File

@@ -17,16 +17,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739758141, "lastModified": 1638239011,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791", "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/21.11";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@@ -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.python3.pkgs.buildPythonApplication rec { drastikbot = prev.python3Packages.buildPythonApplication rec {
pname = "drastikbot"; pname = "drastikbot";
version = "v2.1"; version = "v2.1";
@@ -30,7 +30,7 @@
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${prev.python3}/bin/python3 $out/bin/drastikbot \ makeWrapper ${prev.python3}/bin/python3 $out/bin/drastikbot \
--prefix PYTHONPATH : ${with prev.python3.pkgs; makePythonPath [requests beautifulsoup4]} \ --prefix PYTHONPATH : ${with prev.python3Packages; makePythonPath [requests beautifulsoup4]} \
--add-flags "$out/drastikbot.py" --add-flags "$out/drastikbot.py"
''; '';
}; };

View File

@@ -205,9 +205,7 @@ 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:
context = ssl.create_default_context() self.irc_socket = ssl.wrap_socket(self.irc_socket)
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