commit 522a1f16f969c9c2457f6fc97374d8e47759470f
parent ee710b35cfc6a07a7f8d8a7c64def9c833f0ba66
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Tue, 21 Oct 2025 19:25:48 +0200
parent ee710b35cfc6a07a7f8d8a7c64def9c833f0ba66
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Tue, 21 Oct 2025 19:25:48 +0200
package.json: update deps
3 files changed, 75 insertions(+), 61 deletions(-)
diff --git a/flake.nix b/flake.nix @@ -4,71 +4,85 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - outputs = inputs: let - forAllSystems = function: - inputs.nixpkgs.lib.genAttrs [ - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - ] (system: function (import inputs.nixpkgs { - system = system; - overlays = [ inputs.self.overlays.default ]; - })); + outputs = + inputs: + let + forAllSystems = + function: + inputs.nixpkgs.lib.genAttrs + [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ] + ( + system: + function ( + import inputs.nixpkgs { + system = system; + overlays = [ inputs.self.overlays.default ]; + } + ) + ); - in { + in + { - packages = forAllSystems (pkgs: { - default = pkgs.oeffisearch; - trainsearch = pkgs.oeffisearch; - }); + packages = forAllSystems (pkgs: { + default = pkgs.oeffisearch; + trainsearch = pkgs.oeffisearch; + }); - devShells = forAllSystems (pkgs: { - default = pkgs.mkShell { - buildInputs = with pkgs; [ - nodePackages.pnpm - nginx - ]; - shellHook = '' - export NODE_OPTIONS=--openssl-legacy-provider - sed "s?PWD?$(pwd)?g" < ./nginx.conf > /tmp/nginx-oeffisearch.conf - pnpm install - pnpm dev - exit - ''; - }; - }); + devShells = forAllSystems (pkgs: { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + nodePackages.pnpm + nginx + ]; + shellHook = '' + export NODE_OPTIONS=--openssl-legacy-provider + sed "s?PWD?$(pwd)?g" < ./nginx.conf > /tmp/nginx-oeffisearch.conf + pnpm install + pnpm dev + exit + ''; + }; + }); - overlays.default = final: prev: { - oeffisearch = final.stdenv.mkDerivation (finalAttrs: { - pname = "oeffisearch"; - version = finalAttrs.env.GIT_VERSION; - npmHash = "sha256-5+kJMAF+hAO4T8kfihRA7msBaVfj0HXVoRUppvPhGIo="; + overlays.default = final: prev: { + oeffisearch = final.stdenv.mkDerivation (finalAttrs: { + pname = "oeffisearch"; + version = finalAttrs.env.GIT_VERSION; + npmHash = "sha256-27P06lkKqApo32eL8GPh19OE9rT0d4NLopu2+ezWSps="; - src = inputs.self; + src = inputs.self; - nativeBuildInputs = [ - final.nodejs - final.pnpm.configHook - ]; + nativeBuildInputs = [ + final.nodejs + final.pnpm.configHook + ]; - pnpmDeps = final.pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = finalAttrs.npmHash; - }; + pnpmDeps = final.pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = finalAttrs.npmHash; + }; - env.GIT_VERSION = if (inputs.self.sourceInfo ? shortRev) then inputs.self.sourceInfo.shortRev else "dirty"; - env.GIT_COMMIT = if (inputs.self.sourceInfo ? rev) then inputs.self.sourceInfo.rev else "dirty"; - env.GIT_COMMITDATE = builtins.concatStringsSep "-" (builtins.match "(.{4})(.{2})(.{2}).*" inputs.self.lastModifiedDate); + env.GIT_VERSION = + if (inputs.self.sourceInfo ? shortRev) then inputs.self.sourceInfo.shortRev else "dirty"; + env.GIT_COMMIT = if (inputs.self.sourceInfo ? rev) then inputs.self.sourceInfo.rev else "dirty"; + env.GIT_COMMITDATE = builtins.concatStringsSep "-" ( + builtins.match "(.{4})(.{2})(.{2}).*" inputs.self.lastModifiedDate + ); - buildPhase = '' - pnpm build - ''; + buildPhase = '' + pnpm build + ''; - installPhase = '' - cp -r dist $out - ''; - }); + installPhase = '' + cp -r dist $out + ''; + }); + }; }; - }; }
diff --git a/package.json b/package.json @@ -13,7 +13,7 @@ "license": "AGPL-3.0", "dependencies": { "buffer": "^6.0.3", - "db-vendo-client": "^6.8.2", + "db-vendo-client": "^6.10.2", "hafas-client": "^6.3.5", "ics": "^3.8.1", "idb": "^8.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^6.0.3 version: 6.0.3 db-vendo-client: - specifier: ^6.8.2 - version: 6.8.2 + specifier: ^6.10.2 + version: 6.10.2 hafas-client: specifier: ^6.3.5 version: 6.3.5 @@ -1291,8 +1291,8 @@ packages: resolution: {integrity: sha512-GjcqpZhs+HeOvc2dnAJs2Uy3/b8zRNlvTfLCvqFe9J2JYOlQVyuYCjjdsPBTOmJol42sPToPs71wr03kTMVJDw==} engines: {node: '>=18'} - db-vendo-client@6.8.2: - resolution: {integrity: sha512-u/p7VJeVKoboI/hHkqBdc91qTISOwKlgBBahVQjgHf3V7Hho/dafknASpnqyt+yKmc2Xl4THteeRHvFLrecm3Q==} + db-vendo-client@6.10.2: + resolution: {integrity: sha512-3tYf9StNvwDUJlwHHsDWs5BGn4kYtrMaMN1H1TyMjMXkdHvD0AuZTt42+xAlEAWDELdhgAbH4iml+++d4COOPA==} engines: {node: '>=18'} debug@4.4.1: @@ -4060,7 +4060,7 @@ snapshots: ndjson: 2.0.0 qs: 6.14.0 - db-vendo-client@6.8.2: + db-vendo-client@6.10.2: dependencies: content-type: 1.0.5 cross-fetch: 4.1.0