lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

nix/pkgs: adapt to poetry2nix

Browse source
This commit is contained in:
Luke Granger-Brown 2023-11-19 20:12:05 +00:00
parent 47f3220444
commit 7565b32c45
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/authentik/pythonapp/default.nix
View file

@ -1,7 +1,7 @@
{ depot, src, pkgs, lib, ... }: { depot, src, pkgs, lib, ... }:
let let
inherit (pkgs) poetry2nix; inherit (depot.third_party) poetry2nix;
pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } '' pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } ''
sed 's/extras = \["standard"\],//' $src > $out sed 's/extras = \["standard"\],//' $src > $out
''; '';

5
nix/pkgs/baserow/default.nix
View file

@ -1,10 +1,10 @@
{ fetchFromGitLab { depot
, fetchFromGitLab
, pkgs , pkgs
, lib , lib
, stdenv , stdenv
, makeWrapper , makeWrapper
, python3 , python3
, poetry2nix
, nodejs-18_x , nodejs-18_x
, ossOnly ? true , ossOnly ? true
}: }:
@ -34,6 +34,7 @@ let
}; };
nodejs = nodejs-18_x; nodejs = nodejs-18_x;
inherit (depot.third_party) poetry2nix;
poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let
addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: { addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ buildInputs; buildInputs = (old.buildInputs or []) ++ buildInputs;

4
nix/pkgs/default.nix
View file

@ -44,8 +44,8 @@
sha256 = "18miswrdy3j2y59alqcw44pc2iv3kmsx7qmvak81z5bkmj2hjrss"; sha256 = "18miswrdy3j2y59alqcw44pc2iv3kmsx7qmvak81z5bkmj2hjrss";
}; };
baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; }; baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; inherit depot; };
baserow = pkgs.callPackages ./baserow { ossOnly = false; }; baserow = pkgs.callPackages ./baserow { ossOnly = false; inherit depot; };
common-updater-scripts = pkgs.common-updater-scripts.override { common-updater-scripts = pkgs.common-updater-scripts.override {
nix = pkgs.nix_2_3; nix = pkgs.nix_2_3;