~sircmpwn/sr.ht-dev

sr.ht-docs: Hotfix nixos image builds v1 PROPOSED

Thanks!

To git.sr.ht:~sircmpwn/builds.sr.ht
   e5de6d3..606e2c7  master -> master
 * [new tag]         0.48.0 -> 0.48.0
Can you follow this up with a sr.ht-docs patch updating
compatibility.md? I'll be submitting a build to prepare the image
momentarily.
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~sircmpwn/sr.ht-dev/patches/8901/mbox | git am -3
Learn more about email & git

[PATCH builds.sr.ht 1/2] Hotfix nixos image builds Export this patch

Something changed in nix or in the virtual machine, and now the vm user
is empty when nix tries to read it. This is a temporary workaround. A
full rewrite of the image generation script will probably follow.
---
I found a nicer way to generate the image by using a function from the
official repos. I'll rewrite the image generator from scratch sometimes
in the following weeks (reeally busy now), so in the meantime here's an
hotfix.

 images/nixos/image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/nixos/image.nix b/images/nixos/image.nix
index d11b172..526bbe5 100644
--- a/images/nixos/image.nix
+++ b/images/nixos/image.nix
@@ -45,6 +45,7 @@ in pkgs.vmTools.runInLinuxVM (
       done
 
       storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+      export USER=root # temporary hotfix
       echo filling Nix store...
       mkdir -p /mnt/nix/store
       set -f
-- 
2.23.0
---
Just the usual upgrade

 images/nixos/19.09/functions | 1 +
 images/nixos/19.09/genimg    | 3 +++
 images/nixos/latest          | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 120000 images/nixos/19.09/functions
 create mode 100755 images/nixos/19.09/genimg

diff --git a/images/nixos/19.09/functions b/images/nixos/19.09/functions
new file mode 120000
index 0000000..c0b5bcc
--- /dev/null
+++ b/images/nixos/19.09/functions
@@ -0,0 +1 @@
+../functions
\ No newline at end of file
diff --git a/images/nixos/19.09/genimg b/images/nixos/19.09/genimg
new file mode 100755
index 0000000..2f57cd2
--- /dev/null
+++ b/images/nixos/19.09/genimg
@@ -0,0 +1,3 @@
+#!/bin/sh
+export release=19.09
+exec ../genimg "$@"
diff --git a/images/nixos/latest b/images/nixos/latest
index 360de63..ba19dc3 120000
--- a/images/nixos/latest
+++ b/images/nixos/latest
@@ -1 +1 @@
-19.03
\ No newline at end of file
+19.09
\ No newline at end of file
-- 
2.23.0

[PATCH sr.ht-docs] Update nixos/latest to 19.09 Export this patch

---
 builds.sr.ht/compatibility.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builds.sr.ht/compatibility.md b/builds.sr.ht/compatibility.md
index deb4cdd..a882091 100644
--- a/builds.sr.ht/compatibility.md
@@ -559,10 +559,10 @@ Maintainer: Francesco Gazzetta <fgaz@fgaz.me>
 <table class="table table-sm table-hover">
   <thead>
     <tr>
-      <th>NixOS 19.03</th>
+      <th>NixOS 19.09</th>
       <th colspan="3" style="font-weight: normal; text-align: center">
         <code>image: nixos/latest</code> <strong>or</strong>
-        <code>image: nixos/19.03</code>
+        <code>image: nixos/19.09</code>
       </th>
     </tr>
     <tr>
-- 
2.23.0
Thanks!

To git.sr.ht:~sircmpwn/sr.ht-docs
   340015a..1c6cf67  master -> master
View this thread in the archives