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

nix/pkgs/authentik: oops, remove reference to nix store path

Browse source
This commit is contained in:
Luke Granger-Brown 2022-05-13 22:31:19 +00:00
parent 13d51a7978
commit 5402286846
6 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ pkgs, src, version, ... }: { pkgs, src, version, ... }:
let let
nodeComposition = import ./node-composition.nix { inherit pkgs; }; nodeComposition = import ./node-composition.nix { inherit pkgs src; };
in in
pkgs.runCommand "authentik-docs-${version}" { pkgs.runCommand "authentik-docs-${version}" {
inherit src; inherit src;

4
nix/pkgs/authentik/docs/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x", src}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
@ -13,5 +13,5 @@ let
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv; inherit nodeEnv src;
} }

12
nix/pkgs/authentik/docs/node-packages.nix
View file

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.11.1. Do not edit! # This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? [], src}:
let let
sources = { sources = {
@ -9630,7 +9630,7 @@ let
name = "authentik-docs"; name = "authentik-docs";
packageName = "authentik-docs"; packageName = "authentik-docs";
version = "0.0.0"; version = "0.0.0";
src = ../../../../../../../nix/store/7f906jj83fagr7qli5jx4xq55zqwa7dc-source/website; src = "${src}/website";
dependencies = [ dependencies = [
sources."@algolia/autocomplete-core-1.5.2" sources."@algolia/autocomplete-core-1.5.2"
sources."@algolia/autocomplete-preset-algolia-1.5.2" sources."@algolia/autocomplete-preset-algolia-1.5.2"
@ -11058,13 +11058,9 @@ in
nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
src = stdenv.mkDerivation { src = stdenv.mkDerivation {
name = args.name + "-package-json"; name = args.name + "-package-json";
src = nix-gitignore.gitignoreSourcePure [ inherit (args) src;
"*"
"!package.json"
"!package-lock.json"
] args.src;
dontBuild = true; dontBuild = true;
installPhase = "mkdir -p $out; cp -r ./* $out;"; installPhase = "mkdir -p $out; cp -r ./package.json ./package-lock.json $out;";
}; };
}); });
} }

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

@ -1,7 +1,7 @@
{ pkgs, src, version, ... }: { pkgs, src, version, ... }:
let let
nodeComposition = import ./node-composition.nix { inherit pkgs; }; nodeComposition = import ./node-composition.nix { inherit pkgs src; };
in in
pkgs.runCommand "authentik-webui-${version}" { pkgs.runCommand "authentik-webui-${version}" {
inherit src; inherit src;

4
nix/pkgs/authentik/webui/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x", src}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
@ -13,5 +13,5 @@ let
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv; inherit nodeEnv src;
} }

12
nix/pkgs/authentik/webui/node-packages.nix
View file

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.11.1. Do not edit! # This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? [], src}:
let let
sources = { sources = {
@ -6372,7 +6372,7 @@ let
name = "authentik-web"; name = "authentik-web";
packageName = "authentik-web"; packageName = "authentik-web";
version = "0.0.0"; version = "0.0.0";
src = ../../../../../../../nix/store/7f906jj83fagr7qli5jx4xq55zqwa7dc-source/web; src = "${src}/web";
dependencies = [ dependencies = [
sources."@ampproject/remapping-2.1.1" sources."@ampproject/remapping-2.1.1"
sources."@apitools/openapi-parser-0.0.24" sources."@apitools/openapi-parser-0.0.24"
@ -7472,13 +7472,9 @@ in
nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
src = stdenv.mkDerivation { src = stdenv.mkDerivation {
name = args.name + "-package-json"; name = args.name + "-package-json";
src = nix-gitignore.gitignoreSourcePure [ inherit (args) src;
"*"
"!package.json"
"!package-lock.json"
] args.src;
dontBuild = true; dontBuild = true;
installPhase = "mkdir -p $out; cp -r ./* $out;"; installPhase = "mkdir -p $out; cp -r ./package.json ./package-lock.json $out;";
}; };
}); });
} }