From e1bbd03df6324936fb63e676f562e47e51b0a837 Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Mon, 17 Feb 2025 23:56:27 +0100 Subject: foo --- flake.lock | 8 ++++---- flake.nix | 2 +- server.nix | 66 +++++++++++++++++++++++++------------------------------------- 3 files changed, 32 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index e1d7304..019dbe7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711748091, - "narHash": "sha256-JjGxrXJyQoQTYv/kCNyq+a6AKPctvlbsEFojoj2OKoo=", + "lastModified": 1739203112, + "narHash": "sha256-ZzJKCz8lnE4CZvIhlVGrC/1pIfjz1HimOAk3Pe4ev1Q=", "owner": "malte-v", "repo": "nixpkgs", - "rev": "ef137b1e9b6af4ee876ebfb9f89c7a85f6a105a1", + "rev": "784f0cc1d9bff0aea7d52771223f68082da8dbe4", "type": "github" }, "original": { "owner": "malte-v", - "ref": "libguestfs-appliance-fix", + "ref": "raspi3", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 27a4a38..ef3a18c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:malte-v/nixpkgs/libguestfs-appliance-fix"; + nixpkgs.url = "github:malte-v/nixpkgs/raspi3"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, nixpkgs, flake-utils }: diff --git a/server.nix b/server.nix index 906e2c6..b0d4e61 100644 --- a/server.nix +++ b/server.nix @@ -1,13 +1,13 @@ -{ lib, fetchurl, writeText, libguestfs-with-appliance, pkgsCross, qemu +{ fetchurl, writeText, libguestfs-with-appliance, pkgsCross, qemu , runCommand, cpio, writeShellApplication, sshPassword, sshPort, httpPort }: let - updateName = "remarkable-ct-prototype-image-3.16.1.0-ferrari-public"; + updateName = "remarkable-production-memfault-image-3.14.1.9-rm2-public"; updateArchive = fetchurl { url = # TODO: this is not an official source. might be worth authenticating the updates "https://storage.googleapis.com/remarkable-versions/${updateName}.swu"; - hash = "sha256-cwx2qcvxZBX0wAprYKls8P+gthwJJQTceVIO+qdPm/w="; + hash = "sha256-8zlAGdv+w2KO7BruRQLQC9ivGSHtK82e36ASIeRF3zI="; }; xochitlConfig = writeText "xochitl.conf" '' @@ -36,24 +36,24 @@ let ExecStart=/usr/bin/xochitl --system Restart=always # required to make xochitl run - # Environment=LD_PRELOAD=/usr/lib/libfakefbdev.so # TODO uncomment? + Environment=LD_PRELOAD=/usr/lib/libfakefbdev.so [Install] WantedBy=multi-user.target ''; - fakefbdev = pkgsCross.aarch64-multiplatform.gcc11Stdenv.mkDerivation { + fakefbdev = pkgsCross.armv7l-hf-multiplatform.gcc11Stdenv.mkDerivation { name = "fakefbdev"; src = ./fakefbdev; installFlags = [ "DESTDIR=${placeholder "out"}" ]; }; - kernel = pkgsCross.aarch64-multiplatform.linux; + kernel = pkgsCross.armv7l-hf-multiplatform.linux_5_4; rootfsImage = runCommand "rm-rootfs.ext4" { nativeBuildInputs = [ cpio ]; } '' cpio -i --file ${updateArchive} - gzip -dc ${updateName}.ext4.verity.gz > $out + gzip -dc ${updateName}.ext4.gz > $out ''; diskImage = runCommand "rm-disk.qcow2" { @@ -64,17 +64,16 @@ let guestfish --rw --blocksize=512 --add $out <