Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Oskar Manhart 2025-02-02 11:49:41 +01:00
commit 5831696ead
3 changed files with 14 additions and 10 deletions

View File

@ -5,12 +5,15 @@ permissions:
pull-requests: write
on:
workflow_dispatch:
pull_request:
branches: [main]
types: [labeled]
schedule:
- cron: "0 10 * * 0" # https://crontab.guru/#0_10_*_*_0
jobs:
updateFlakePackages:
build:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'rebuild nix')
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@ -25,12 +28,13 @@ jobs:
uses: cachix/cachix-action@v15
with:
name: winapps
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Update flake packages
uses: winapps-org/nix-update-action@v1.3.0
uses: winapps-org/nix-update-action@v1.4.0
with:
extra-args: --version=branch
skip-pr: "${{ github.event_name == 'pull_request' }}"
- name: Build packages
run: nix build .#winapps .#winapps-launcher

View File

@ -9,12 +9,12 @@
...
}:
let
rev = "3eb63ad1442068119c2e0f2586e6d63e7a45042e";
hash = "sha256-y31AdBZSiarcQzH2wyDnhzgrrELbLW4XY94JvLejoTU=";
rev = "ae1a9e9ea7c958255905cfd056196b3bdc4aad45";
hash = "sha256-tpEnMyJh6tutZKLNJi64V89QvZStdkyzZBuMQz6RPHw=";
in
stdenv.mkDerivation rec {
pname = "winapps-launcher";
version = "0-unstable-2025-01-12";
version = "0-unstable-2025-02-02";
src = fetchFromGitHub {
owner = "winapps-org";

View File

@ -11,12 +11,12 @@
...
}:
let
rev = "8c4a695a9f10d9055cc6b699d4c58612348d4db4";
hash = "sha256-aE31v2j5dWka5XdhBRwmnMGciOBP7yoK+hP2f4CIMTg=";
rev = "73e71aff80eec564a154a5aca92cba901370a3c5";
hash = "sha256-vUsVmyjkBQEIsa3La4dsLpLNsyfJPNHFjH5TXhLT+EE=";
in
stdenv.mkDerivation rec {
pname = "winapps";
version = "0-unstable-2025-01-19";
version = "0-unstable-2025-02-01";
src = fetchFromGitHub {
owner = "winapps-org";