Commit Graph

9299 Commits

Author SHA1 Message Date
TheKodeToad ff9fa6aa4f Stop accepting malformed hashes object
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-25 11:45:45 +01:00
seth faf9086705 Merge pull request #2750 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-08-25 05:12:32 -04:00
Trial97 465c9498d4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-25 09:50:41 +03:00
Alexandru Ionut Tripon 44f589817f Merge pull request #2749 from TheKodeToad/theme-bugfixes
Fix system theme detection
2024-08-25 08:58:42 +03:00
Alexandru Ionut Tripon aa206f4c89 Merge pull request #2748 from TheKodeToad/gentoo-java-perf
Improve Java checking speed by using startsWith for gentoo paths
2024-08-25 08:58:22 +03:00
ZekeZ 1bb7f35ddb Merge pull request #2751 from Ryex/security/modrith-hash-priority
Prefer stronger hashes from Modrinth
2024-08-25 13:53:04 +10:00
Rachel Powers 5f874330d5 security(modrinth) reorder hash algo priority, prefer stronger hashes.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-08-24 20:24:35 -07:00
github-actions[bot] 96414d7153 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
  → 'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
2024-08-25 00:22:51 +00:00
TheKodeToad cbdacf81ee Fix system theme detection
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-24 22:50:51 +01:00
TheKodeToad d2304b6698 Improve Java checking speed by using startsWith for gentoo paths
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-24 22:13:18 +01:00
Sefa Eyeoglu fac28a81ae Merge pull request #2738 from getchoo/nix-omnibus 2024-08-23 10:08:59 +02:00
Trial97 2a86ceb5d6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-08-23 08:34:15 +03:00
Trial97 575cdb043b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:29:43 +03:00
Alexandru Ionut Tripon eae5d70385 Merge pull request #2069 from Trial97/feature/java-downloader
Feature/java downloader
2024-08-23 08:17:15 +03:00
Trial97 92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:16:59 +03:00
Alexandru Ionut Tripon e4be8f97cd Merge pull request #2740 from TheKodeToad/themeable-logs
Allow themes to modify log colours
2024-08-23 08:12:34 +03:00
seth fd14d3e9b0 Merge pull request #2745 from TheKodeToad/fix-java-message
Fix invalid Java path message
2024-08-22 21:33:24 -04:00
seth 11927e9bf2 Merge pull request #2739 from PrismLauncher/renovate/korthout-backport-action-3.x
chore(deps): update korthout/backport-action action to v3.1.0
2024-08-22 21:32:03 -04:00
maskers 762d24bd02 don't mention prism in the middle of the log
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-22 21:44:53 +03:00
maskers a910337e9d apply suggestion from code review
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
2024-08-22 21:42:05 +03:00
TheKodeToad 89ed85182c Fix invalid Java path message
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-22 19:07:15 +01:00
Trial97 5f64d7dc47 update adoptium icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 20:38:08 +03:00
Trial97 0b05c7cb07 fix bug with buton not updating corectly for java dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:59:09 +03:00
Trial97 7d9e47ac18 Change major java column name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:58:38 +03:00
Trial97 aa3a4585ee Add icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:58:04 +03:00
TheKodeToad 2ad34c724e Make log colours themeable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-21 22:19:50 +01:00
maskers 6d017b5f0b fix formatting
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-21 22:39:27 +03:00
maskers 65f8526152 add a Cancel option
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
2024-08-21 22:14:11 +03:00
renovate[bot] 7472233033 chore(deps): update korthout/backport-action action to v3.1.0 2024-08-21 17:22:09 +00:00
maskers 99bd4a8937 Apply suggestions from code review
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com>
2024-08-21 19:42:35 +03:00
maskers cf914526bf add a warning about the log being too large
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-21 15:59:51 +03:00
Trial97 26ae608685 fix initial java dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-21 15:01:42 +03:00
Trial97 da7cc529f0 Enable auto-detect java if java path is not set
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-21 14:54:47 +03:00
seth 99ecab01fc ci(garnix): explicitly declare systems
as we now create outputs for each system in `lib.systems.flakeExposed`,
we should ensure garnix only builds the systems we officially support

dev shells are also no longer built as they really don't need to be
"built" on the developer's machine in any case; everything should be
cached

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:02:48 -04:00
seth a49a58bc45 Revert "refactor(nix): nix-filter -> lib.fileset"
This reverts commit 8312713dc2.

See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to
be copied to the store twice; using the `self` argument works around
this. However, as `lib.fileset` doesn't support using `self`, so we need
to go back to `nix-filter`

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth 13eedbb7de doc(nix): prefer packages output
overlays can cause issues we don't run into upstream, especially when
used on stable channels for example. preferring the pure `packages`
output also encourages the use of our binary cache by users, who
probably don't like building the launcher all too much

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth e29ea4efb0 build(nix): add formatting checks
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth 0ae421c265 chore(nix): drop flake-parts
The primary goals here include making the flake easier to contribute to
by having it follow the standard boilerplate, while also limiting the
size of our flake.lock to lower the chance of duplicate inputs for users

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:30 -04:00
seth e85b364748 refactor(nix): use final in overlay
this allows to implictly pass `prismlauncher-unwrapped`
it won't have an effect on our package set as directly inheriting from
the scope we create filters out the extra attributes usually introduced
with a scope

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:37 -04:00
seth 271c38bc56 doc(nix): update package names and params
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth 7a83d0cea0 ci(nix): drop pre-commit-hooks
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth 4c81d8c53d style(nix): format with nixfmt
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth 7dff77ca35 style(nix): alejandra -> nixfmt-rfc-style
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth 1edfbeec8d Merge pull request #2732 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-08-20 22:36:33 -04:00
maskers 858f6aa9b8 fix formatting
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-20 22:16:40 +03:00
maskers e6f30c0ebe fix formatting
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-20 22:14:40 +03:00
maskers 014fc14291 truncate logs for mclo.gs upload to fit 25k line limit
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com>
2024-08-20 21:53:05 +03:00
timoreo 7f594a342e Merge pull request #2735 from Trial97/force_load_java 2024-08-20 08:04:21 +02:00
Trial97 002fc71b8d allways load java list on autodetect
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-20 01:18:37 +03:00
Trial97 ca298d1ed5 add automatic java switch on minecraft version switch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-20 01:08:03 +03:00