diff --git a/assets/i18n/cs_CZ.po b/assets/i18n/cs_CZ.po index 43aade3..9a7e3e2 100644 --- a/assets/i18n/cs_CZ.po +++ b/assets/i18n/cs_CZ.po @@ -49,8 +49,8 @@ msgstr "Správce stahování" msgid "Downloading (no progress available)..." msgstr "Probíhá stahování (průběh není k dispozici) …" -msgid "Downloading...{0}%" -msgstr "Probíhá stahování …{0}%" +msgid "Downloading... {0}%" +msgstr "Probíhá stahování … {0}%" msgid "Downloading {0}" msgstr "Probíhá stahování {0}" diff --git a/assets/i18n/cy.po b/assets/i18n/cy.po index df1938d..e7bfa29 100644 --- a/assets/i18n/cy.po +++ b/assets/i18n/cy.po @@ -55,7 +55,7 @@ msgstr "Dadlwythwr" msgid "Downloading (no progress available)..." msgstr "Llwytho i lawr (dim cynnydd ar gael)..." -msgid "Downloading...{0}%" +msgid "Downloading... {0}%" msgstr "Llwytho i lawr... {0}%" msgid "Downloading {0}" diff --git a/assets/i18n/de.po b/assets/i18n/de.po index 221496f..1c59962 100644 --- a/assets/i18n/de.po +++ b/assets/i18n/de.po @@ -50,8 +50,8 @@ msgstr "Downloader" msgid "Downloading (no progress available)..." msgstr "Lädt herunter (Kein Fortschritt verfügbar) …" -msgid "Downloading...{0}%" -msgstr "Herunterladen …{0}%" +msgid "Downloading... {0}%" +msgstr "Herunterladen … {0}%" msgid "Downloading {0}" msgstr "{0} wird herunterladen" diff --git a/assets/i18n/en.po b/assets/i18n/en.po index d4edd1f..bb6aeb2 100644 --- a/assets/i18n/en.po +++ b/assets/i18n/en.po @@ -49,8 +49,8 @@ msgstr "Downloader" msgid "Downloading (no progress available)..." msgstr "Downloading (no progress available)..." -msgid "Downloading...{0}%" -msgstr "Downloading...{0}%" +msgid "Downloading... {0}%" +msgstr "Downloading... {0}%" msgid "Downloading {0}" msgstr "Downloading {0}" diff --git a/assets/i18n/es.po b/assets/i18n/es.po index 302ab77..0badacc 100644 --- a/assets/i18n/es.po +++ b/assets/i18n/es.po @@ -62,8 +62,8 @@ msgid "Downloading (no progress available)..." msgstr "Descargando (progreso no disponible)..." #, fuzzy -msgid "Downloading...{0}%" -msgstr "Descargando...{0}%" +msgid "Downloading... {0}%" +msgstr "Descargando... {0}%" #, fuzzy msgid "Downloading {0}" diff --git a/assets/i18n/fr.po b/assets/i18n/fr.po index 5456277..52dcd8f 100644 --- a/assets/i18n/fr.po +++ b/assets/i18n/fr.po @@ -49,8 +49,8 @@ msgstr "Gestionnaire de téléchargements" msgid "Downloading (no progress available)..." msgstr "Téléchargement (pas de barre de progression)..." -msgid "Downloading...{0}%" -msgstr "Téléchargement...{0}%" +msgid "Downloading... {0}%" +msgstr "Téléchargement... {0}%" msgid "Downloading {0}" msgstr "Téléchargement de {0}" diff --git a/assets/i18n/gd.po b/assets/i18n/gd.po index d3013dc..33bf858 100644 --- a/assets/i18n/gd.po +++ b/assets/i18n/gd.po @@ -51,8 +51,8 @@ msgstr "Inneal luchdachadh sìos" msgid "Downloading (no progress available)..." msgstr "A ’luchdachadh sìos (chan eil adhartas ri fhaighinn)" -msgid "Downloading...{0}%" -msgstr "A ’luchdachadh sìos...{0}%" +msgid "Downloading... {0}%" +msgstr "A ’luchdachadh sìos... {0}%" msgid "Downloading {0}" msgstr "Thèid {0} a luchdachadh sìos" diff --git a/assets/i18n/hu.po b/assets/i18n/hu.po index 7c313cf..0d44137 100644 --- a/assets/i18n/hu.po +++ b/assets/i18n/hu.po @@ -49,8 +49,8 @@ msgstr "Letöltő" msgid "Downloading (no progress available)..." msgstr "Letöltés (a haladásról nincs visszajelzés)..." -msgid "Downloading...{0}%" -msgstr "Letöltés...{0}%" +msgid "Downloading... {0}%" +msgstr "Letöltés... {0}%" msgid "Downloading {0}" msgstr "Letöltés {0}" diff --git a/assets/i18n/it.po b/assets/i18n/it.po index 2d784c3..2c922ba 100644 --- a/assets/i18n/it.po +++ b/assets/i18n/it.po @@ -54,8 +54,8 @@ msgstr "Download" msgid "Downloading (no progress available)..." msgstr "Download (nessun progresso disponibile)..." -msgid "Downloading...{0}%" -msgstr "Scaricando...{0}%" +msgid "Downloading... {0}%" +msgstr "Scaricando... {0}%" msgid "Downloading {0}" msgstr "Scaricamento di {0}" diff --git a/assets/i18n/ja.po b/assets/i18n/ja.po index ace4cc3..3609e7f 100644 --- a/assets/i18n/ja.po +++ b/assets/i18n/ja.po @@ -49,8 +49,8 @@ msgstr "ダウンローダ" msgid "Downloading (no progress available)..." msgstr "ダウンロード中(進行状況を推定中)..." -msgid "Downloading...{0}%" -msgstr "ダウンロード中...{0}%" +msgid "Downloading... {0}%" +msgstr "ダウンロード中... {0}%" msgid "Downloading {0}" msgstr "{0}をダウンロード中" diff --git a/assets/i18n/nl.po b/assets/i18n/nl.po index eeb82e6..c563408 100644 --- a/assets/i18n/nl.po +++ b/assets/i18n/nl.po @@ -55,8 +55,8 @@ msgstr "Downloader" msgid "Downloading (no progress available)..." msgstr "Downloaden (geen voortgang beschikbaar)..." -msgid "Downloading...{0}%" -msgstr "Downloaden...{0}%" +msgid "Downloading... {0}%" +msgstr "Downloaden... {0}%" msgid "Downloading {0}" msgstr "Downloaden {0}" diff --git a/assets/i18n/no.po b/assets/i18n/no.po index 5f27451..063e7f6 100644 --- a/assets/i18n/no.po +++ b/assets/i18n/no.po @@ -55,8 +55,8 @@ msgstr "Nedlaster" msgid "Downloading (no progress available)..." msgstr "Nedlasting (ingen fremgang tilgjengelig)..." -msgid "Downloading...{0}%" -msgstr "Laster ned...{0}%" +msgid "Downloading... {0}%" +msgstr "Laster ned... {0}%" msgid "Downloading {0}" msgstr "Laster ned {0}" diff --git a/assets/i18n/oc.po b/assets/i18n/oc.po index c9b410d..78e0dc8 100644 --- a/assets/i18n/oc.po +++ b/assets/i18n/oc.po @@ -48,7 +48,7 @@ msgstr "Telecargador" msgid "Downloading (no progress available)..." msgstr "Telecargament (cap de barra de progression pas disponibla)..." -msgid "Downloading...{0}%" +msgid "Downloading... {0}%" msgstr "Telecargament... {0} %" msgid "Downloading {0}" diff --git a/assets/i18n/pt_BR.po b/assets/i18n/pt_BR.po index ad48408..1ff6a06 100644 --- a/assets/i18n/pt_BR.po +++ b/assets/i18n/pt_BR.po @@ -49,8 +49,8 @@ msgstr "Downloader" msgid "Downloading (no progress available)..." msgstr "Baixando (progresso não disponível)..." -msgid "Downloading...{0}%" -msgstr "Baixando...{0}%" +msgid "Downloading... {0}%" +msgstr "Baixando... {0}%" msgid "Downloading {0}" msgstr "Baixando {0}" diff --git a/assets/i18n/pt_PT.po b/assets/i18n/pt_PT.po index 863e106..437bc6a 100644 --- a/assets/i18n/pt_PT.po +++ b/assets/i18n/pt_PT.po @@ -49,8 +49,8 @@ msgstr "Transferidor" msgid "Downloading (no progress available)..." msgstr "A transferir (progresso não disponível)..." -msgid "Downloading...{0}%" -msgstr "A transferir...{0}%" +msgid "Downloading... {0}%" +msgstr "A transferir... {0}%" msgid "Downloading {0}" msgstr "A transferir {0}" diff --git a/assets/i18n/quickgui.pot b/assets/i18n/quickgui.pot index 21ce595..37a154b 100644 --- a/assets/i18n/quickgui.pot +++ b/assets/i18n/quickgui.pot @@ -49,7 +49,7 @@ msgstr "" msgid "Downloading (no progress available)..." msgstr "" -msgid "Downloading...{0}%" +msgid "Downloading... {0}%" msgstr "" msgid "Downloading {0}" @@ -186,4 +186,3 @@ msgstr "" # Connect to the VM via SSH msgid "Connect" msgstr "" - diff --git a/assets/i18n/ru.po b/assets/i18n/ru.po index f855cd9..7b8b032 100644 --- a/assets/i18n/ru.po +++ b/assets/i18n/ru.po @@ -55,8 +55,8 @@ msgstr "Загрузчик" msgid "Downloading (no progress available)..." msgstr "Загрузка (нет прогресса)..." -msgid "Downloading...{0}%" -msgstr "Загрузка...{0}%" +msgid "Downloading... {0}%" +msgstr "Загрузка... {0}%" msgid "Downloading {0}" msgstr "Загрузка {0}" diff --git a/assets/i18n/sv.po b/assets/i18n/sv.po index ca49a26..e2c5883 100644 --- a/assets/i18n/sv.po +++ b/assets/i18n/sv.po @@ -52,7 +52,7 @@ msgstr "Nerladdare" msgid "Downloading (no progress available)..." msgstr "Laddar ner (inget förlopp tillgängligt)..." -msgid "Downloading...{0}%" +msgid "Downloading... {0}%" msgstr "Laddar ner... {0}%" msgid "Downloading {0}" diff --git a/assets/i18n/tr.po b/assets/i18n/tr.po index d37cfb3..3482fe0 100644 --- a/assets/i18n/tr.po +++ b/assets/i18n/tr.po @@ -49,8 +49,8 @@ msgstr "Yükleyici" msgid "Downloading (no progress available)..." msgstr "Yükleniyor (ilerleme yok)..." -msgid "Downloading...{0}%" -msgstr "Yükleniyor...{0}%" +msgid "Downloading... {0}%" +msgstr "Yükleniyor... {0}%" msgid "Downloading {0}" msgstr "Yükleniyor {0}" diff --git a/flake.lock b/flake.lock index e9c9284..fad8bed 100644 --- a/flake.lock +++ b/flake.lock @@ -14,24 +14,59 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A.tar.gz" } }, - "nixpkgs": { + "flake-schemas_2": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", - "revCount": 644565, + "lastModified": 1697467827, + "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", + "rev": "764932025c817d4e500a8d2a4d8c565563923d29", + "revCount": 29, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.644565%2Brev-b2852eb9365c6de48ffb0dc2c9562591f652242a/01906511-d0fc-7244-b596-2d790f5bfdb0/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A.tar.gz" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717952948, + "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", + "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", + "revCount": 631440, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.631440%2Brev-2819fffa7fa42156680f0d282c60d81e8fb185b7/0190034c-678d-7039-b45c-fa38168f2500/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" + } + }, + "quickemu": { + "inputs": { + "flake-schemas": "flake-schemas_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719316513, + "narHash": "sha256-9EQMWByMD0K0mRFKO+CtTFRWREaePB6xU6jBmtVhF3U=", + "rev": "1c89f520f2c7d10cc9cc1d15b8cae32215359224", + "revCount": 1992, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/quickemu-project/quickemu/4.9.5/01904f50-5263-7e22-b58e-a1dae34d5486/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/quickemu-project/quickemu/%2A.tar.gz" } }, "root": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "quickemu": "quickemu" } } }, diff --git a/flake.nix b/flake.nix index 4d787dd..b7878af 100644 --- a/flake.nix +++ b/flake.nix @@ -2,37 +2,46 @@ description = "Quickgui flake"; inputs = { flake-schemas.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/*.tar.gz"; - nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; + nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*.tar.gz"; + quickemu.url = "https://flakehub.com/f/quickemu-project/quickemu/*.tar.gz"; + quickemu.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, flake-schemas, nixpkgs, + quickemu, }: let - forAllSystems = function: - nixpkgs.lib.genAttrs [ - "x86_64-linux" - # TODO: Enable when upstream supports these platforms - #"aarch64-linux" - #"x86_64-darwin" - #"aarch64-darwin" - ] (system: function nixpkgs.legacyPackages.${system}); + # Define supported systems and a helper function for generating system-specific outputs + #TODO: Add the following as quickemu/quickgui/GitHub builders support them: + # aarch64-darwin aarch64-linux x86_64-darwin + supportedSystems = [ "x86_64-linux" ]; + + forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { + system = system; + pkgs = import nixpkgs { inherit system; }; + }); in { - # Schemas tell Nix about the structure of your flake's outputs + # Define schemas for the flake's outputs schemas = flake-schemas.schemas; - overlays.default = final: prev: { - quickgui = final.callPackage ./package.nix {}; - }; + # Define overlays for each supported system + overlays = forEachSupportedSystem ({pkgs, system, ...}: { + default = final: prev: { + quickgui = final.callPackage ./package.nix { quickemu = quickemu.packages.${system}.default; }; + }; + }); - packages = forAllSystems (pkgs: rec { - quickgui = pkgs.callPackage ./package.nix {}; + # Define packages for each supported system + packages = forEachSupportedSystem ({pkgs, system, ...}: rec { + quickgui = pkgs.callPackage ./package.nix { quickemu = quickemu.packages.${system}.default; }; default = quickgui; }); - devShells = forAllSystems (pkgs: { - default = pkgs.callPackage ./devshell.nix {}; + # Define devShells for each supported system + devShells = forEachSupportedSystem ({pkgs, system, ...}: { + default = pkgs.callPackage ./devshell.nix { quickemu = quickemu.packages.${system}.default; }; }); }; }