Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 355b69ebbb34f0a1aa90b6a680ff77766ab27160
https://github.com/NixOS/nixpkgs/commit/355b69ebbb34f0a1aa90b6a680ff77766ab27160
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/modules/virtualisation/ec2-data.nix
Log Message:
-----------
ec2-data.nix: Remove superfluous check
(cherry picked from commit 7338f5ff4651eaa22ea56eff8b6e9a22066b65ae)
Commit: 64e7656feb2a86055c38d33ef86fb6a2ca415607
https://github.com/NixOS/nixpkgs/commit/64e7656feb2a86055c38d33ef86fb6a2ca415607
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/modules/virtualisation/amazon-image.nix
Log Message:
-----------
Fix GRUB syntax in EC2 HVM images
There is no "root" command in GRUB 2, and it's not needed anyway. This
command delayed HVM boots for a few seconds.
(cherry picked from commit 640dff2918c7b3636226a9eb97bb76b6236124e3)
Commit: 7df65ef2d14e51cad42a60e584aa4213ace6e788
https://github.com/NixOS/nixpkgs/commit/7df65ef2d14e51cad42a60e584aa4213ace6e788
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/tests/ec2.nix
Log Message:
-----------
Fix the EC2 test
(cherry picked from commit 412477e914f851b1c8b2ff474f31e5d860791fd2)
Commit: 9f7d8f2b01f405706e3a707e3a04e4b0c17017bd
https://github.com/NixOS/nixpkgs/commit/9f7d8f2b01f405706e3a707e3a04e4b0c17017bd
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/release.nix
Log Message:
-----------
Disable the ec2-config test
"amazon-init.nix" is not included in the default AMIs because it
unconditionally runs a nixos-rebuild. Also, the test has never worked
(http://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.ec2-config).
(cherry picked from commit f596f0323f82eaaa819720fb5734a306e46b5541)
Commit: b5f8225c502b09b5f2938805d759d6c32c99c527
https://github.com/NixOS/nixpkgs/commit/b5f8225c502b09b5f2938805d759d6c32c99c527
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/lib/make-disk-image.nix
M nixos/modules/virtualisation/virtualbox-image.nix
Log Message:
-----------
Use make-disk-image.nix for VirtualBox images
(cherry picked from commit b3347287be60aebc723702b5b298f9738ce8481c)
Commit: 724cf98bdfac2b13fa2713ceb2e68014c1ec194a
https://github.com/NixOS/nixpkgs/commit/724cf98bdfac2b13fa2713ceb2e68014c1ec194a
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/lib/make-disk-image.nix
Log Message:
-----------
Fix Nix database in generated images
This prevents seeing lots of warnings about missing hashes/sizes in the
database when running "nix-store --verify --check-contents" for the
first time.
(cherry picked from commit 64aed5e78f270ad775ec7ea763de4866c3f3c3cc)
Commit: 4e18cdda7f5d4b2ffcd10e19d4a555e5299575e2
https://github.com/NixOS/nixpkgs/commit/4e18cdda7f5d4b2ffcd10e19d4a555e5299575e2
Author: Eelco Dolstra <[email protected]>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M nixos/modules/services/x11/display-managers/default.nix
Log Message:
-----------
Shut up a KDE warning when a user first logs in
It was complaining about not having write permission to
$HOME/.local/share/user-places.xbel (because .local/share didn't exist
yet).
(cherry picked from commit 1b728846a827bcba08ede7ef29d02227b3ab2c7f)
Compare: https://github.com/NixOS/nixpkgs/compare/7ef887a04c9b...4e18cdda7f5d_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
