diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix index 1770cc4be1..197de1f283 100644 --- a/nix/pkgs/authentik/pythonapp/default.nix +++ b/nix/pkgs/authentik/pythonapp/default.nix @@ -1,7 +1,7 @@ { depot, src, pkgs, lib, ... }: let - inherit (pkgs) poetry2nix; + inherit (depot.third_party) poetry2nix; pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } '' sed 's/extras = \["standard"\],//' $src > $out ''; diff --git a/nix/pkgs/baserow/default.nix b/nix/pkgs/baserow/default.nix index cec870a200..6e1f4457e2 100644 --- a/nix/pkgs/baserow/default.nix +++ b/nix/pkgs/baserow/default.nix @@ -1,10 +1,10 @@ -{ fetchFromGitLab +{ depot +, fetchFromGitLab , pkgs , lib , stdenv , makeWrapper , python3 -, poetry2nix , nodejs-18_x , ossOnly ? true }: @@ -34,6 +34,7 @@ let }; nodejs = nodejs-18_x; + inherit (depot.third_party) poetry2nix; poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ buildInputs; diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 1db86af820..53d8fd749a 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -44,8 +44,8 @@ sha256 = "18miswrdy3j2y59alqcw44pc2iv3kmsx7qmvak81z5bkmj2hjrss"; }; - baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; }; - baserow = pkgs.callPackages ./baserow { ossOnly = false; }; + baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; inherit depot; }; + baserow = pkgs.callPackages ./baserow { ossOnly = false; inherit depot; }; common-updater-scripts = pkgs.common-updater-scripts.override { nix = pkgs.nix_2_3;