From 540228684654e402507729d366acd186d1e6b30f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 13 May 2022 22:31:19 +0000 Subject: [PATCH] nix/pkgs/authentik: oops, remove reference to nix store path --- nix/pkgs/authentik/docs/default.nix | 2 +- nix/pkgs/authentik/docs/node-composition.nix | 4 ++-- nix/pkgs/authentik/docs/node-packages.nix | 12 ++++-------- nix/pkgs/authentik/webui/default.nix | 2 +- nix/pkgs/authentik/webui/node-composition.nix | 4 ++-- nix/pkgs/authentik/webui/node-packages.nix | 12 ++++-------- 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/nix/pkgs/authentik/docs/default.nix b/nix/pkgs/authentik/docs/default.nix index 9775e3f126..cc7eae9e13 100644 --- a/nix/pkgs/authentik/docs/default.nix +++ b/nix/pkgs/authentik/docs/default.nix @@ -1,7 +1,7 @@ { pkgs, src, version, ... }: let - nodeComposition = import ./node-composition.nix { inherit pkgs; }; + nodeComposition = import ./node-composition.nix { inherit pkgs src; }; in pkgs.runCommand "authentik-docs-${version}" { inherit src; diff --git a/nix/pkgs/authentik/docs/node-composition.nix b/nix/pkgs/authentik/docs/node-composition.nix index ca76a98f5a..53f0529d26 100644 --- a/nix/pkgs/authentik/docs/node-composition.nix +++ b/nix/pkgs/authentik/docs/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x", src}: let nodeEnv = import ./node-env.nix { @@ -13,5 +13,5 @@ let in import ./node-packages.nix { inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; + inherit nodeEnv src; } diff --git a/nix/pkgs/authentik/docs/node-packages.nix b/nix/pkgs/authentik/docs/node-packages.nix index 143fe25363..1ddd41ea0e 100644 --- a/nix/pkgs/authentik/docs/node-packages.nix +++ b/nix/pkgs/authentik/docs/node-packages.nix @@ -1,6 +1,6 @@ # 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 sources = { @@ -9630,7 +9630,7 @@ let name = "authentik-docs"; packageName = "authentik-docs"; version = "0.0.0"; - src = ../../../../../../../nix/store/7f906jj83fagr7qli5jx4xq55zqwa7dc-source/website; + src = "${src}/website"; dependencies = [ sources."@algolia/autocomplete-core-1.5.2" sources."@algolia/autocomplete-preset-algolia-1.5.2" @@ -11058,13 +11058,9 @@ in nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { src = stdenv.mkDerivation { name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; + inherit (args) src; dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; + installPhase = "mkdir -p $out; cp -r ./package.json ./package-lock.json $out;"; }; }); } diff --git a/nix/pkgs/authentik/webui/default.nix b/nix/pkgs/authentik/webui/default.nix index 21505ca5e9..68e45b58a4 100644 --- a/nix/pkgs/authentik/webui/default.nix +++ b/nix/pkgs/authentik/webui/default.nix @@ -1,7 +1,7 @@ { pkgs, src, version, ... }: let - nodeComposition = import ./node-composition.nix { inherit pkgs; }; + nodeComposition = import ./node-composition.nix { inherit pkgs src; }; in pkgs.runCommand "authentik-webui-${version}" { inherit src; diff --git a/nix/pkgs/authentik/webui/node-composition.nix b/nix/pkgs/authentik/webui/node-composition.nix index ca76a98f5a..53f0529d26 100644 --- a/nix/pkgs/authentik/webui/node-composition.nix +++ b/nix/pkgs/authentik/webui/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x", src}: let nodeEnv = import ./node-env.nix { @@ -13,5 +13,5 @@ let in import ./node-packages.nix { inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; + inherit nodeEnv src; } diff --git a/nix/pkgs/authentik/webui/node-packages.nix b/nix/pkgs/authentik/webui/node-packages.nix index b17656ceef..098a3ad49d 100644 --- a/nix/pkgs/authentik/webui/node-packages.nix +++ b/nix/pkgs/authentik/webui/node-packages.nix @@ -1,6 +1,6 @@ # 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 sources = { @@ -6372,7 +6372,7 @@ let name = "authentik-web"; packageName = "authentik-web"; version = "0.0.0"; - src = ../../../../../../../nix/store/7f906jj83fagr7qli5jx4xq55zqwa7dc-source/web; + src = "${src}/web"; dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@apitools/openapi-parser-0.0.24" @@ -7472,13 +7472,9 @@ in nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { src = stdenv.mkDerivation { name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; + inherit (args) src; dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; + installPhase = "mkdir -p $out; cp -r ./package.json ./package-lock.json $out;"; }; }); }