Compare commits

...

2 Commits

Author SHA1 Message Date
7d59e09968
flake: fix missing setuptools imports 2022-12-07 13:06:25 +11:00
4537511dab
flake: update inputs 2022-12-07 12:50:20 +11:00
2 changed files with 31 additions and 19 deletions

30
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1667395993,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +32,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1662166109, "lastModified": 1670377502,
"narHash": "sha256-cmNWUeVDfSJC9y8nmX2O/7kuOXJU1ZVFJMYP87qrm/Y=", "narHash": "sha256-ApYIjbTGszXzznuKkupYEqZ8BB9NYawDfxc9F2xRggk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb5a1a003dde9c16a1ae4b28cbe7bf0fab15da32", "rev": "fa01623a880c73ae98939f19e0872023f789a4c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -47,11 +47,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1662166109, "lastModified": 1670377502,
"narHash": "sha256-cmNWUeVDfSJC9y8nmX2O/7kuOXJU1ZVFJMYP87qrm/Y=", "narHash": "sha256-ApYIjbTGszXzznuKkupYEqZ8BB9NYawDfxc9F2xRggk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb5a1a003dde9c16a1ae4b28cbe7bf0fab15da32", "rev": "fa01623a880c73ae98939f19e0872023f789a4c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1662044036, "lastModified": 1670366583,
"narHash": "sha256-+5YZPznhy1gEKPdWiZj7UcLoRaLbfvUDr8OzOY+75jM=", "narHash": "sha256-yXpxginCle/SnHJ4iy0kjPt8/kEkc2ApwWo5pmYQ4y0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "efe5b281b51c22495c488480d23d7bb1426bf3ba", "rev": "641d2d34a3a8ce2b35396fed89c8f49451d06226",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -9,10 +9,22 @@
overlay = nixpkgs.lib.composeManyExtensions [ overlay = nixpkgs.lib.composeManyExtensions [
poetry2nix.overlay poetry2nix.overlay
(final: prev: { (final: prev: {
frontpage = prev.poetry2nix.mkPoetryApplication { frontpage = prev.poetry2nix.mkPoetryApplication
python = prev.python39; {
projectDir = ./.; python = prev.python39;
}; projectDir = ./.;
overrides =
prev.poetry2nix.overrides.withDefaults (final_: prev_:
nixpkgs.lib.listToAttrs
(builtins.map
(name: {
inherit name;
value = prev_."${name}".overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final_.setuptools ];
});
})
[ "beaker" "flask-pyoidc-oda" "oic" ]));
};
}) })
]; ];