diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2025-05-21 09:24:30 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2025-05-21 09:24:30 +0200 |
| commit | 75695d3e42bfe15483cefa43f316a4ae11a3bcca (patch) | |
| tree | b4c17493825d4d6894fed3ea89c2255a17d9e529 /overlays | |
| parent | 861a04827a19facd4ce0eb4693de43f64507df52 (diff) | |
| download | nixos-75695d3e42bfe15483cefa43f316a4ae11a3bcca.tar nixos-75695d3e42bfe15483cefa43f316a4ae11a3bcca.tar.gz nixos-75695d3e42bfe15483cefa43f316a4ae11a3bcca.tar.bz2 nixos-75695d3e42bfe15483cefa43f316a4ae11a3bcca.tar.xz nixos-75695d3e42bfe15483cefa43f316a4ae11a3bcca.zip | |
...
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/abs-podcast-autoplaylist/default.nix | 25 | ||||
| -rw-r--r-- | overlays/waybar-systemd-inhibit/default.nix | 31 |
2 files changed, 16 insertions, 40 deletions
diff --git a/overlays/abs-podcast-autoplaylist/default.nix b/overlays/abs-podcast-autoplaylist/default.nix index 075e0ba0..843f1b65 100644 --- a/overlays/abs-podcast-autoplaylist/default.nix +++ b/overlays/abs-podcast-autoplaylist/default.nix | |||
| @@ -1,23 +1,14 @@ | |||
| 1 | { prev, final, flakeInputs, ... }: | 1 | { prev, final, flake, flakeInputs, ... }: |
| 2 | |||
| 3 | with flakeInputs; | ||
| 4 | 2 | ||
| 5 | let | 3 | let |
| 6 | workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; }; | 4 | workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; }; |
| 7 | overlay = workspace.mkPyprojectOverlay { | 5 | pythonSet = flake.lib.pythonSet { |
| 8 | sourcePreference = "wheel"; | 6 | pkgs = final; |
| 7 | python = final.python312; | ||
| 8 | overlay = workspace.mkPyprojectOverlay { | ||
| 9 | sourcePreference = "wheel"; | ||
| 10 | }; | ||
| 9 | }; | 11 | }; |
| 10 | python = final.python312; | ||
| 11 | pythonSet = | ||
| 12 | (final.callPackage pyproject-nix.build.packages { | ||
| 13 | inherit python; | ||
| 14 | }).overrideScope | ||
| 15 | ( | ||
| 16 | prev.lib.composeManyExtensions [ | ||
| 17 | pyproject-build-systems.overlays.default | ||
| 18 | overlay | ||
| 19 | ] | ||
| 20 | ); | ||
| 21 | virtualEnv = pythonSet.mkVirtualEnv "abs-podcast-autoplaylist-env" workspace.deps.default; | 12 | virtualEnv = pythonSet.mkVirtualEnv "abs-podcast-autoplaylist-env" workspace.deps.default; |
| 22 | in { | 13 | in { |
| 23 | abs-podcast-autoplaylist = virtualEnv.overrideAttrs (oldAttrs: { | 14 | abs-podcast-autoplaylist = virtualEnv.overrideAttrs (oldAttrs: { |
diff --git a/overlays/waybar-systemd-inhibit/default.nix b/overlays/waybar-systemd-inhibit/default.nix index 88322ef5..ae6b8c75 100644 --- a/overlays/waybar-systemd-inhibit/default.nix +++ b/overlays/waybar-systemd-inhibit/default.nix | |||
| @@ -1,29 +1,14 @@ | |||
| 1 | { prev, final, flakeInputs, ... }: | 1 | { prev, final, flake, flakeInputs, ... }: |
| 2 | |||
| 3 | with flakeInputs; | ||
| 4 | 2 | ||
| 5 | let | 3 | let |
| 6 | workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; }; | 4 | workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; }; |
| 7 | overlay = workspace.mkPyprojectOverlay { | 5 | pythonSet = flake.lib.pythonSet { |
| 8 | sourcePreference = "wheel"; | 6 | pkgs = final; |
| 7 | python = final.python312; | ||
| 8 | overlay = workspace.mkPyprojectOverlay { | ||
| 9 | sourcePreference = "wheel"; | ||
| 10 | }; | ||
| 9 | }; | 11 | }; |
| 10 | python = final.python312; | ||
| 11 | # hacks = final.callPackage pyproject-nix.build.hacks { }; | ||
| 12 | pythonSet = | ||
| 13 | (final.callPackage pyproject-nix.build.packages { | ||
| 14 | inherit python; | ||
| 15 | }).overrideScope | ||
| 16 | ( | ||
| 17 | prev.lib.composeManyExtensions [ | ||
| 18 | pyproject-build-systems.overlays.default | ||
| 19 | overlay | ||
| 20 | # (final: prev: { | ||
| 21 | # pygobject = hacks.nixpkgsPrebuilt { | ||
| 22 | # from = python.pkgs.pygobject3; | ||
| 23 | # }; | ||
| 24 | # }) | ||
| 25 | ] | ||
| 26 | ); | ||
| 27 | virtualEnv = pythonSet.mkVirtualEnv "waybar-systemd-inhibit-env" workspace.deps.default; | 12 | virtualEnv = pythonSet.mkVirtualEnv "waybar-systemd-inhibit-env" workspace.deps.default; |
| 28 | in { | 13 | in { |
| 29 | waybar-systemd-inhibit = virtualEnv.overrideAttrs (oldAttrs: { | 14 | waybar-systemd-inhibit = virtualEnv.overrideAttrs (oldAttrs: { |