From 42790f7b67faa6b454d804a6283fa71b6bbfcd16 Mon Sep 17 00:00:00 2001 From: fusion44 Date: Wed, 3 Jan 2024 20:58:28 +0100 Subject: [PATCH] feat: update flake file --- flake.lock | 12 ++++++------ flake.nix | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 118da40..878bed2 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701068326, - "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1701105783, - "narHash": "sha256-5IOI0xXGbhAkUZNNcPId48V78Q+/JlW0hzlif0zxRmM=", + "lastModified": 1703546497, + "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "0b2bff39e9bd4e6db3208e09c276ca83a063b370", + "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8a8e177..6dd94dd 100644 --- a/flake.nix +++ b/flake.nix @@ -14,16 +14,32 @@ in { devShells = forAllSystems (system: pkgs: { - default = pkgs.mkShell { + default = pkgs.mkShell { buildInputs = with pkgs; [ - python39Packages.pytest - python39Packages.coverage + stdenv.cc.cc.lib + python311Packages.pytest + python311Packages.coverage + python311Packages.venvShellHook poetry + poetryPlugins.poetry-plugin-export pre-commit black isort ruff + ruff-lsp + pyright ]; + venvDir = "./.venv"; + src = null; + postVenv = '' + unset SOURCE_DATE_EPOCH + ''; + postShellHook = '' + unset SOURCE_DATE_EPOCH + unset LD_PRELOAD + + PYTHONPATH=$PWD/$venvDir/${pkgs.python311.sitePackages}:$PYTHONPATH + ''; }; }); overlays = { @@ -35,7 +51,7 @@ default = self.packages.${system}.${projectName}; ${projectName} = pkgs.poetry2nix.mkPoetryApplication { projectDir = ./.; - python = pkgs.python39; + python = pkgs.python311; }; }); };