Unverified Commit 5ff63dfd authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #289105 from Scrumplex/pkgs/vencord/1.6.9 

vencord: 1.6.7 -> 1.6.9
parents 1cc3683a 71199adb

pkgs/misc/vencord/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
, buildWebExtension ? false

}:

let

  version = "1.6.7";

  gitHash = "8a168bd";

  version = "1.6.9";

  gitHash = "f1bdf38";

in

buildNpmPackage rec {

  pname = "vencord";
@@ -16,7 +16,7 @@ buildNpmPackage rec { 
    owner = "Vendicated";

    repo = "Vencord";

    rev = "v${version}";

    hash = "sha256-opQm0/nBt0O9iVPbLJAn5G2wPe20mhWroG0Y7ug3S7A=";

    hash = "sha256-ROdp/ZajDvePgTksncPigATkogd3q1OqHl3xPw33txU=";

  };



  ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
@@ -34,7 +34,7 @@ buildNpmPackage rec { 
  npmRebuildFlags = [ "|| true" ];



  makeCacheWritable = true;

  npmDepsHash = "sha256-78eZrnXRZwu365mKoBonrpy1fP/chVoQ2qIOhUkdWc8=";

  npmDepsHash = "sha256-55ggitOOHk4BdNq8AlV0n75eWAbiya5qGr0yCS8vNF4=";

  npmFlags = [ "--legacy-peer-deps" ];

  npmBuildScript = if buildWebExtension then "buildWeb" else "build";

  npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

pkgs/misc/vencord/package-lock.json

+38 −38
Original line number Diff line number Diff line 
{

    "name": "vencord",

    "version": "1.6.7",

    "version": "1.6.9",

    "lockfileVersion": 3,

    "requires": true,

    "packages": {

        "": {

            "name": "vencord",

            "version": "1.6.7",

            "version": "1.6.9",

            "license": "GPL-3.0-or-later",

            "dependencies": {

                "@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -894,9 +894,9 @@ 
            "dev": true

        },

        "node_modules/@types/node": {

            "version": "18.19.14",

            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.14.tgz",

            "integrity": "sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==",

            "version": "18.19.17",

            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.17.tgz",

            "integrity": "sha512-SzyGKgwPzuWp2SHhlpXKzCX0pIOfcI4V2eF37nNBJOhwlegQ83omtVQ1XxZpDE06V/d6AQvfQdPfnw0tRC//Ng==",

            "dev": true,

            "dependencies": {

                "undici-types": "~5.26.4"
@@ -915,9 +915,9 @@ 
            "dev": true

        },

        "node_modules/@types/react": {

            "version": "18.2.51",

            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz",

            "integrity": "sha512-XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg==",

            "version": "18.2.55",

            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz",

            "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==",

            "dev": true,

            "dependencies": {

                "@types/prop-types": "*",
@@ -926,9 +926,9 @@ 
            }

        },

        "node_modules/@types/react-dom": {

            "version": "18.2.18",

            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",

            "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",

            "version": "18.2.19",

            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.19.tgz",

            "integrity": "sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==",

            "dev": true,

            "dependencies": {

                "@types/react": "*"
@@ -941,9 +941,9 @@ 
            "dev": true

        },

        "node_modules/@types/semver": {

            "version": "7.5.6",

            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",

            "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",

            "version": "7.5.7",

            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",

            "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",

            "dev": true

        },

        "node_modules/@types/yauzl": {
@@ -1872,9 +1872,9 @@ 
            "dev": true

        },

        "node_modules/diff": {

            "version": "5.1.0",

            "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",

            "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",

            "version": "5.2.0",

            "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",

            "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",

            "dev": true,

            "engines": {

                "node": ">=0.3.1"
@@ -2306,9 +2306,9 @@ 
            }

        },

        "node_modules/escalade": {

            "version": "3.1.1",

            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",

            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",

            "version": "3.1.2",

            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",

            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",

            "dev": true,

            "engines": {

                "node": ">=6"
@@ -2670,9 +2670,9 @@ 
            }

        },

        "node_modules/fastq": {

            "version": "1.17.0",

            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",

            "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",

            "version": "1.17.1",

            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",

            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",

            "dev": true,

            "dependencies": {

                "reusify": "^1.0.4"
@@ -3052,9 +3052,9 @@ 
            }

        },

        "node_modules/hasown": {

            "version": "2.0.0",

            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",

            "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",

            "version": "2.0.1",

            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",

            "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",

            "dev": true,

            "dependencies": {

                "function-bind": "^1.1.2"
@@ -4052,9 +4052,9 @@ 
            }

        },

        "node_modules/postcss": {

            "version": "8.4.33",

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

            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",

            "version": "8.4.35",

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

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

            "dev": true,

            "funding": [

                {
@@ -4485,9 +4485,9 @@ 
            }

        },

        "node_modules/semver": {

            "version": "7.5.4",

            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",

            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",

            "version": "7.6.0",

            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",

            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",

            "dev": true,

            "dependencies": {

                "lru-cache": "^6.0.0"
@@ -4743,9 +4743,9 @@ 
            }

        },

        "node_modules/spdx-exceptions": {

            "version": "2.4.0",

            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz",

            "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==",

            "version": "2.5.0",

            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",

            "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",

            "dev": true

        },

        "node_modules/spdx-expression-parse": {
@@ -4759,9 +4759,9 @@ 
            }

        },

        "node_modules/spdx-license-ids": {

            "version": "3.0.16",

            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",

            "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",

            "version": "3.0.17",

            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",

            "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",

            "dev": true

        },

        "node_modules/split-string": {

pkgs/misc/vencord/update.sh

+6 −6
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#! nix-shell -I nixpkgs=../../.. -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs

#! nix-shell -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs

set -eou pipefail



pkgDir="$(dirname "$(readlink -f "$0")")"



tempDir=$(mktemp -d)



ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
@@ -15,10 +17,8 @@ npm install --legacy-peer-deps -f 
npmDepsHash=$(prefetch-npm-deps ./package-lock.json)

popd



pushd ../../..

update-source-version vencord "${latestTag#v}"

popd



sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i default.nix

sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix

cp "$tempDir/package-lock.json" package-lock.json
 
sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/default.nix"

sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/default.nix"

cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json"