Unverified Commit f2b40d13 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #302680 from kalekseev/pyright 

pyright: repackage using buildNpmPackage
parents 667f9683 90ace408

pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix

+2 −2
Original line number Diff line number Diff line 
{

  lib,

  nodePackages,

  pyright,

  vscode-utils,

}:
@@ -12,7 +12,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";

  };



  buildInputs = [ nodePackages.pyright ];

  buildInputs = [ pyright ];



  meta = {

    changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog";

pkgs/by-name/py/pyright/package-lock.json

0 → 100644
+193 −0
Original line number Diff line number Diff line 
{

  "name": "pyright-root",

  "lockfileVersion": 2,

  "requires": true,

  "packages": {

    "": {

      "name": "pyright-root",

      "hasInstallScript": true,

      "dependencies": {

        "glob": "^7.2.3",

        "jsonc-parser": "^3.2.1"

      }

    },

    "node_modules/balanced-match": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",

      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="

    },

    "node_modules/brace-expansion": {

      "version": "1.1.11",

      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",

      "dependencies": {

        "balanced-match": "^1.0.0",

        "concat-map": "0.0.1"

      }

    },

    "node_modules/concat-map": {

      "version": "0.0.1",

      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",

      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="

    },

    "node_modules/fs.realpath": {

      "version": "1.0.0",

      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",

      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="

    },

    "node_modules/glob": {

      "version": "7.2.3",

      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",

      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",

      "dependencies": {

        "fs.realpath": "^1.0.0",

        "inflight": "^1.0.4",

        "inherits": "2",

        "minimatch": "^3.1.1",

        "once": "^1.3.0",

        "path-is-absolute": "^1.0.0"

      },

      "engines": {

        "node": "*"

      },

      "funding": {

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

      }

    },

    "node_modules/inflight": {

      "version": "1.0.6",

      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",

      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",

      "dependencies": {

        "once": "^1.3.0",

        "wrappy": "1"

      }

    },

    "node_modules/inherits": {

      "version": "2.0.4",

      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="

    },

    "node_modules/jsonc-parser": {

      "version": "3.2.1",

      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",

      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="

    },

    "node_modules/minimatch": {

      "version": "3.1.2",

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

      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",

      "dependencies": {

        "brace-expansion": "^1.1.7"

      },

      "engines": {

        "node": "*"

      }

    },

    "node_modules/once": {

      "version": "1.4.0",

      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",

      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",

      "dependencies": {

        "wrappy": "1"

      }

    },

    "node_modules/path-is-absolute": {

      "version": "1.0.1",

      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",

      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",

      "engines": {

        "node": ">=0.10.0"

      }

    },

    "node_modules/wrappy": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="

    }

  },

  "dependencies": {

    "balanced-match": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",

      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="

    },

    "brace-expansion": {

      "version": "1.1.11",

      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",

      "requires": {

        "balanced-match": "^1.0.0",

        "concat-map": "0.0.1"

      }

    },

    "concat-map": {

      "version": "0.0.1",

      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",

      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="

    },

    "fs.realpath": {

      "version": "1.0.0",

      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",

      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="

    },

    "glob": {

      "version": "7.2.3",

      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",

      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",

      "requires": {

        "fs.realpath": "^1.0.0",

        "inflight": "^1.0.4",

        "inherits": "2",

        "minimatch": "^3.1.1",

        "once": "^1.3.0",

        "path-is-absolute": "^1.0.0"

      }

    },

    "inflight": {

      "version": "1.0.6",

      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",

      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",

      "requires": {

        "once": "^1.3.0",

        "wrappy": "1"

      }

    },

    "inherits": {

      "version": "2.0.4",

      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="

    },

    "jsonc-parser": {

      "version": "3.2.1",

      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",

      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="

    },

    "minimatch": {

      "version": "3.1.2",

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

      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",

      "requires": {

        "brace-expansion": "^1.1.7"

      }

    },

    "once": {

      "version": "1.4.0",

      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",

      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",

      "requires": {

        "wrappy": "1"

      }

    },

    "path-is-absolute": {

      "version": "1.0.1",

      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",

      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="

    },

    "wrappy": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="

    }

  }

}

pkgs/by-name/py/pyright/package.nix

0 → 100644
+75 −0
Original line number Diff line number Diff line 
{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:



let

  version = "1.1.359";



  src = fetchFromGitHub {

    owner = "Microsoft";

    repo = "pyright";

    rev = "${version}";

    hash = "sha256-gqMAfmYjYO6D9sRu+uJv4yJ/+csioFAwsUPBDF29VDs=";

  };



  patchedPackageJSON = runCommand "package.json" { } ''

    ${jq}/bin/jq '

      .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser"))

      | .scripts =  {  }

      ' ${src}/package.json > $out

  '';



  pyright-root = buildNpmPackage {

    pname = "pyright-root";

    inherit version src;

    npmDepsHash = "sha256-63kUhKrxtJhwGCRBnxBfOFXs2ARCNn+OOGu6+fSJey4=";

    dontNpmBuild = true;

    postPatch = ''

      cp ${patchedPackageJSON} ./package.json

      cp ${./package-lock.json} ./package-lock.json

    '';

    installPhase = ''

      runHook preInstall

      cp -r . "$out"

      runHook postInstall

    '';

  };



  pyright-internal = buildNpmPackage {

    pname = "pyright-internal";

    inherit version src;

    sourceRoot = "${src.name}/packages/pyright-internal";

    npmDepsHash = "sha256-p2KamNFJ3sJHmJm0MEPhI8L/8zAVzfc9NYy24rAdFcQ=";

    dontNpmBuild = true;

    installPhase = ''

      runHook preInstall

      cp -r . "$out"

      runHook postInstall

    '';

  };

in

buildNpmPackage rec {

  pname = "pyright";

  inherit version src;



  sourceRoot = "${src.name}/packages/pyright";

  npmDepsHash = "sha256-U7WdMIYg9U4fJ8YtDruMzloRS2BQAa2QWExle9uwPbU=";



  postPatch = ''

    chmod +w ../../

    ln -s ${pyright-root}/node_modules ../../node_modules

    chmod +w ../pyright-internal

    ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules

  '';



  dontNpmBuild = true;



  passthru.updateScript = ./update.sh;



  meta = {

    changelog = "https://github.com/Microsoft/pyright/releases/tag/${version}";

    description = "Type checker for the Python language";

    homepage = "https://github.com/Microsoft/pyright";

    license = lib.licenses.mit;

    mainProgram = "pyright";

    maintainers = with lib.maintainers; [ kalekseev ];

  };

}

pkgs/by-name/py/pyright/update.sh

0 → 100755
+44 −0
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

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

set -euo pipefail



version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/pyright/releases/latest | jq -r '.tag_name | sub("^v"; "")')



update-source-version pyright "$version"



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

FILE_PATH="$root/package.nix"

REPO_URL_PREFIX="https://github.com/microsoft/pyright/raw"

TEMP_DIR=$(mktemp -d)



trap 'rm -rf "$TEMP_DIR"' EXIT



# Function to download `package-lock.json` for a given source path and update hash

update_hash() {

    local source_root_path="$1"

    local existing_hash="$2"



    # Formulate download URL

    local download_url="${REPO_URL_PREFIX}/${version}${source_root_path}/package-lock.json"



    # Download package-lock.json to temporary directory

    curl -fsSL -o "${TEMP_DIR}/package-lock.json" "$download_url"



    # Calculate the new hash

    local new_hash

    new_hash=$(prefetch-npm-deps "${TEMP_DIR}/package-lock.json")



    # Update npmDepsHash in the original file

    sed -i "s|$existing_hash|${new_hash}|" "$FILE_PATH"

}



while IFS= read -r source_root_line; do

    [[ "$source_root_line" =~ sourceRoot ]] || continue

    source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/')



    # Extract the current npmDepsHash for this sourceRoot

    existing_hash=$(grep -A1 "$source_root_line" "$FILE_PATH" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/')



    # Call the function to download and update the hash

    update_hash "$source_root_path" "$existing_hash"

done < "$FILE_PATH"

pkgs/development/node-packages/main-programs.nix

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
  purs-tidy = "purs-tidy";

  purty = "purty";

  pscid = "pscid";

  pyright = "pyright";

  remod-cli = "remod";

  svelte-language-server = "svelteserver";

  teck-programmer = "teck-firmware-upgrade";