Merge branch 'main' into legacy-installer

This commit is contained in:
Michel Memeteau
2025-07-10 10:39:59 +02:00
10 changed files with 52 additions and 44 deletions

View File

@@ -1,37 +0,0 @@
name: Update submodules
on:
repository_dispatch:
types: update
jobs:
update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Update module
run: |
pushd WinApps-Launcher
branch=$(git rev-parse --abbrev-ref origin/HEAD | sed "s|origin/||")
git config remote.origin.fetch "+refs/heads/$branch:refs/remotes/origin/$branch"
git fetch --depth=1 origin "refs/heads/$branch"
popd
git submodule update --init --remote WinApps-Launcher
- name: Commit and push
uses: EndBug/add-and-commit@v9
with:
add: WinApps-Launcher
default_author: github_actions
message: "Update submodules"
push: false
- name: Create PR
uses: peter-evans/create-pull-request@v7
with:
branch: chore/update_submodules
delete-branch: true
title: "Update submodules"

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "WinApps-Launcher"]
path = WinApps-Launcher
url = https://github.com/winapps-org/WinApps-Launcher.git

View File

@@ -570,6 +570,11 @@ The installer can be run multiple times. To update your installation of WinApps:
2. Pull the latest changes from the WinApps GitHub repository.
3. Re-install WinApps using the WinApps installer by running `winapps-setup`.
## WinApps Launcher (Optional)
The [WinApps Launcher](https://github.com/winapps-org/winapps-launcher) provides a simple system tray menu that makes it easy to launch your installed Windows applications, open a full desktop RDP session, and control your Windows VM or container. You can start, stop, pause, reboot or hibernate Windows, as well as access your installed applications from a convenient list. This lightweight, optional tool helps streamline your overall WinApps experience.
<img src="./demo/launcher.gif" width=1000 alt="WinApps Launcher Animation.">
## Installation using Nix
First, follow Step 1 of the normal installation guide to create your VM.

Submodule WinApps-Launcher deleted from 9b3f6c5817

9
apps/emclient/icon.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 20 KiB

17
apps/emclient/info Normal file
View File

@@ -0,0 +1,17 @@
# GNOME shortcut name
NAME="eM Client"
# Used for descriptions and window class
FULL_NAME="eM Client"
# The executable inside windows
WIN_EXECUTABLE="C:\Program Files (x86)\eM Client\mailclient.exe"
# GNOME categories
CATEGORIES="WinApps;Network;Office;"
# GNOME mimetypes
MIME_TYPES=""
# System Icon
ICON="eM Client"

1
apps/paint.net/icon.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 46 KiB

17
apps/paint.net/info Normal file
View File

@@ -0,0 +1,17 @@
# GNOME shortcut name
NAME="Paint.NET"
# Used for descriptions and window class
FULL_NAME="Paint.NET"
# The executable inside windows
WIN_EXECUTABLE="C:\Program Files\Paint.NET\paintdotnet.exe"
# GNOME categories
CATEGORIES="WinApps;Graphic;"
# GNOME mimetypes
MIME_TYPES=""
# System Icon
ICON="Paint.Net"

BIN
demo/launcher.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 MiB

View File

@@ -11,12 +11,12 @@
...
}:
let
rev = "aa5b3e945526800da1b8891fd8b38272a4a6189d";
hash = "sha256-nB56x76W+eyMqIturj26zDbKEMvp/IgDud/twz6pwCY=";
rev = "ce9a84dc5294c45a4b69847f5164628f7d6a4ae1";
hash = "sha256-SsyJy9mCwBjKex8mfCnKrzKUM/+xws0EltI2aSkKTuM=";
in
stdenv.mkDerivation rec {
pname = "winapps";
version = "0-unstable-2025-06-20";
version = "0-unstable-2025-07-02";
src = fetchFromGitHub {
owner = "winapps-org";