Update: Haste-Compiler: 0.4.1 -> 0.4.2
Merge pull request #3927 from ts468/haste

Update: Haste-Compiler: 0.4.1 -> 0.4.2
zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux
Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
nixos/install-grub: Store path should be /nix/store not /nix
nixos/generate-config: Support detecting nested subvolumes
nixos/install-grub: Detect nested btrfs subvolumes
nixos/tests-installer: Add a test for btrfs default volumes and bind mounts
nixos/generate-config: Don't interpret btrfs subvols as bind mounts
nixos/installer-test: Use nested subvolumes for root to test detection
nixos/install-grub: Always copy kernels for different devices
nixos/install-grub: Only check for /nix to be the mountPoint for the store
nixos/generate-config: Only add store search path when kernels are not copied
Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"

This reverts commit 9deb7f8aae431ed7725cfaa13edf8645d19d91f2.
Revert "python-wrapper: fix wrapped argv[0] w/o sed, maybe"

This reverts commit a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569.
Override postFixup for urlwatch so it works somehwo
merge in ewemoa's zipalign fix with my updated build-tools

now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
androidsdk: Bump to version 23.02 and update all its plugins and conversion scripts
androidsdk: remove obsolete workaround
Merge pull request #3903 from wkennington/master.grub

Bring back grub update with fixes