RomanNum3ral
/
quickgui
mirror of https://github.com/quickemu-project/quickgui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into macos_desktop

This commit is contained in:
Yannick Mauray 2024-07-02 07:00:03 +02:00
parent 0ac0ea0344 275d065c74
commit 69a32d3b1e
21 changed files with 103 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/i18n/cs_CZ.po
View File

@ -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}"

2
assets/i18n/cy.po
View File

@ -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}"

4
assets/i18n/de.po
View File

@ -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"

4
assets/i18n/en.po
View File

@ -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}"

4
assets/i18n/es.po
View File

@ -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}"

4
assets/i18n/fr.po
View File

@ -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}"

4
assets/i18n/gd.po
View File

@ -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"

4
assets/i18n/hu.po
View File

@ -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}"

4
assets/i18n/it.po
View File

@ -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}"

4
assets/i18n/ja.po
View File

@ -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}をダウンロード中"

4
assets/i18n/nl.po
View File

@ -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}"

4
assets/i18n/no.po
View File

@ -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}"

2
assets/i18n/oc.po
View File

@ -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}"

4
assets/i18n/pt_BR.po
View File

@ -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}"

4
assets/i18n/pt_PT.po
View File

@ -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}"

3
assets/i18n/quickgui.pot
View File

@ -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 ""

4
assets/i18n/ru.po
View File

@ -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}"

2
assets/i18n/sv.po
View File

@ -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}"

4
assets/i18n/tr.po
View File

@ -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}"

51
flake.lock
View File

@ -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"
}
}
},

43
flake.nix
View File

@ -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; };
});
};
}