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

nix/pkgs/authentik/pythonapp: pin to older nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2022-10-03 03:15:58 +01:00
parent 87030597e0
commit 17b138e8f0
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
{ pkgs, src, ... }: { depot, src, ... }:
let let
pkgs = depot.third_party.nixpkgsOld;
inherit (pkgs) 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
''; '';
@ -15,15 +17,15 @@ let
cp ${pyproject} $out/pyproject.toml cp ${pyproject} $out/pyproject.toml
cp ${poetrylock} $out/poetry.lock cp ${poetrylock} $out/poetry.lock
''; '';
app = pkgs.poetry2nix.mkPoetryApplication rec { app = poetry2nix.mkPoetryApplication rec {
projectDir = fixedSrc; projectDir = fixedSrc;
python = pkgs.python310; python = pkgs.python310;
overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: { overrides = poetry2nix.overrides.withDefaults (self: super: {
click-didyoumean = super.click-didyoumean.overridePythonAttrs (old: { click-didyoumean = super.click-didyoumean.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ];
}); });
xmlsec = super.xmlsec.overridePythonAttrs (old: { xmlsec = super.xmlsec.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.pkgconfig ];
buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ]; buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ];
}); });
mistune = super.mistune.overridePythonAttrs (old: rec { mistune = super.mistune.overridePythonAttrs (old: rec {

12
third_party/default.nix vendored
View file

@ -36,11 +36,21 @@ let
rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9";
sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
}; };
nixpkgsOldSrc = nixpkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs";
rev = "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90";
sha256 = "0dq22dagzk76x2ws4dz88w018i6byamd6rnzqizx68bzimg6g7xn";
};
nixpkgsOld = import "${nixpkgsOldSrc}" {
inherit system;
config = nixpkgsConfig;
};
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; };
in in
rec { rec {
inherit nixpkgsConfig nixpkgs; inherit nixpkgsConfig nixpkgs nixpkgsOld;
nixos = import ./nixpkgs/nixos; nixos = import ./nixpkgs/nixos;
nixeval = import ./nixpkgs/nixos/lib/eval-config.nix; nixeval = import ./nixpkgs/nixos/lib/eval-config.nix;
buildGo = buildGo =