diff --git a/pkgs/by-name/po/pomerium/package.json b/pkgs/by-name/po/pomerium/package.json deleted file mode 100644 index eb48ee5cab7b..000000000000 --- a/pkgs/by-name/po/pomerium/package.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "name": "pomerium", - "version": "1.0.0", - "main": "src/index.tsx", - "license": "Apache-2.0", - "scripts": { - "build": "ts-node ./scripts/esbuild.ts", - "format": "prettier --write .", - "lint": "eslint .", - "watch": "ts-node ./scripts/esbuild.ts --watch" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "dependencies": { - "@babel/core": "^7.0.0", - "@emotion/react": "^11.7.1", - "@emotion/styled": "^11.11.0", - "@fontsource/dm-mono": "^5.0.14", - "@fontsource/dm-sans": "^5.0.13", - "@mui/icons-material": "^5.14.9", - "@mui/material": "^5.4.0", - "lodash": "^4.17.21", - "markdown-to-jsx": "^7.2.1", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-feather": "^2.0.10" - }, - "devDependencies": { - "@trivago/prettier-plugin-sort-imports": "^4.2.1", - "@types/lodash": "^4.17.1", - "@types/node": "^20.12.11", - "@types/react": "^17.0.34", - "@types/react-dom": "^17.0.11", - "@typescript-eslint/eslint-plugin": "^5.10.2", - "@typescript-eslint/parser": "^5.59.11", - "esbuild": "^0.25.0", - "eslint": "7.32.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-react": "^7.28.0", - "prettier": "^2.4.1", - "ts-node": "^10.9.1", - "typescript": "^5.1.3" - }, - "prettier": { - "importOrder": [ - "^[./]" - ], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true - } -} diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index 29cdd4ffb67c..80dd0bd31fb4 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -1,10 +1,13 @@ { + stdenv, buildGoModule, fetchFromGitHub, lib, envoy, - mkYarnPackage, + yarnConfigHook, + yarnBuildHook, fetchYarnDeps, + nodejs, nixosTests, pomerium-cli, }: @@ -29,29 +32,27 @@ buildGoModule rec { vendorHash = "sha256-mOTjBH8VqsMdyW5jTIZ76bf55WnHw9XuUSh6zsBktt0="; - ui = mkYarnPackage { + ui = stdenv.mkDerivation { + pname = "pomerium-ui"; inherit version; src = "${src}/ui"; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = lib.fileContents ./yarn-hash; + hash = "sha256-V2nSSMvTCK+SYmEhTbLMArIOmNs/AgB5xfhQGx3e/x8="; }; - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall - cp -R deps/pomerium/dist $out + cp -R dist $out runHook postInstall ''; - - doDist = false; }; subPackages = [ diff --git a/pkgs/by-name/po/pomerium/updater.sh b/pkgs/by-name/po/pomerium/updater.sh index 0df47268ca96..4ba7ef103a74 100755 --- a/pkgs/by-name/po/pomerium/updater.sh +++ b/pkgs/by-name/po/pomerium/updater.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnugrep coreutils curl wget jq nix-update prefetch-yarn-deps +#! nix-shell -i bash -p gnugrep coreutils curl jq nix-update prefetch-yarn-deps set -euo pipefail pushd "$(dirname "${BASH_SOURCE[0]}")" @@ -14,10 +14,6 @@ if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then exit 0 fi -rm -f package.json yarn.lock -wget "$url/ui/yarn.lock" "$url/ui/package.json" -echo $(prefetch-yarn-deps) > yarn-hash -rm -f yarn.lock - popd nix-update pomerium --version $version +nix-update pomerium --version=skip --subpackage ui diff --git a/pkgs/by-name/po/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash deleted file mode 100644 index 579ad09e4e27..000000000000 --- a/pkgs/by-name/po/pomerium/yarn-hash +++ /dev/null @@ -1 +0,0 @@ -07zzvqfinl7qqmwh00izvfc0xch2rjr4s8b1ca9ay26krd4d4sap