diff --git a/flake.lock b/flake.lock index 5e92b39..de8fe0a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668189330, - "narHash": "sha256-1JrW+omJ+LguAu9TZgumJ39e28Ratpww8dpsnX3tGqs=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb8d3fe07d3592e5d846bce5f7cb5397efe6b206", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b9b5eef..7401bed 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A Python API for various tools I use at work."; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; flake-utils.url = github:numtide/flake-utils; }; outputs = { self, nixpkgs, flake-utils }: @@ -17,20 +17,35 @@ pkgs.gnumake (pkgs.poetry2nix.mkPoetryEnv { projectDir = ./.; - overrides = pkgs.poetry2nix.defaultPoetryOverrides.extend (self: super: { - findpython = super.findpython.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.pdm ]; - } - ); - idna = super.idna.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.python39Packages.flit-core ]; - } - ); - }); + overrides = pkgs.poetry2nix.defaultPoetryOverrides.extend + (self: super: { + findpython = super.findpython.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.pdm ]; + } + ); + django-floppyforms = + super.django-floppyforms.overridePythonAttrs + ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.python310Packages.setuptools ]; + } + ); + django-crispy-forms = super.django-crispy-forms.overridePythonAttrs + ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.python310Packages.setuptools ]; + } + ); + exceptiongroup = super.exceptiongroup.overridePythonAttrs + ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.python310Packages.flit-scm ]; + } + ); + }); }) - pkgs.python39Packages.poetry + pkgs.python310Packages.poetry ]; }; shellHook = ''