Unverified Commit c48488e0 authored by Andrew Fontaine's avatar Andrew Fontaine
Browse files

gitlab-duo: 8.67.0 -> 8.89.0 

- Add ripgrep to the PATH for code search tool path
- Add SUPPORTED_TARGETS env to only build required package
- Add nodejs to upgrade script for npm
- Add --no-ext-diff to upgrade script to ensure well-formed patches
parent 754abcbb

pkgs/by-name/gi/gitlab-duo/missing-hashes.patch

+616 −940

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/gi/gitlab-duo/package.nix

+10 −8
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ 
  patch-package,

  stdenv,

  versionCheckHook,

  ripgrep,

}:

buildNpmPackage (finalAttrs: {

  pname = "gitlab-duo";

  version = "8.67.0";

  version = "8.89.0";



  # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version

  nodejs = nodejs_22;
@@ -21,7 +22,7 @@ buildNpmPackage (finalAttrs: { 
    owner = "editor-extensions";

    repo = "gitlab-lsp";

    tag = "v${finalAttrs.version}";

    hash = "sha256-GnL3720MwiWtC7lHA4CrfiZUTeOV+ytWFii16OKGbAM=";

    hash = "sha256-AiC0xxk8d/2rvRGm31vWqRuJ7nzMrITTGabv7v1LpOA=";

  };



  patches = [
@@ -30,13 +31,9 @@ buildNpmPackage (finalAttrs: { 
    ./missing-hashes.patch

  ];



  # PATCH: Only build for the current platform, not all targets

  postPatch = ''

    sed -i 's/SUPPORTED_TARGETS=".\+"/SUPPORTED_TARGETS="bun-$TARGET"/' packages/cli/scripts/compile_executables.sh

  '';



  npmFlags = [ "--install-links" ];

  npmDepsHash = "sha256-9b73NGu3GO5Sgus7BZ7WvOaXBvQ3UrW9BUTk6NwH+uY=";

  npmDepsHash = "sha256-U/dwfYZqy/1CM+Emz1w44mAzY24Z8vKWBXSzSqeVmnY=";

  npmRebuildFlags = [ "--ignore-scripts" ];

  npmBuildScript = "build:binary";

  npmWorkspace = "@gitlab/duo-cli";

  nativeBuildInputs = [
@@ -48,6 +45,8 @@ buildNpmPackage (finalAttrs: { 
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true";

  env.PUPPETEER_SKIP_DOWNLOAD = "true";

  env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";

  env.SUPPORTED_TARGETS = "bun-${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";

  env.SKIP_RIPGREP_BUNDLE = 1;



  postConfigure = ''

    patchShebangs --build ./packages/cli/scripts
@@ -59,6 +58,9 @@ buildNpmPackage (finalAttrs: { 


    install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo



    wrapProgram $out/bin/duo \

      --prefix PATH : ${lib.getExe ripgrep}



    runHook postInstall

  '';

pkgs/by-name/gi/gitlab-duo/update.sh

+2 −2
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix

#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix nodejs_22

set -euo pipefail



# Get new Gitlab Duo release
@@ -45,7 +45,7 @@ npm install --package-lock-only --ignore-scripts 
npm-lockfile-fix package-lock.json

npmDepsHash="$(prefetch-npm-deps package-lock.json)"

git add -A

patch="$(git diff --cached)"

patch="$(git diff --cached --no-ext-diff)"

popd



# Update nix expression with new hashes