Merge branch 'quickemu-project:master' into master

2025-08-01 22:56:04 +02:00 · 2025-08-01 22:56:04 +02:00 · fc30f3e277
parent 81254ada51 bd178bb4c3
commit fc30f3e277
7 changed files with 55 additions and 35 deletions
--- a/.github/workflows/flake-checker.yml
+++ b/.github/workflows/flake-checker.yml
@ -16,6 +16,6 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-      - uses: DeterminateSystems/nix-installer-action@v16
+      - uses: DeterminateSystems/nix-installer-action@v17
      - uses: DeterminateSystems/magic-nix-cache-action@v9
-      - uses: DeterminateSystems/flake-checker-action@v9
+      - uses: DeterminateSystems/flake-checker-action@v10
--- a/.github/workflows/flake-updater.yml
+++ b/.github/workflows/flake-updater.yml
@ -13,8 +13,8 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
-      - uses: DeterminateSystems/nix-installer-action@v16
+      - uses: DeterminateSystems/nix-installer-action@v17
      - uses: DeterminateSystems/magic-nix-cache-action@v9
-      - uses: DeterminateSystems/update-flake-lock@v24
+      - uses: DeterminateSystems/update-flake-lock@v25
        with:
          pr-title: "chore: update flake.lock"
--- a/.github/workflows/test-build-quickemu.yml
+++ b/.github/workflows/test-build-quickemu.yml
@ -53,7 +53,7 @@ jobs:
      - name: "Checkout 🥡"
        uses: "actions/checkout@v4"
      - name: "Install Nix ❄️"
-        uses: "DeterminateSystems/nix-installer-action@v16"
+        uses: "DeterminateSystems/nix-installer-action@v17"
      - name: "Enable Magic Nix Cache 🪄"
        uses: "DeterminateSystems/magic-nix-cache-action@v9"
      - name: "Build & Test .nix ❄️"
--- a/debian/control
+++ b/debian/control
@ -22,6 +22,7 @@ Depends:
 procps,
 python3-minimal,
 qemu-system (>= 6.0),
+ base-files (<< 13~) | qemu-system-modules-spice,
 socat,
 spice-client-gtk,
 swtpm,
--- a/flake.lock
+++ b/flake.lock
@ -16,12 +16,12 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744440957,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
-        "revCount": 716947,
+        "lastModified": 1749727998,
+        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
+        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
+        "revCount": 803882,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.716947%2Brev-26d499fc9f1d567283d5d56fcf367edd815dba1d/01962e50-af41-7ff9-8765-ebb3d39458ba/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.803882%2Brev-fd487183437963a59ba763c0cc4f27e3447dd6dd/019767cd-a737-7649-ab6d-467a58ba9f92/source.tar.gz"
      },
      "original": {
        "type": "tarball",
--- a/flake.nix
+++ b/flake.nix
@ -22,11 +22,11 @@
    schemas = flake-schemas.schemas;

    # Define overlays for each supported system
-    overlays = forEachSupportedSystem ({pkgs, system, ...}: {
+    overlays = {
      default = final: prev: {
        quickemu = final.callPackage ./package.nix { };
      };
-    });
+    };

    # Define packages for each supported system
    packages = forEachSupportedSystem ({pkgs, system, ...}: rec {
--- a/65
+++ b/65
@ -5,6 +5,9 @@
 # shellcheck disable=SC2317
 export LC_ALL=C

+# Detect host OS for checksum tool compatibility
+HOST_OS=$(uname -s)
+
 function cleanup() {
    if [ -n "$(jobs -p)" ]; then
        kill "$(jobs -p)" 2>/dev/null
@ -743,7 +746,7 @@ function editions_freebsd() {
 }

 function releases_freedos() {
-    echo 1.3 1.2
+    echo 1.4 1.3 1.2
 }

 function releases_garuda() {
@ -876,13 +879,13 @@ function releases_nitrux() {
 }

 function releases_nixos() {
-    # Lists unstable plus the two most recent releases
+    # Lists unstable plus the most recent release
    #shellcheck disable=SC2046
-    echo unstable $(web_pipe "https://nix-channels.s3.amazonaws.com/?delimiter=/" | grep -o -E 'nixos-[[:digit:]]+\.[[:digit:]]+' | cut -d- -f2 | sort -nru | head -n +2)
+    echo unstable $(web_pipe "https://nix-channels.s3.amazonaws.com/?delimiter=/" | grep -o -E 'nixos-[[:digit:]]+\.[[:digit:]]+' | cut -d- -f2 | sort -nru | head -n +1)
 }

 function editions_nixos() {
-    echo minimal plasma gnome
+    echo minimal graphical
 }

 function releases_nwg-shell() {
@ -897,7 +900,9 @@ function releases_openbsd() {

 function releases_openindiana() {
    #shellcheck disable=SC2046,SC2005
-    echo $(web_pipe "https://dlc.openindiana.org/isos/hipster/" | grep link | cut -d'/' -f 1 | cut -d '"' -f4 | sort -r | tail -n +2 | head -n 5)
+    #echo $(web_pipe "https://dlc.openindiana.org/isos/hipster/" | grep link | cut -d'/' -f 1 | cut -d '"' -f4 | sort -r | tail -n +2 | head -n 5)
+    echo $(web_pipe "https://dlc.openindiana.org/isos/hipster/" | grep 'href="./2' | cut -d'/' -f 2 | sort -r |  head -n 5)
+
 }

 function editions_openindiana() {
@ -1032,7 +1037,7 @@ function releases_solus() {

 function editions_solus() {
    #shellcheck disable=SC2046,SC2005
-    echo $(web_pipe_json "https://downloads.getsol.us/isos/$(releases_solus | tail -n1)/" | jq -r '.[].name | sub("Solus-(?<e>.*)-Release-.*"; "\(.e)")' | sort -u)
+    echo $(web_pipe_json "https://downloads.getsol.us/isos/$(IFS=' '; releases_solus | tail -n1)/" | jq -r '.[].name | select(endswith("iso")) | sub("Solus-(?<e>.*)-Release-.*"; "\(.e)")' | sort -u)
 }

 function releases_sparkylinux() {
@ -1190,6 +1195,17 @@ function check_hash() {
        *) echo "WARNING! Can't guess hash algorithm, not checking ${iso} hash."
            return;;
    esac
+
+    # Use GNU coreutils on macOS/Darwin (prefixed with 'g')
+    if [ "${HOST_OS}" = "Darwin" ]; then
+        case ${hash_algo} in
+            md5sum) hash_algo=gmd5sum;;
+            sha1sum) hash_algo=gsha1sum;;
+            sha256sum) hash_algo=gsha256sum;;
+            sha512sum) hash_algo=gsha512sum;;
+        esac
+    fi
+
    echo -n "Checking ${iso} with ${hash_algo}... "
    if ! echo "${hash} ${iso}" | ${hash_algo} --check --status; then
        echo "ERROR!"
@ -1859,21 +1875,28 @@ function get_fedora() {
    local URL=""
    local VARIANT=""
    case ${EDITION} in
-        Server|Kinoite|Onyx|Silverblue|Sericea|Workstation) VARIANT="${EDITION}";;
+        Server|Kinoite|Onyx|Silverblue|Sericea|Workstation|KDE) VARIANT="${EDITION}";;
        *) VARIANT="Spins";;
    esac
+    # Handle KDE as a proper edition from 42 but a spin prior to 42
+    # Stripping eventual _Beta suffix from the RELEASE variable in the check
+    if [[ "${VARIANT}" == "KDE" && "${RELEASE/_Beta/}" -lt 42 ]]; then
+        VARIANT="Spins"
+    fi
    # The naming of 41 Beta with a space is problematic so we replaced it with an underscore
    # but we need to convert it back to a space for the URL search in the JSON
    #shellcheck disable=SC2086
    # if RELEASE contains an underscore, replace it with a space
-     if [[ "${RELEASE}" == *"_"* ]]; then
+    if [[ "${RELEASE}" == *"_"* ]]; then
        RELEASE="${RELEASE/_/ }"
    fi



    # shellcheck disable=SC2086
-    JSON=$(web_pipe "https://getfedora.org/releases.json" | jq '.[] | select(.variant=="'${VARIANT}'" and .subvariant=="'"${EDITION}"'" and .arch=="x86_64" and .version=="'"${RELEASE}"'" and (.link | endswith(".iso")))')
+    # Fedora may promote variants from Spins to Editions, in which case we want to accept either "Spins" or the specific edition name to preserve backwards compatibility
+    # For example, Fedora 42 KDE is now an edition, while previous releases are spins
+    JSON=$(web_pipe "https://getfedora.org/releases.json" | jq '.[] | select((.variant=="'"${VARIANT}"'" or .variant=="'"${EDITION}"'") and .subvariant=="'"${EDITION}"'" and .arch=="x86_64" and .version=="'"${RELEASE}"'" and (.link | endswith(".iso")))')
    URL=$(echo "${JSON}" | jq -r '.link' | head -n1)
    HASH=$(echo "${JSON}" | jq -r '.sha256' | head -n1)
    echo "${URL} ${HASH}"
@ -1890,11 +1913,17 @@ function get_freebsd() {
 function get_freedos() {
    local HASH=""
    local ISO=""
-    local URL="https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/${RELEASE}/official"
+    local BASE_URL="https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/${RELEASE}"
+    local URL=""
    case ${RELEASE} in
-        1.2) ISO="FD12CD.iso"
+        1.2) URL="${BASE_URL}/official"
+             ISO="FD12CD.iso"
             HASH=$(web_pipe "${URL}/FD12.sha" | grep "${ISO}" | cut -d' ' -f1);;
-        1.3) ISO="FD13-LiveCD.zip"
+        1.3) URL="${BASE_URL}/official"
+             ISO="FD13-LiveCD.zip"
+             HASH=$(web_pipe "${URL}/verify.txt" | grep -A 8 "sha256sum" | grep "${ISO}" | cut -d' ' -f1);;
+        1.4) URL="${BASE_URL}"
+             ISO="FD14-LiveCD.zip"
             HASH=$(web_pipe "${URL}/verify.txt" | grep -A 8 "sha256sum" | grep "${ISO}" | cut -d' ' -f1);;
    esac
    echo "${URL}/${ISO} ${HASH}"
@ -2239,16 +2268,6 @@ function get_nitrux() {

 function get_nixos() {
    local HASH=""
-    # Adapt the plasma edition according to the NixOS release
-    case "${EDITION}" in
-        plasma)
-            if [ "${RELEASE}" == "23.11" ]; then
-                EDITION+="5"
-            else
-                EDITION+="6"
-            fi
-            ;;
-    esac
    local ISO="latest-nixos-${EDITION}-x86_64-linux.iso"
    local URL="https://channels.nixos.org/nixos-${RELEASE}"
    HASH=$(web_pipe "${URL}/${ISO}.sha256" | cut -d' ' -f1)
@ -2343,7 +2362,7 @@ function get_pclinuxos() {
    local URL="https://ftp.fau.de/pclinuxos/pclinuxos/iso"
    echo "${URL}/${ISO} ${HASH}"
 }
-    
+
 function get_peppermint() {
    local HASH=""
    local ISO=""