antares: 0.7.24 -> 0.7.28

NixOS · Aug 25, 2024 · 74b132b · 74b132b
1 parent 8da188f
commit 74b132b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix
@@ -1,30 +1,37 @@
-{ fetchFromGitHub
-, lib
-, buildNpmPackage
-, electron
-, nodejs
+{
+ fetchFromGitHub,
+ lib,
+ buildNpmPackage,
+ electron,
+ nodejs,
+ fetchpatch,
 }:
 
 buildNpmPackage rec {
  pname = "antares";
- version = "0.7.24";
+ version = "0.7.28";
 
  src = fetchFromGitHub {
  owner = "antares-sql";
  repo = "antares";
  rev = "v${version}";
- hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI=";
+ hash = "sha256-zEoEAW68g9694Q284Qt5TCF+zMqxzhYa6GQw+dGnzEg=";
  };
 
- npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg=";
+ npmDepsHash = "sha256-3EeHLtqcEnWj70N3nlPHfztzmjVbzdb9f/va4GDRckc=";
+
+ patches = [
+ # In version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
+ # This patch will probably be removed in the next version
+ (fetchpatch {
+ url = "https://github.com/antares-sql/antares/commit/c2786808982a1cbcbbe7378c61b6788998d5ca25.patch";
+ hash = "sha256-W8UOEbClbnLBnMjcocuX1bQfsxEEiaC5qJNN8yhMzD0=";
+ })
+ ];
 
  buildInputs = [ nodejs ];
 
- buildPhase = ''
- runHook preBuild
- npm run compile
- runHook postBuild
- '';
+ npmBuildScript = "compile";
 
  installPhase = ''
  runHook preInstall
@@ -36,7 +43,7 @@ buildNpmPackage rec {
  runHook postInstall
  '';
 
- dontNpmBuild = true;
+ npmFlags = [ "--legacy-peer-deps" ];
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17348,7 +17348,7 @@ with pkgs;
  ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
 
  antares = callPackage ../by-name/an/antares/package.nix {
- electron = electron_29;
+ electron = electron_30;
  };
 
  antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };