From 4edadb0888a34845f9d7b5fbfe0047638e52d2cf Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 14 Mar 2023 20:38:51 -0400 Subject: add docker container --- .gitignore | 1 + .pre-commit-config.yaml | 1 - flake.lock | 59 ++++++++----------------------------------------- flake.nix | 11 ++++++++- 4 files changed, 20 insertions(+), 52 deletions(-) delete mode 120000 .pre-commit-config.yaml diff --git a/.gitignore b/.gitignore index b1d4722..7d85668 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ dmypy.json # nix stuff .direnv/ result +.pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 120000 index 9ad99c0..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/sj4hklv5klfh4wk3pvc8fxd5242qp12q-pre-commit-config.json \ No newline at end of file diff --git a/flake.lock b/flake.lock index 19f48df..ac07cec 100644 --- a/flake.lock +++ b/flake.lock @@ -16,22 +16,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1676283394, @@ -47,21 +31,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -99,31 +68,21 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1676879534, diff --git a/flake.nix b/flake.nix index 7ec30ab..698fc32 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,9 @@ pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-utils.follows = "flake-utils"; }; flake-compat = { url = "github:edolstra/flake-compat"; @@ -18,8 +21,8 @@ self, nixpkgs, pre-commit-hooks, - flake-compat, flake-utils, + ... }: let version = "0.0.1"; supportedSystems = with flake-utils.lib.system; [x86_64-linux x86_64-darwin aarch64-linux aarch64-darwin]; @@ -37,6 +40,12 @@ format = "flit"; propagatedBuildInputs = with pkgs.python39Packages; [hatchling discordpy requests]; }; + container = with pkgs.dockerTools; + buildImage { + name = "teawiebot"; + copyToRoot = [caCertificates]; + config.Cmd = ["${self.packages.${system}.teawiebot}/bin/teawiebot"]; + }; } // {default = self.packages.${system}.teawiebot;}; -- cgit v1.2.3