Unverified Commit cef748b8 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #257121 from NyCodeGHG/update-pgrok 

pgrok: move to node-packages.nix
parents 50dad20a d8b16f74

pkgs/development/node-packages/node-packages.json

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
, "patch-package"

, "peerflix"

, "peerflix-server"

, {"pgrok-build-deps": "../../tools/networking/pgrok/build-deps"}

, "pkg"

, "pm2"

, "pnpm"

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

+3361 −2502

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/networking/pgrok/add_version_to_package.json.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
diff --git a/package.json b/package.json

index 35d34c5..82eda74 100644

--- a/package.json

+++ b/package.json

@@ -1,5 +1,6 @@

 {

   "name": "pgrokd",

+  "version": "0.0.0",

   "scripts": {

     "dev": "vite",

     "build": "tsc && vite build --outDir=../cli/dist --emptyOutDir",

pkgs/tools/networking/pgrok/build-deps/package.json

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

  "name": "pgrokd",

  "scripts": {

    "dev": "vite",

    "build": "tsc && vite build --outDir=dist --emptyOutDir",

    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"

  },

  "version": "1.4.0",

  "dependencies": {

    "axios": "~1.4.0",

    "react": "~18.2.0",

    "react-dom": "~18.2.0",

    "react-router-dom": "~6.15.0",

    "@headlessui/react": "~1.7.17",

    "@heroicons/react": "~2.0.18",

    "@tailwindcss/forms": "~0.5.4",

    "@trivago/prettier-plugin-sort-imports": "~4.2.0",

    "@types/node": "~20.5.1",

    "@types/react": "~18.2.15",

    "@types/react-dom": "~18.2.7",

    "@typescript-eslint/eslint-plugin": "~6.0.0",

    "@typescript-eslint/parser": "~6.0.0",

    "@vitejs/plugin-react": "~4.0.3",

    "autoprefixer": "~10.4.15",

    "code-inspector-plugin": "v0.1.9",

    "eslint": "~8.45.0",

    "eslint-plugin-import": "~2.28.0",

    "eslint-plugin-react": "~7.33.2",

    "eslint-plugin-react-hooks": "~4.6.0",

    "eslint-plugin-react-refresh": "~0.4.3",

    "eslint-plugin-unicorn": "~48.0.1",

    "postcss": "~8.4.28",

    "prettier": "~3.0.2",

    "tailwindcss": "~3.3.3",

    "typescript": "~5.0.2",

    "vite": "~4.4.5"

  }

}

pkgs/tools/networking/pgrok/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -3,23 +3,22 @@ 
, callPackage

, fetchFromGitHub

}:

let

buildGoModule rec {

  pname = "pgrok";

  version = "1.4.0";



  src = fetchFromGitHub {

    owner = "pgrok";

    repo = "pgrok";

    rev = "v${version}";

    hash = "sha256-2k3XLXmf1Xnx4HvS7sD/aq+78Z4I7uY4djV958n5TX4=";

  };

  web = callPackage ./web.nix { inherit src version; };

in

buildGoModule {

  pname = "pgrok";

  inherit version src;



  vendorHash = "sha256-M0xVHRh9NKPxmUEmx1dDQUZc8aXcdAfHisQAnt72RdY=";



  outputs = [ "out" "server" "web" ];

  outputs = [ "out" "server" ];



  web = callPackage ./web.nix { inherit src version; };



  ldflags = [

    "-s"
@@ -43,7 +42,6 @@ buildGoModule { 


  postInstall = ''

    moveToOutput bin/pgrokd $server

    cp -r ${web} $web

  '';



  passthru.updateScript = ./update.sh;