Bump sdep0 version #57

Merged
steveej merged 3 commits from pr/bump into master 2020-09-28 19:59:48 +00:00
3 changed files with 44 additions and 6 deletions

View file

@ -144,6 +144,43 @@ update-this-device rebuild-mode='switch':
git commit -v ${outfile} -m "nix/os/devices/$(hostname -s): bump versions"
# Rebuild an offline system
rebuild-disk device:
#!/usr/bin/env bash
set -xe
just -v disk-mount {{device}}
just -v disk-install {{device}}
just -v disk-umount {{device}}
# Re-render the versions of the given offline system and reinstall it in offline-mode
update-disk dir:
#!/usr/bin/env bash
set -exuo pipefail
dir={{dir}}
template={{dir}}/versions.tmpl.nix
outfile={{dir}}/versions.nix
if ! test -e ${template}; then
template="$(just _DEFAULT_VERSION_TMPL)"
fi
esh -o ${outfile} ${template}
if ! test "$(git diff ${outfile})"; then
echo Already on latest versions
exit 0
fi
export SYSREBUILD_LOG=.{{dir}}_sysrebuild.log
just -v rebuild-disk {{dir}} || {
echo ERROR: Update of {{dir}} failed, reverting ${outfile}...
exit 1
}
git commit -v ${outfile} -m "${dir}: bump versions"
# Iterate on a qtile config by running it inside Xephyr. (un-/grab the mouse with Ctrl + Shift-L)
hm-iterate-qtile:
#!/usr/bin/env bash

View file

@ -131,6 +131,7 @@ in {
aspellDicts.en
aspellDicts.de
skype
unstablepkgs.jitsi-meet-electron
zoom-us # broken as of 2019-10-30
bluejeans-gui
thunderbird

View file

@ -1,20 +1,20 @@
{
channelsNixosStable = {
ref = "nixos-19.09";
rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61";
ref = "nixos-20.03";
rev = "5659cb448e9b615d642c5fe52779c2223e72f7eb";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "41d921292e922a6cd1aba64259341c244d4c2cc7";
rev = "daaa0e33505082716beb52efefe3064f0332b521";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "a6934e36534f8a87a78f877eee65c08fa9867ba5";
rev = "55dc3b76f0ca1dd62d158b92a637fe484df5227d";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "master";
rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74";
ref = "release-20.03";
rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
};
}