Branch: refs/heads/nixpart
Home: https://github.com/NixOS/nixpkgs
Commit: 0f6f3a961e701965f10175c539f743fcace7392f
https://github.com/NixOS/nixpkgs/commit/0f6f3a961e701965f10175c539f743fcace7392f
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/modules/config/swap.nix
M nixos/modules/tasks/filesystems.nix
Log Message:
-----------
nixos: Add storage opt to fileSystems/swapDevices
References a partition, disk, volume or whatever you like instead of
using a device path or label. Creating those storage devices is done by
nixpart and we can infer the right labels and/or poths from the device
tree.
I've added those hooks here, because duplicating things such as fsType,
label, options or mountPoint in the storage configuration look kinda
pointless to me.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: f0f7869c74c71c2fdc76a9f3658ffe689a81ecdf
https://github.com/NixOS/nixpkgs/commit/f0f7869c74c71c2fdc76a9f3658ffe689a81ecdf
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/tasks/storage.nix
Log Message:
-----------
nixos: Add storage module for nixpart
This is not the final version, because I'm not yet sure whether we want
BTRFS as a special option here. Also, we don't check types properly yet.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 9efd3013c2babec2fb03e3ffdfef98cac31ae787
https://github.com/NixOS/nixpkgs/commit/9efd3013c2babec2fb03e3ffdfef98cac31ae787
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/modules/tasks/storage.nix
Log Message:
-----------
nixos/storage: Fix missing volgroupType stub
All of the types are just stubs right now, but I actually forgot
volgroupType, as I didn't do tests of LVM in nixpart so far yet.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: ea8ae6a822ffbde4cde66e8fabc4487e750b3d9e
https://github.com/NixOS/nixpkgs/commit/ea8ae6a822ffbde4cde66e8fabc4487e750b3d9e
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/tests/partition.nix
Log Message:
-----------
nixos/test/partition: Rewrite for nixpart 1.0
Currently, this is still WIP and subject to change, but it helps to see
whether our storage configuration options actually work out the way we
want.
Still needs a lot of cleanup, especially regarding the -m option, where
I'm not sure whether we should do it with nixpart or write our own
lightweight solution to be built into NixOS.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: c4b8a02e412d55466ea41324779625a69fa14a98
https://github.com/NixOS/nixpkgs/commit/c4b8a02e412d55466ea41324779625a69fa14a98
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/release.nix
R nixos/tests/partition.nix
A nixos/tests/storage.nix
Log Message:
-----------
nixos/tests: Enable "partition" as "storage"
Renames the test to closer match the NixOS module attribute and put it
into release.nix. Of course, those tests still fail, because nixpart is
still WIP and I haven't pushed the first version yet.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 4a1ac119109475b8d8c16da5ec1c2fbe1c0dc74e
https://github.com/NixOS/nixpkgs/commit/4a1ac119109475b8d8c16da5ec1c2fbe1c0dc74e
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/tests/storage.nix
Log Message:
-----------
nixos/test/storage: Fix reference to kickstart
We have renamed the function to nixpart() already, so let's make sure we
rename it accordingly.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d98b8468ea5b60cc49a15dd4ede028d3b11bc7ed
https://github.com/NixOS/nixpkgs/commit/d98b8468ea5b60cc49a15dd4ede028d3b11bc7ed
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/tests/storage.nix
Log Message:
-----------
nixos/tests/storage: Pass storage config as XML
We're internally calling nix-instantiate to get the required options
from the configuration, so let's pass it through an option that skips
this step.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d4f6c45f9da97fa45e26c60947fcd2147a40b2c8
https://github.com/NixOS/nixpkgs/commit/d4f6c45f9da97fa45e26c60947fcd2147a40b2c8
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M nixos/tests/storage.nix
Log Message:
-----------
tests/storage: Don't import <nixpkgs>
Let's use relative paths instead, because the version in <nixpkgs>
isn't necessarily the same as the current nixpkgs tree.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: ecb98b9d4a2ec21c0f7336374c8e513ea5bb842f
https://github.com/NixOS/nixpkgs/commit/ecb98b9d4a2ec21c0f7336374c8e513ea5bb842f
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M pkgs/os-specific/linux/libselinux/default.nix
Log Message:
-----------
libselinux: Make easier to build against Python 3
If we now use something like this:
pkgs.libselinux.override {
enablePython = true;
python = pkgs.python3;
}
... we now no longer will get the following error:
selinuxswig_wrap.c:143:21: fatal error: Python.h: No such file or directory
This happens because the Makefile is using the Python interpreter to get
the right library dir for Python:
PYTHONLIBDIR ?= $(shell $(PYTHON) -c "
from distutils.sysconfig import *;
print(get_python_lib(1))
")
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: e4a5fa0c53733e8dc9a11069faab9a2a77dd6602
https://github.com/NixOS/nixpkgs/commit/e4a5fa0c53733e8dc9a11069faab9a2a77dd6602
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
A pkgs/os-specific/linux/mpathconf/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
mpathconf: init at 0.4.9.83
This is basically multipath-tools patched into oblivion so that it's
resulting into a "mpathconf" script.
Although the patches apply to a lot more than just mpathconf and its
manpage, we use filterdiff to only apply all the patches that apply to
either mpathconf or mpathconf.[0-9]* so that we don't need to have the
original source of multipath-tools.
The reason I'm packaging this is that it's needed for libblockdev to
configure multipath devices.
As the description says, it's for editing /etc/multipath.conf so in the
long run let's see whether we actually need this if we can patch
libblockdev so it's not relying on a global multipath.conf at runtime.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 76ee7db7db38f30e7e0da3762c33e842edecb08a
https://github.com/NixOS/nixpkgs/commit/76ee7db7db38f30e7e0da3762c33e842edecb08a
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M pkgs/top-level/python-packages.nix
Log Message:
-----------
python/pocketlint: init at 0.13
This is a package that is required for running common tests against
projects from RedHat/Fedora, for example libbytesize.
I'm removing nix_run_setup.py before the check phase because that files
triggers a few pylint warnings and in turn causes the tests to fail.
Note that I don't use rm -f here to make sure the build fails once we no
longer need the nix_run_setup.py file so we can remove the reference
from the pocketlint as well.
Tested by building against Python 3.3, 3.4, 3.5 and 3.6.
Building against Python 3.6 has failed because of a test failure in
pylint, so it's only a transient failure.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: f59b1f6dd08418b6b89db3c9425c6fbd1278c84b
https://github.com/NixOS/nixpkgs/commit/f59b1f6dd08418b6b89db3c9425c6fbd1278c84b
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
A pkgs/development/libraries/libbytesize/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
libbytesize: init at 0.8
This is needed for libblockdev, one of its implicit dependencies.
In order to successfully build the docs, we needed to pass
XML_CATALOG_FILES so that xsltproc (called by gtkdoc-mkhtml) is able to
find them.
The package only works with Python 3, so I'm explicitly depending on
python3Packages.
Tested by building against i686-linux and x86_64-linux, which is why I
set platforms to only Linux (don't have anything else to test on).
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 63c521dfc073fb1919c9900a76ba36907329d898
https://github.com/NixOS/nixpkgs/commit/63c521dfc073fb1919c9900a76ba36907329d898
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
A pkgs/tools/misc/parted/add-libparted-fs-resize.pc.patch
M pkgs/tools/misc/parted/default.nix
Log Message:
-----------
parted: Add pkgconfig file for libparted-fs-resize
The patch is from Fedora:
http://pkgs.fedoraproject.org/cgit/rpms/parted.git/tree/0025-Add-libparted-fs-resize.pc.patch
It adds the pkgconfig file via configure.ac and Makefile.am, so we need
to use autoreconfHook and pkgconfig as well. The latter is needed so
that PKG_CHECK_MODULES macros are properly replaced in the resulting
configure script.
Built with success on i686-linux and x86_64-linux.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d910d2932ae3c97f974d83eea69a236a72315b5c
https://github.com/NixOS/nixpkgs/commit/d910d2932ae3c97f974d83eea69a236a72315b5c
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
A pkgs/development/libraries/volume-key/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
volume_key: init at 0.3.9
One of the requirements of libblockdev.
I'm using "python" without specifying an explicit Python version, so
that it's easy to override the Python version via something like this:
volume_key.override { inherit (python3Packages) python; }
Tested by building against i686-linux and x86_64-linux with Python 2.7
and Python 3.5.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: b3b03e57b19e5eb3a0fcd8176613bffde3012a62
https://github.com/NixOS/nixpkgs/commit/b3b03e57b19e5eb3a0fcd8176613bffde3012a62
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
A pkgs/development/libraries/libblockdev/bin-paths.patch
A pkgs/development/libraries/libblockdev/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
libblockdev: init at 2.1
Needed for the current version of blivet.
This library does a lot of calls to external binaries, so we need to
patch in a lot of paths (bin-paths.patch).
The checkPhase currently only checks whether the paths to these binaries
are correct but doesn't run the real tests, which require root
permissions.
We also depend only on Python 3.x, because Python 2.x support seems
broken at the moment and it really doesn't make sense to support it via
patching on our side while it's eventually becoming obsolete.
Other than the default output there is also a "tests" output which is
going to be used by the upcoming NixOS VM test to run the libblockdev
tests within a VM.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 4d35d75fee57ddae684608096d10ed85b6c4876d
https://github.com/NixOS/nixpkgs/commit/4d35d75fee57ddae684608096d10ed85b6c4876d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M pkgs/tools/misc/parted/default.nix
A pkgs/tools/misc/parted/fix-fat16-resize-crash.patch
Log Message:
-----------
parted: Add patch to fix FAT16 resize
Patch is originally from:
https://bug735669.bugzilla-attachments.gnome.org/attachment.cgi?id=289405
It's part of the following bug report:
https://bugzilla.gnome.org/show_bug.cgi?id=735669
I stumbled on this while running the libblockdev tests. Unfortunately we
haven't seen a new release of parted yet, so I'll add this patch for
now.
Tested by building against i686-linux and x86_64-linux.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 633f8c3f446c8378d92cd85cc18b7f01e6049c5c
https://github.com/NixOS/nixpkgs/commit/633f8c3f446c8378d92cd85cc18b7f01e6049c5c
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M pkgs/development/libraries/libblockdev/default.nix
Log Message:
-----------
libblockdev: Propagate six, pygobject3 and GI
The six library is a dependency of the library, so add it to the
propagatedBuildInputs.
In addition, pygobject3 and gobjectIntrospection need to be propagated
as well if we want to use this library from within Python, which is its
primary use-case.
If we don't want this propagation, we could add a flag "withPython" or
something similar so that the Python-specific parts are bound to a
condition. Right now however, the only package which is going to use
libblockdev is blivet.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 57625138363e2f07d84e39ca27ebb10ab5dd82fc
https://github.com/NixOS/nixpkgs/commit/57625138363e2f07d84e39ca27ebb10ab5dd82fc
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths:
M pkgs/os-specific/linux/lvm2/default.nix
Log Message:
-----------
lvm2: 2.02.140 -> 2.02.168
The main reason I'm updating this is because the libblockdev tests
assume that lvm has proper default cache backend support, which only was
added in recent versions.
Upstream changelog can be found at:
https://git.fedorahosted.org/cgit/lvm2.git/tree/WHATS_NEW?h=v2_02_168
Tested against the NixOS installer test (tests.installer.lvm).
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @7c6f434c
Commit: 02dbe226eef533b66ecd2bbf1944396e06dc54c7
https://github.com/NixOS/nixpkgs/commit/02dbe226eef533b66ecd2bbf1944396e06dc54c7
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/os-specific/linux/lvm2/default.nix
R pkgs/os-specific/linux/lvm2/purity.patch
Log Message:
-----------
lvm2: Clean up package expression
First of all the purity.patch is no longer referenced, so instead of
keeping it rotting around in the source tree, let's remove it. We can
still bring it back if we really need it.
Next, let's move version attribute to the derivation attributes, because
this is what we adopted as a standard for other packages. Plus I
couldn't find any package within the source tree where this is
referenced.
The systemd generator and unit files are now installed via the make
files provided by the upstream package. This also means that the name of
"blk_availability_systemd_red_hat.service" now is
"blk-availability.service" and resides in $out/lib/systemd/system
instead of $out/etc/systemd/system. Again, I haven't found anything that
references either of these paths.
We now also install the standard lvm config files in $out/etc/lvm,
although lvm does not search these paths by default. We might want to
fix this later.
Tested against the tests.installer.lvm NixOS VM test.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @7c6f434c
Commit: fc76501a66758e491aad30985560a679d003263d
https://github.com/NixOS/nixpkgs/commit/fc76501a66758e491aad30985560a679d003263d
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/os-specific/linux/lvm2/default.nix
Log Message:
-----------
lvm2: Set a default fallback profile dir
For example the following fails on NixOS:
lvcreate --profile thin-performance ...
It tries to look for a thin-performance.profile file in
/etc/lvm/profile, which by default doesn't exist.
So in order to make those profiles work we now set a default profile
directory which is used if lvm doesn't have a configuration file.
Tested against the tests.installer.lvm NixOS VM test.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @7c6f434c
Commit: 3e79944c9fbc8fe22e6132aa677de4f16d64351b
https://github.com/NixOS/nixpkgs/commit/3e79944c9fbc8fe22e6132aa677de4f16d64351b
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/os-specific/linux/lvm2/default.nix
Log Message:
-----------
lvm2: Add an option to enable thin provisioning
This is going to be used for libblockdev. I'm a bit hesitant to enable
this by default though, to make sure we don't unnecessarily increase the
closure size of lvm2 (especially if it comes to the initrd, this could
be quite dangerous).
Tested against the tests.installer.lvm NixOS VM test even though it
shouldn't affect the result.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 74adc1ee5fb97457a47a175e0c1bf99be28fc090
https://github.com/NixOS/nixpkgs/commit/74adc1ee5fb97457a47a175e0c1bf99be28fc090
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/development/libraries/libblockdev/default.nix
Log Message:
-----------
libblockdev: Use lvm2 with thin provisioning
While it probably doesn't make sense to include lvm2 with enabled thin
provisioning to the initrd it certainly makes sense for libblockdev and
in turn for nixpart.
It remains to be seen whether we'd need to add this to a generated NixOS
configuration once someone actually wants to use it with rootfs volumes
but for now this is enough to let libblockdev's LVM tests pass.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: f26b8d8f704e904bae1c3e0a304789205bf97fc2
https://github.com/NixOS/nixpkgs/commit/f26b8d8f704e904bae1c3e0a304789205bf97fc2
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/development/libraries/libblockdev/default.nix
A pkgs/development/libraries/libblockdev/tests.patch
Log Message:
-----------
libblockdev: Skip tests using fake paths/utils
These tests are irrelevant on Nix(OS) because we ship libblockdev with
all the binary paths directly built in (bin-paths.patch and "binPaths"
attribute), so there is no way to actually fake these utilities except
by rebuilding the package.
Apart from that the tests try to recompile libblockdev on-the-fly to
check whether plugin loading works correctly. This is also a non-issue
with Nix, because *all* plugins are always available.
So the tests.patch skips all of these tests involving these non-issues.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 96f98dd47d9d11f34e64ca464d1f2600515d22c6
https://github.com/NixOS/nixpkgs/commit/96f98dd47d9d11f34e64ca464d1f2600515d22c6
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/tools/misc/parted/default.nix
A pkgs/tools/misc/parted/fix-determining-sector-size.patch
Log Message:
-----------
parted: Add patch to correctly get sector size
Once again a patch from Fedora:
http://pkgs.fedoraproject.org/cgit/rpms/parted.git/tree/0031-Use-BLKSSZGET-to-get-device-sector-size-in-_device_p.patch
Submitted upstream at:
http://lists.alioth.debian.org/pipermail/parted-devel/2016-March/004817.html
This fixes the remaining failing tests for libblockdev.
Tested by building against i686-linux and x86_64-linux.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 8fcd2ed526349f4354959c36d893eeee8285e2e1
https://github.com/NixOS/nixpkgs/commit/8fcd2ed526349f4354959c36d893eeee8285e2e1
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M nixos/release.nix
M nixos/tests/blivet.nix
Log Message:
-----------
nixos/tests/blivet: Add libblockdev subtest
This includes a lot of cruft that has accumulated during my previous
tries to get the tests working. After several tries (several revisions
of libblockdev and blivet) now the libblockdev tests succeed so we can
finally move over to get blivet working.
Right now the blivet subtest is commented out entirely because it will
fail to evaluate. First we need to refactor blivet and its tests and
then we need to refactor the whole NixOS test with both sutests so
they're as DRY as possible.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: d99ceaeb9eb649bccce6fe21037fd7c0c2fc006f
https://github.com/NixOS/nixpkgs/commit/d99ceaeb9eb649bccce6fe21037fd7c0c2fc006f
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-12-25 (Sun, 25 Dec 2016)
Changed paths:
M pkgs/top-level/python-packages.nix
Log Message:
-----------
python/pyudev: 0.16.1 -> 0.21.0
Upstream changes are a bit longer, see:
https://github.com/pyudev/pyudev/blob/v0.21.0/CHANGES.rst
While doCheck is implicitly true, the tests aren't actually hooked into
setup.py but need to be run via py.test.
I'm not running them on purpose because pyudev's tests assume they're on
a full-featured (GNU/)Linux system and thus the majority of the tests
fail.
Tested against Python 2.7, 3.4, 3.5 and 3.6.
Note that Python 3.3 doesn't work because the package requires the enum
module, which is only available since Python 3.4 so I've disabled
support for Python 3.3 for pyudev.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixpkgs/compare/8c3790b0de97...d99ceaeb9eb6_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
