technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 08:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rm: fix nixosPath

Browse source 
nixosPath would get reified in the nix store as /nix/store/<hash>-nixos
which breakes any referenced from within ./nixpkgs/nixos to ../lib or
../pkgs
This commit is contained in:
David Arnold 2021-05-28 17:39:22 -05:00
parent 8f9729870f
commit e575c23570
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kubenix.nix
View file

@ -10,7 +10,6 @@ let
defaultSpecialArgs = { defaultSpecialArgs = {
inherit kubenix; inherit kubenix;
nixosPath = pkgs.path + "/nixos";
}; };
# evalModules with same interface as lib.evalModules and kubenix as # evalModules with same interface as lib.evalModules and kubenix as

2
src/modules/testing/default.nix
View file

@ -1,4 +1,4 @@
{ nixosPath, config, pkgs, lib, kubenix, ... }: { config, pkgs, lib, kubenix, ... }:
with lib; with lib;
let let

5
src/modules/testing/runtime/nixos-k8s.nix
View file

@ -1,7 +1,6 @@
# nixos-k8s implements nixos kubernetes testing runtime # nixos-k8s implements nixos kubernetes testing runtime
{ nixosPath { config
, config
, pkgs , pkgs
, lib , lib
, ... , ...
@ -74,7 +73,7 @@ let
''; '';
test = test =
with import "${nixosPath}/tests/kubernetes/base.nix" { inherit pkgs; inherit (pkgs) system; }; with import "${pkgs.path}/nixos/tests/kubernetes/base.nix" { inherit pkgs; inherit (pkgs) system; };
mkKubernetesSingleNodeTest { mkKubernetesSingleNodeTest {
inherit extraConfiguration; inherit extraConfiguration;
inherit (config.testing) name; inherit (config.testing) name;

4
tests/default.nix
View file

@ -2,8 +2,6 @@
, lib ? pkgs.lib , lib ? pkgs.lib
, kubenix ? (import ../. { }).default , kubenix ? (import ../. { }).default
, nixosPath ? toString <nixpkgs/nixos>
, k8sVersion ? "1.21" , k8sVersion ? "1.21"
, registryUrl ? throw "Registry url not defined" , registryUrl ? throw "Registry url not defined"
, throwError ? true # whether any testing error should throw an error , throwError ? true # whether any testing error should throw an error
@ -58,7 +56,7 @@ let
inherit pkgs; inherit pkgs;
}; };
specialArgs = { specialArgs = {
inherit kubenix nixosPath; inherit kubenix;
}; };
}).config; }).config;
in in