There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/lxc/versions.
These checks were done:
- built on NixOS
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-attach passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-autostart passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-cgroup passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-checkpoint passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-copy passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-config passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-console passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-create passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-destroy passed the binary check.
- Warning: no invocation of /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-device had a zero exit code or showed the expected version
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-execute passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-freeze passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-info passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-ls passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-monitor passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-snapshot passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-start passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-stop passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-top passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-unfreeze passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-unshare passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-usernsexec passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-wait passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-checkconfig passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-update-config passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/init.lxc passed the binary check.
- 25 of 26 passed binary check by having a zero exit code.
- 20 of 26 passed binary check by having the new version present in output.
- found 3.0.1 with grep in /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1
- directory tree listing: https://gist.github.com/99239516868c9c02f18f88c0399aa8f1
- du listing: https://gist.github.com/60d07821cb31145506d2cba9745bbe7d
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/lxc/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-attach -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-attach --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-attach --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-autostart -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-autostart --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-autostart --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-cgroup -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-cgroup --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-cgroup --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkpoint -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkpoint --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkpoint --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-copy -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-copy --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-copy --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-config -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-config --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-console -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-console --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-console --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-create -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-create --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-create --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-destroy -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-destroy --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-destroy --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-execute -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-execute --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-execute --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-freeze -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-freeze --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-freeze --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-info -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-info --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-info --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-ls -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-ls --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-ls help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-ls --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-monitor -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-monitor --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-monitor --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-snapshot -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-snapshot --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-snapshot --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-start -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-start --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-start --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-stop -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-stop --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-stop --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-top -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-top --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-top --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unfreeze -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unfreeze --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unfreeze --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unshare -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unshare --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-unshare help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-usernsexec -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-wait -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-wait --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-wait --version’ and found version 3.0.0
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkconfig -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkconfig --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-checkconfig help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-update-config -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/lxc-update-config --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/init.lxc -h’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/init.lxc --help’ got 0 exit code
- ran ‘/nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0/bin/init.lxc --version’ and found version 3.0.0
- found 3.0.0 with grep in /nix/store/mvaxvwlslyaiksjrwcm2rmmnnf8z02w3-lxc-3.0.0
- directory tree listing: https://gist.github.com/a0534e4d403fd56527c3c04558911af3
This issue doesn't necessarily have to do with glibc 2.26 and it could
have been fixed if we'd replace -Werror with -Wall.
The error in question was:
storage/overlay.c:808:13: error: 'dirlen' may be used uninitialized in
this function [-Werror=maybe-uninitialized]
After looking at the code in overlay.c it indeed might use dirlen
unitialized.
Unrelated to the glibc upgrade which brought the problem to the surface,
this also has been fixed upstream at lxc/lxc@180c477a32.
The reason however, that led to the upstream fix was a segfault which
has been reported at lxc/lxc#1802.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @wkennington, @globin, @fpletz
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
This reverts commit 5d804566df.
This was an error on my part. I had the commit sitting on my local master
and pulled upstream to rebase my commit before pushing. I didn't notice
there was a commit bumping lxc and the auto-merge on the rebase.
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
Do not try to install init script.
And do not make any assumptions about the distribution.
The latter is important when Nix store in not a part of NixOS.
Closes #11729.
