mirror of
https://github.com/nix-community/disko.git
synced 2024-09-11 06:25:33 +03:00
disko: get rid of impure imports
This is a backwards-incompatible change but it allows to pin nixpkgs, which is desirable especially in professional environments where reproduciblity is important.
This commit is contained in:
parent
2fc06462ce
commit
20bfa32750
@ -36,16 +36,16 @@ This is how your iso configuation may look like
|
||||
|
||||
/etc/nixos/configuration.nix
|
||||
```nix
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, modulesPath, ... }:
|
||||
let
|
||||
disko = (builtins.fetchGit {
|
||||
disko = builtins.fetchGit {
|
||||
url = https://cgit.lassul.us/disko/;
|
||||
rev = "88f56a0b644dd7bfa8438409bea5377adef6aef4";
|
||||
}) + "/lib";
|
||||
};
|
||||
cfg = builtins.fromJSON ./tsp-disk.json;
|
||||
in {
|
||||
imports = [
|
||||
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
|
||||
(modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
|
||||
];
|
||||
environment.systemPackages = with pkgs;[
|
||||
(pkgs.writeScriptBin "tsp-create" (disko.create cfg))
|
||||
|
@ -1,3 +1,5 @@
|
||||
{
|
||||
inherit (import ./lib) config create mount;
|
||||
{ lib ? (import <nixpkgs> {}).lib }: {
|
||||
inherit (import ./lib {
|
||||
inherit lib;
|
||||
}) config create mount;
|
||||
}
|
||||
|
@ -1,6 +1,10 @@
|
||||
# usage: nix-instantiate --eval --json --strict example | jq -r .
|
||||
|
||||
with import ../lib;
|
||||
let
|
||||
# TODO: get rid of NIX_PATH dependency here
|
||||
pkgs = import <nixpkgs> {};
|
||||
in
|
||||
with import ../lib { inherit (pkgs) lib;};
|
||||
|
||||
{
|
||||
config = config (import ./config.nix);
|
||||
|
@ -1,4 +1,5 @@
|
||||
with import <nixpkgs/lib>;
|
||||
{ lib }:
|
||||
with lib;
|
||||
with builtins;
|
||||
|
||||
let {
|
||||
@ -130,5 +131,4 @@ let {
|
||||
|
||||
mount.table = q: x:
|
||||
foldl' recursiveUpdate {} (imap (index: mount-f (q // { inherit index; })) x.partitions);
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,12 @@
|
||||
import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, ... }: let
|
||||
|
||||
{ makeTest ? import <nixpkgs/nixos/tests/make-test-python.nix>
|
||||
, pkgs ? (import <nixpkgs> {})
|
||||
}:
|
||||
let
|
||||
makeTest' = args:
|
||||
makeTest args {
|
||||
inherit pkgs;
|
||||
inherit (pkgs) system;
|
||||
};
|
||||
disko-config = {
|
||||
type = "devices";
|
||||
content = {
|
||||
@ -78,28 +85,28 @@ import <nixpkgs/nixos/tests/make-test-python.nix> ({ pkgs, ... }: let
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
in makeTest' {
|
||||
name = "disko";
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
<nixpkgs/nixos/modules/profiles/installation-device.nix>
|
||||
<nixpkgs/nixos/modules/profiles/base.nix>
|
||||
(modulesPath + "/profiles/installation-device.nix")
|
||||
(modulesPath + "/profiles/base.nix")
|
||||
];
|
||||
|
||||
# speed-up eval
|
||||
documentation.enable = false;
|
||||
|
||||
virtualisation.emptyDiskImages = [ 512 ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.succeed("echo 'secret' > /tmp/secret.key");
|
||||
machine.succeed("${pkgs.writeScript "create" ((import ../lib).create disko-config)}");
|
||||
machine.succeed("${pkgs.writeScript "mount" ((import ../lib).mount disko-config)}");
|
||||
machine.succeed("test -b /dev/mapper/pool-raw");
|
||||
'';
|
||||
|
||||
})
|
||||
testScript = ''
|
||||
machine.succeed("echo 'secret' > /tmp/secret.key");
|
||||
machine.succeed("${pkgs.writeScript "create" ((pkgs.callPackage ../. {}).create disko-config)}");
|
||||
machine.succeed("${pkgs.writeScript "mount" ((pkgs.callPackage ../. {}).mount disko-config)}");
|
||||
machine.succeed("test -b /dev/mapper/pool-raw");
|
||||
'';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user