Rewrite to unstable

This commit is contained in:
Andreas Zweili 2022-11-19 18:10:59 +01:00
parent 5beaecebba
commit 3fd606a5ab
2 changed files with 33 additions and 18 deletions

View File

@ -17,16 +17,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1668189330, "lastModified": 1668765800,
"narHash": "sha256-1JrW+omJ+LguAu9TZgumJ39e28Ratpww8dpsnX3tGqs=", "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb8d3fe07d3592e5d846bce5f7cb5397efe6b206", "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -1,7 +1,7 @@
{ {
description = "A Python API for various tools I use at work."; description = "A Python API for various tools I use at work.";
inputs = { inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
}; };
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:
@ -17,20 +17,35 @@
pkgs.gnumake pkgs.gnumake
(pkgs.poetry2nix.mkPoetryEnv { (pkgs.poetry2nix.mkPoetryEnv {
projectDir = ./.; projectDir = ./.;
overrides = pkgs.poetry2nix.defaultPoetryOverrides.extend (self: super: { overrides = pkgs.poetry2nix.defaultPoetryOverrides.extend
findpython = super.findpython.overridePythonAttrs ( (self: super: {
old: { findpython = super.findpython.overridePythonAttrs (
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.pdm ]; old: {
} buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.pdm ];
); }
idna = super.idna.overridePythonAttrs ( );
old: { django-floppyforms =
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.python39Packages.flit-core ]; 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 = '' shellHook = ''