Unverified Commit cb59973e authored by André Silva's avatar André Silva Committed by GitHub
Browse files

Merge pull request #304252 from andresilva/sunshine-0.23.0 

sunshine: 0.22.2 -> 0.23.0
parents 2a240cb5 c230c3ec

pkgs/servers/sunshine/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
, curl

, pcre

, pcre2

, python3

, libuuid

, libselinux

, libsepol
@@ -50,13 +51,13 @@ let 
in

stdenv'.mkDerivation rec {

  pname = "sunshine";

  version = "0.22.2";

  version = "0.23.0";



  src = fetchFromGitHub {

    owner = "LizardByte";

    repo = "Sunshine";

    rev = "v${version}";

    sha256 = "sha256-So8fX0XQoW2cdTWWENoE07EU6e8vvjeTpizLoaDTjeg=";

    sha256 = "sha256-K43LZ7zouTRUI4xhiHuRzu2tN7mUl1nTapuR34JR/Ac=";

    fetchSubmodules = true;

  };
@@ -69,7 +70,7 @@ stdenv'.mkDerivation rec { 
  ui = buildNpmPackage {

    inherit src version;

    pname = "sunshine-ui";

    npmDepsHash = "sha256-0487ntbJZ20MZHezQ+Z3EJkidF3Dgoh/mynYwR7k/+I=";

    npmDepsHash = "sha256-I7IrCR7eQ97a8cPB8F8+T0zX8iJcwh+YtZ9QRtEVZtI=";



    # use generated package-lock.json as upstream does not provide one

    postPatch = ''
@@ -85,6 +86,7 @@ stdenv'.mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    pkg-config

    python3

    makeWrapper

    # Avoid fighting upstream's usage of vendored ffmpeg libraries

    autoPatchelfHook

pkgs/servers/sunshine/dont-build-webui.patch

+8 −9
Original line number Diff line number Diff line 
diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake

index 9f2ce08..8c32b8f 100644

--- a/cmake/targets/common.cmake

+++ b/cmake/targets/common.cmake

@@ -48,8 +48,4 @@ else()

     set(NPM_BUILD_HOMEBREW "")

 endif()

diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake

index 2ce0378..10d8262 100644

--- a/cmake/targets/unix.cmake

+++ b/cmake/targets/unix.cmake

@@ -1,8 +1,3 @@

 # unix specific target definitions

 # put anything here that applies to both linux and macos

 

-#WebUI build

-add_custom_target(web-ui ALL

-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"

-        COMMENT "Installing NPM Dependencies and Building the Web UI"

-        COMMAND bash -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\")  # cmake-lint: disable=C0301
 
+

pkgs/servers/sunshine/package-lock.json

+87 −21
Original line number Diff line number Diff line
@@ -5,19 +5,20 @@ 
  "packages": {

    "": {

      "dependencies": {

        "@fortawesome/fontawesome-free": "6.5.1",

        "@fortawesome/fontawesome-free": "6.5.2",

        "@popperjs/core": "2.11.8",

        "@vitejs/plugin-vue": "4.6.2",

        "bootstrap": "5.3.3",

        "vite": "4.5.2",

        "vite-plugin-ejs": "1.6.4",

        "vue": "3.4.5"

        "vue": "3.4.5",

        "vue-i18n": "9.11.0"

      }

    },

    "node_modules/@babel/parser": {

      "version": "7.24.0",

      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",

      "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",

      "version": "7.24.4",

      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",

      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",

      "bin": {

        "parser": "bin/babel-parser.js"

      },
@@ -356,14 +357,55 @@ 
      }

    },

    "node_modules/@fortawesome/fontawesome-free": {

      "version": "6.5.1",

      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",

      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==",

      "version": "6.5.2",

      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",

      "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",

      "hasInstallScript": true,

      "engines": {

        "node": ">=6"

      }

    },

    "node_modules/@intlify/core-base": {

      "version": "9.11.0",

      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.11.0.tgz",

      "integrity": "sha512-cveOqAstjLZIiyatcP/HrzrQ87cZI8ScPQna3yvoM8zjcjcIRK1MRvmxUNlPdg0rTNJMZw7rixPVM58O5aHVPA==",

      "dependencies": {

        "@intlify/message-compiler": "9.11.0",

        "@intlify/shared": "9.11.0"

      },

      "engines": {

        "node": ">= 16"

      },

      "funding": {

        "url": "https://github.com/sponsors/kazupon"

      }

    },

    "node_modules/@intlify/message-compiler": {

      "version": "9.11.0",

      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.11.0.tgz",

      "integrity": "sha512-x31Gl7cscnoI4UUY1yaIy8e7vVMVW1VVlTXZz4SIHKqoSEUkfmgqK8NAx1e7RcoHEbICR7uyCbud0ZL1s4OGXQ==",

      "dependencies": {

        "@intlify/shared": "9.11.0",

        "source-map-js": "^1.0.2"

      },

      "engines": {

        "node": ">= 16"

      },

      "funding": {

        "url": "https://github.com/sponsors/kazupon"

      }

    },

    "node_modules/@intlify/shared": {

      "version": "9.11.0",

      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.11.0.tgz",

      "integrity": "sha512-KHSNgi7sRjmSm7aD8QH8WFt9VfKaekJuJ473opbJlkGY3EDnDUU8ikIhG8PbasQbgNvbY3m3tWNGqk2omIdwMA==",

      "engines": {

        "node": ">= 16"

      },

      "funding": {

        "url": "https://github.com/sponsors/kazupon"

      }

    },

    "node_modules/@jridgewell/sourcemap-codec": {

      "version": "1.4.15",

      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
@@ -436,6 +478,11 @@ 
        "@vue/shared": "3.4.5"

      }

    },

    "node_modules/@vue/devtools-api": {

      "version": "6.6.1",

      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",

      "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="

    },

    "node_modules/@vue/reactivity": {

      "version": "3.4.5",

      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.5.tgz",
@@ -573,9 +620,9 @@ 
      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="

    },

    "node_modules/ejs": {

      "version": "3.1.9",

      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",

      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",

      "version": "3.1.10",

      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",

      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",

      "dependencies": {

        "jake": "^10.8.5"

      },
@@ -704,9 +751,9 @@ 
      }

    },

    "node_modules/magic-string": {

      "version": "0.30.8",

      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",

      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",

      "version": "0.30.9",

      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz",

      "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",

      "dependencies": {

        "@jridgewell/sourcemap-codec": "^1.4.15"

      },
@@ -748,9 +795,9 @@ 
      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="

    },

    "node_modules/postcss": {

      "version": "8.4.35",

      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",

      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",

      "version": "8.4.38",

      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",

      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",

      "funding": [

        {

          "type": "opencollective",
@@ -768,7 +815,7 @@ 
      "dependencies": {

        "nanoid": "^3.3.7",

        "picocolors": "^1.0.0",

        "source-map-js": "^1.0.2"

        "source-map-js": "^1.2.0"

      },

      "engines": {

        "node": "^10 || ^12 || >=14"
@@ -790,9 +837,9 @@ 
      }

    },

    "node_modules/source-map-js": {

      "version": "1.0.3",

      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.3.tgz",

      "integrity": "sha512-H/5Vyeo/I1hqIdOS0m1Q63OPr0yFdZLaiVkr8ap/WyIVGdU3PyoOV/HXY8+PJE2M43+n11FY5zWQnNRNnD1UFg==",

      "version": "1.2.0",

      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",

      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",

      "engines": {

        "node": ">=0.10.0"

      }
@@ -889,6 +936,25 @@ 
          "optional": true

        }

      }

    },

    "node_modules/vue-i18n": {

      "version": "9.11.0",

      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.11.0.tgz",

      "integrity": "sha512-vU4gY6lu8Pdfs9BgKGiDAJmFDf88cceR47KcSB0VW4xJzUrXR/7qwqM7A8dQ2nedhoIDxoOm5Ro4pFd2KvJqbA==",

      "dependencies": {

        "@intlify/core-base": "9.11.0",

        "@intlify/shared": "9.11.0",

        "@vue/devtools-api": "^6.5.0"

      },

      "engines": {

        "node": ">= 16"

      },

      "funding": {

        "url": "https://github.com/sponsors/kazupon"

      },

      "peerDependencies": {

        "vue": "^3.0.0"

      }

    }

  }

}