diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index f5c903e14d39..d78a4cc74c05 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,25 +14,24 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.20.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - sha256 = "sha256-J8ediRreV80lzPcKIOSl1CNHp04ZW9ePyNyejlN50cE="; + sha256 = "sha256-wsfbG4VAS3U3voDdry35QlWknlWIfThZQalf9S/9GO0="; }; - vendorSha256 = "sha256-V8asyi1Nm+h3KK/loBRZQN6atfEGUEdRydeZsp9wyQY="; + vendorSha256 = "sha256-8g3jhxKIT0EGUXh0hrvDbw3i04khqlAfGzM6k4q3O8g="; ui = mkYarnPackage { inherit version; src = "${src}/ui"; - # update pomerium-ui-package.json when updating package, sourced from ui/package.json - packageJSON = ./pomerium-ui-package.json; + packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = "sha256:1n6swanrds9hbd4yyfjzpnfhsb8fzj1pwvvcg3w7b1cgnihclrmv"; + sha256 = lib.fileContents ./yarn-hash; }; buildPhase = '' diff --git a/pkgs/servers/http/pomerium/pomerium-ui-package.json b/pkgs/servers/http/pomerium/package.json similarity index 98% rename from pkgs/servers/http/pomerium/pomerium-ui-package.json rename to pkgs/servers/http/pomerium/package.json index 6b9dcf4a3e8d..37227248672c 100644 --- a/pkgs/servers/http/pomerium/pomerium-ui-package.json +++ b/pkgs/servers/http/pomerium/package.json @@ -29,7 +29,7 @@ "@fontsource/dm-sans": "^4.5.1", "@mui/icons-material": "^5.3.1", "@mui/material": "^5.4.0", - "luxon": "^2.3.0", + "luxon": "^2.5.2", "markdown-to-jsx": "^7.1.7", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/pkgs/servers/http/pomerium/yarn-hash b/pkgs/servers/http/pomerium/yarn-hash new file mode 100644 index 000000000000..fec5f1f3c7e8 --- /dev/null +++ b/pkgs/servers/http/pomerium/yarn-hash @@ -0,0 +1 @@ +085nghha82q30b3vgzs76xsa85kbxqk7mjrknxxc5z7awrjhdmkb