From 2b4480d1611182ff31c0d29fdcd862f1ce417e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Sep 2024 09:11:11 -0700 Subject: [PATCH] immich-machine-learning: move from immich.machine-learning A top-level attribute makes sure Hydra builds it (though that already happens on Linux through the NixOS test) and that nixpkgs-review picks it up. --- .../package.nix} | 3 +-- pkgs/by-name/im/immich/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/by-name/im/{immich/machine-learning.nix => immich-machine-learning/package.nix} (98%) diff --git a/pkgs/by-name/im/immich/machine-learning.nix b/pkgs/by-name/im/immich-machine-learning/package.nix similarity index 98% rename from pkgs/by-name/im/immich/machine-learning.nix rename to pkgs/by-name/im/immich-machine-learning/package.nix index 5217518ff17a..b5e15c6d040b 100644 --- a/pkgs/by-name/im/immich/machine-learning.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -1,6 +1,5 @@ { lib, - src, fetchFromGitHub, immich, python3, @@ -31,7 +30,7 @@ in python.pkgs.buildPythonApplication { pname = "immich-machine-learning"; inherit (immich) version; - src = "${src}/machine-learning"; + src = "${immich.src}/machine-learning"; pyproject = true; postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index ea64fd65945c..fe62f0ddc354 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -8,7 +8,7 @@ node-gyp, runCommand, nixosTests, - callPackage, + immich-machine-learning, # build-time deps glib, pkg-config, @@ -210,7 +210,7 @@ buildNpmPackage' { inherit (nixosTests) immich; }; - machine-learning = callPackage ./machine-learning.nix { inherit src; }; + machine-learning = immich-machine-learning; inherit src