Branch: refs/heads/nixpart
Home: https://github.com/NixOS/nixpkgs
Commit: 567ce6863b219bf40292c9539b1616b3fbd8df65
https://github.com/NixOS/nixpkgs/commit/567ce6863b219bf40292c9539b1616b3fbd8df65
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths:
M nixos/modules/module-list.nix
R nixos/modules/tasks/storage.nix
A nixos/modules/tasks/storage/default.nix
Log Message:
-----------
nixos/storage: Move module into its own directory
We're going to break down various parts of the module into smaller
files, so that the main default.nix doesn't get cluttered up by
implementation details.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: cf912a178a948955927d8304c25d3e2654e3a632
https://github.com/NixOS/nixpkgs/commit/cf912a178a948955927d8304c25d3e2654e3a632
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
A nixos/modules/tasks/storage/lib.nix
Log Message:
-----------
storage: Move types and sizeUnits into new lib.nix
This should leave the default.nix with only option declarations and
without our custom types. The move of sizeUnits to lib.nix is currently
a bit of a workaround, but we're going to untangle that later.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 0b656c0c550836a2489114c6ff6047e32482600a
https://github.com/NixOS/nixpkgs/commit/0b656c0c550836a2489114c6ff6047e32482600a
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
A nixos/modules/tasks/storage/disk.nix
Log Message:
-----------
nixos/storage: Add options for matching disks
This is preliminary because this needs to be properly type-constrained
and with a fallback to the device name.
Also I'm not yet sure whether we should create match.script via the
NixOS module system or within nixpart.
But before deciding on this, the current implementation at least serves
the purpose of documentation. Even though quite a bit is subject to
change the documentation on the individual matchers will still largely
apply.
However what's is going to be changed is how we're going to handle the
"match" option. Do we want it to be an additional submodule or do we
want it to be like it is now?
With the current state however it's a bit ugly because on one side we
allow multiple matchers but on the other side we don't allow the same
matcher to apply more than once.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 04dad9e5d2848487642bfcfd7fa26a3ba8cb3c89
https://github.com/NixOS/nixpkgs/commit/04dad9e5d2848487642bfcfd7fa26a3ba8cb3c89
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
Log Message:
-----------
nixos/storage: Add documentation to storage.disk
We only had short descriptions for the options defined via deviceTypes
and thus we now also have a doc attribute that specifies a longer
description of the option.
This is needed in order for the user to know what's the default matching
method in case no particular matcher is specified.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d5bcbcd874e112439126f1a0aa8dcb668b9c6a5a
https://github.com/NixOS/nixpkgs/commit/d5bcbcd874e112439126f1a0aa8dcb668b9c6a5a
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
M nixos/modules/tasks/storage/disk.nix
Log Message:
-----------
nixos/storage/disk: Make .match a submodule
This has the advantage of making it easier to set a default value and
also makes documentation a bit more "in place", so that we don't need to
write documentation about matches in storage.disk but in
storage.disk.*.match instead.
The default value is now match.name = diskName, where diskName is the
name defined by storage.disk.NAME.
Of course, we still have the limitation that we can't set multiple
matchers of the same type, but we can implement that easily by adding
another option "matchers" or "matches" that takes a list of matcher
submodules.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 0fb96619694464cc26cfcdcdbbfb64d094ae8bf4
https://github.com/NixOS/nixpkgs/commit/0fb96619694464cc26cfcdcdbbfb64d094ae8bf4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
M nixos/modules/tasks/storage/disk.nix
Log Message:
-----------
nixos/storage/disk: Add apply function to script
Having this as ready to be instantiated derivation is better than doing
this within nixpart, because we can make sure that all dependencies we
need for that script are in place.
Note that I'm using ${pkgs.bash}/bin/bash instead of
${pkgs.stdenv.shell}, so that it's guaranteed that the documentation is
right even if stdenv.shell should change someday.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: dbfb050cbd0c8c7efba73c2572b80a4b42241b09
https://github.com/NixOS/nixpkgs/commit/dbfb050cbd0c8c7efba73c2572b80a4b42241b09
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
Log Message:
-----------
nixos/storage: Provide system.build.nixpart-spec
This is to make it easier to evaluate the config with only the storage
options returned as JSON, along with all the stuff already built like
for example match.script options for disks.
If we'd only nix-instantiate the config we'd only get the .drv for the
script which we'd need to realize in another step.
In addition to that, it also makes it easier to do more extensive
validation on the storage options and we also have a way to even return
an entirely different JSON structure to what we have set in the options,
even though we don't intend to do that.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 109f782cdf8929ab2209e0719320dd1745378b6a
https://github.com/NixOS/nixpkgs/commit/109f782cdf8929ab2209e0719320dd1745378b6a
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/modules/tasks/storage/default.nix
Log Message:
-----------
nixos/storage: Check assertions when building JSON
We want the evaluation to fail if one or more assertions arise in the
storage module. However, we don't want to raise unrelated assertions,
because these are clearly the job of system.build.toplevel and only are
relevant for a full system.
However, we still propagate the assertions down to config.assertions, so
that whenever a full system is built, the storage assertions get thrown
as well (if there are any).
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 5a3b198da869e31c20d5729be17353464785c33b
https://github.com/NixOS/nixpkgs/commit/5a3b198da869e31c20d5729be17353464785c33b
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M pkgs/development/python-modules/blivet/no-hawkey.patch
Log Message:
-----------
blivet: Simplify the no-hawkey.patch
Hawkey is normally used to get package versions and we have used
nix-store -qR to query the full dependency graph.
However, for just checking the versions for programs we have in $PATH it
should suffice to just traverse $PATH and run a regex on the package
name and version without walking the whole dependency graph.
I've used the latter only because we might have wrapped programs, but
after running the tests it turns out that we really don't need such an
overhead.
Also, it's quite a nuisance if we want to run tests in an isolated
environment where we don't have access to the store database (which
nix-store -q is trying to open).
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: cd8a05c2917e22525fe7c4305cb27214641bfd43
https://github.com/NixOS/nixpkgs/commit/cd8a05c2917e22525fe7c4305cb27214641bfd43
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M nixos/tests/storage.nix
Log Message:
-----------
nixos/tests/storage: Switch to using --json
The latest version of nixpart no longer needs XML nor do we now need to
gather the various option definitions from within the NixOS test but we
simply use config.system.build.nixpart-spec, which is the resulting JSON
file we need to pass to nixpart.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 4fbea844332e2df2c67ff55a0625c1e68148ba0e
https://github.com/NixOS/nixpkgs/commit/4fbea844332e2df2c67ff55a0625c1e68148ba0e
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M pkgs/tools/filesystems/nixpart/default.nix
Log Message:
-----------
nixpart: Update to latest master version
Adds support for JSON and drops XML support and thus brings nixpart in
par with our current storage module.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixpkgs/compare/ddc083d8729d...4fbea844332e_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
