lib fix?....

This commit is contained in:
Danilo Reyes
2025-11-11 16:14:10 -06:00
parent ed5984e32b
commit b67e154777
2 changed files with 29 additions and 37 deletions

View File

@@ -1,36 +1,40 @@
{ {
description = "Lidarr to MusicBrainz Missing Albums Finder"; description = "Lidarr to MusicBrainz Missing Albums Finder";
inputs = { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = outputs =
{ nixpkgs, flake-utils, self }: { nixpkgs }:
let
# NixOS module output (not system-specific)
# The module accepts a package option, which can be set from the flake's packages
nixosModules = {
lidarr-mb-gap = import ./nixos/lidarr-mb-gap.nix;
};
in
{
# Export NixOS modules
nixosModules = nixosModules;
}
// flake-utils.lib.eachDefaultSystem (
system:
let let
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
lib = pkgs.lib; lib = pkgs.lib;
lidarr-mb-gap = import ./nix/package.nix { lidarr-mb-gap = import ./nix/package.nix {
inherit pkgs lib; inherit pkgs;
src = lib.cleanSource ./src; src = lib.cleanSource ./src;
}; };
in in
{ {
devShells.default = pkgs.mkShell { nixosModules.lidarr-mb-gap = import ./nixos/lidarr-mb-gap.nix;
packages.${system} = {
default = lidarr-mb-gap;
lidarr-mb-gap = lidarr-mb-gap;
};
apps.${system} = {
default = {
type = "app";
program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
};
lidarr-mb-gap = {
type = "app";
program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
};
};
devShells.${system} = {
default = pkgs.mkShell {
buildInputs = [ buildInputs = [
(pkgs.python3.withPackages ( (pkgs.python3.withPackages (
ps: with ps; [ ps: with ps; [
@@ -46,17 +50,6 @@
echo "Format code with: black src/" echo "Format code with: black src/"
''; '';
}; };
packages.default = lidarr-mb-gap;
packages.lidarr-mb-gap = lidarr-mb-gap;
apps.default = {
type = "app";
program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
}; };
apps.lidarr-mb-gap = {
type = "app";
program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
}; };
}
);
} }

View File

@@ -16,7 +16,6 @@ let
else if config.services.lidarr-mb-gap.src != null then else if config.services.lidarr-mb-gap.src != null then
import ../nix/package.nix { import ../nix/package.nix {
inherit pkgs; inherit pkgs;
lib = pkgs.lib;
src = config.services.lidarr-mb-gap.src; src = config.services.lidarr-mb-gap.src;
} }
else else