ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity
Nix Packages collection
117,621 Commits 96 Branches 102 Tags 4.8 GiB
Nix 95.3%
Shell 2%
Python 1.5%
Perl 0.2%
Rust 0.2%
Other 0.3%
f4e742594d
Go to file
aszlig f4e742594d
nixos: Fix detection of btrfs root volume 
Regression introduced by 801c920e95.

Since then, the btrfsSimple subtest of the installer VM test fails with:

Btrfs did not return a path for the subvolume at /

The reason for this is that the output for "btrfs subvol show" has
changed between version 4.8.2 and 4.13.1.

For example the output of "btrfs subvol show /" in version 4.8.2 was:

/ is toplevel subvolume

In version 4.13.1, the output now is the following and thus the regular
expressions used in nixos-generate-config.pl and install-grub.pl now
match (which results in the error mentioned above):

/
        Name:                   <FS_TREE>
        UUID:                   -
        Parent UUID:            -
        Received UUID:          -
        Creation time:          -
        Subvolume ID:           5
        Generation:             287270
        Gen at creation:        0
        Parent ID:              0
        Top level ID:           0
        Flags:                  -
        Snapshot(s):

In order to fix this I've changed nixos-generate-config.pl and
install-grub.pl, because both use "btrfs subvol show" in a similar vein,
so the regex for parsing the output now doesn't match anymore whenever
the volume path is "/", which should result in the same behaviour as we
had with btrfs-progs version 4.8.2.

Tested against the btrfsSimple, btrfsSubvols and btrfsSubvolDefault
subtests of the installer VM test and they all succeed now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-10-11 04:30:52 +02:00
.github pr template: make values of platform field less ambiguous 2017-10-09 12:53:09 +02:00
doc Merge branch 'master' into staging 2017-09-27 20:59:52 +02:00
lib Merge pull request #30203 from andir/add-dnstracer 2017-10-07 22:11:22 +01:00
maintainers/scripts docs: 17.03 -> 17.09 2017-10-05 07:19:11 -08:00
nixos nixos: Fix detection of btrfs root volume 2017-10-11 04:30:52 +02:00
pkgs coq: 8.7+beta1 -> 8.7+beta2 2017-10-11 03:02:01 +02:00
.editorconfig Do not trim trailing whitespace in patch files 2017-01-12 23:44:26 +01:00
.gitignore kde5: consolidate packages into desktops/kde-5 2016-03-01 10:36:00 -06:00
.travis.yml travis: Add dummy environment variables as build labels 2017-08-14 23:33:10 +03:00
.version Impala makes packaging a life-long addiction 2017-08-30 23:13:56 +02:00
COPYING Time passing by 2017-01-01 21:35:52 +01:00
default.nix default.nix: Provide correct instructions how to upgrade Nix 2017-03-18 21:04:07 +02:00
README.md readme.md: reincarnate wiki (#30243) 2017-10-09 16:32:30 +01:00

README.md

logo

Build Status Code Triagers Badge

Nixpkgs is a collection of packages for the Nix package manager. It is periodically built and tested by the hydra build daemon as so-called channels. To get channel information via git, add nixpkgs-channels as a remote:

% git remote add channels git://github.com/NixOS/nixpkgs-channels.git

For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. nixos-17.09 for the latest release and nixos-unstable for the latest successful build of master:

% git remote update channels
% git rebase channels/nixos-17.09

For pull-requests, please rebase onto nixpkgs master.

NixOS linux distribution source code is located inside nixos/ folder.

Communication: