Merge pull request #44 from bryango/bump-python-nixpkgs

Bump python 3.10 -> 3.11 and nixpkgs
nix-community · Feb 20, 2024 · 049b7a2 · 049b7a2
2 parents 799b0f1 + 4cb0811
commit 049b7a2
Show file tree

Hide file tree

Showing 4 changed files with 238 additions and 149 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,52 +3,61 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils = { url = "github:numtide/flake-utils"; };
+    flake-utils.url = "github:numtide/flake-utils";
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.systems.follows = "flake-utils/systems";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, flake-compat, ... }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ ];
         };
-        python = pkgs.python310;
+        poetry2nix = self.inputs.poetry2nix.lib.mkPoetry2Nix {
+          inherit pkgs;
+        };
+        python = pkgs.python311;
         packageName = "hydra-check";
         # update the pyproject.toml too
         packageVersion = "1.3.5";
       in
       {
-        packages = rec {
-          hydra-check = python.pkgs.buildPythonApplication rec {
+        packages = {
+          hydra-check = python.pkgs.buildPythonApplication {
             pname = packageName;
             version = packageVersion;
             format = "pyproject";
             nativeBuildInputs = with python.pkgs; [ poetry-core ];
             propagatedBuildInputs = with python.pkgs; [ requests beautifulsoup4 colorama ];
             src = ./.;
-            checkInputs = with pkgs; [ python310.pkgs.mypy ];
+            checkInputs = with python.pkgs; [ mypy ];
             checkPhase = ''
               #export MYPYPATH=$PWD/src
               #mypy --strict .
             '';
           };
-          default = hydra-check;
+          default = self.packages.${system}.hydra-check;
         };
 
         devShells = {
           default = pkgs.mkShell {
             buildInputs = with pkgs; [
               pyright
               poetry
-              (pkgs.poetry2nix.mkPoetryEnv {
+              (poetry2nix.mkPoetryEnv {
                 inherit python;
                 projectDir = ./.;
-                overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: { });
+                overrides = poetry2nix.overrides.withDefaults (self: super: { });
                 editablePackageSources = {
                   hydra-check = ./src;
                 };