Merge pull request #30 from ein-shved/master

[workflows] Some fixes

.github/workflows/build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ -f /etc/os-release ]; then
     . /etc/os-release
     OS=$NAME

.github/workflows/build.yml

@@ -57,12 +57,14 @@ jobs:
       - name: Install nix
         uses: cachix/install-nix-action@v22
 
-      - name: Build
-        run: sh ./.github/workflows/build.sh
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
+      - uses: cachix/cachix-action@v12
         with:
-          path: ./result/*
-          name: nix-package
+          name: yandexmisic
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - name: Build yandexmusic
+        run: NIXPKGS_ALLOW_UNFREE=1 nix build --impure .#yandexmusic
+      - name: Build yandexmusic background
+        run: NIXPKGS_ALLOW_UNFREE=1 nix build --impure .#yandexmusic-background
+      - name: Build yandexmusic without flakes binaries
+        run: NIXPKGS_ALLOW_UNFREE=1 nix build --impure .#yandexmusic-noflakes
 

.github/workflows/retrieve_version.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # get version
 VERSION=$(jq -r '.version' version_info.json)
 release_name="Beta $VERSION"

.github/workflows/update-build-release.yml

@@ -19,7 +19,7 @@ jobs:
         run: pacman -Syy --noconfirm
 
       - name: Install deps
-        run: pacman -S --noconfirm git jq
+        run: pacman -S --noconfirm git jq nix
 
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/update_packages.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ -f /etc/os-release ]; then
     . /etc/os-release
     OS=$NAME

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704874635,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "lastModified": 1706925685,
+        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
         "type": "github"
       },
       "original": {
@@ -56,13 +56,13 @@
     "ymExe": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-HeqFJ+hY/8TjViz6SjfklMoVpX6+54pL0Vl1cI1Qlkw=",
+        "narHash": "sha256-ZHjUm3Z86DIE1AcJ0NrKROesFR2ejll+stTeCHMz+Hs=",
         "type": "file",
-        "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.0.8.exe"
+        "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.0.9.exe"
       },
       "original": {
         "type": "file",
-        "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.0.8.exe"
+        "url": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.0.9.exe"
       }
     }
   },

flake.nix

@@ -18,7 +18,7 @@
         {
           packages = rec {
             yandexmusic = yandexmusic-with pkgs;
-            yandexmusic-backgroud = yandexmusic.override {
+            yandexmusic-background = yandexmusic.override {
               fixQuit = false;
             };
             yandexmusic-noflakes = pkgs.callPackage ./nix {};

generate_packages.sh

@@ -73,7 +73,7 @@ update_pkbuild() {
 update_flake() {
     sed -i 's#\(ymExe\.url\s*=\s*\).*;#\1'"$exe_link"';#' ./flake.nix
     if check_dep nix; then
-        nix flake lock --update-input ymExe
+        nix --extra-experimental-features 'nix-command flakes' flake update
     else
         echo "flake.nix was updated, but nix not installed to update flake.lock"
     fi