vieb: 9.5.1 -> 9.6.0

pkgs/applications/networking/browsers/vieb/default.nix

@@ -1,25 +1,24 @@
-{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }:
+{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, nix-update-script, lib }:
 
-let
-  srcInfo = builtins.fromJSON (builtins.readFile ./pin.json);
-in
-mkYarnPackage rec {
+buildNpmPackage rec {
   pname = "vieb";
-  inherit (srcInfo) version;
+  version = "9.6.0";
 
   src = fetchFromGitHub {
     owner = "Jelmerro";
     repo = pname;
     rev = version;
-    inherit (srcInfo) sha256;
+    hash = "sha256-846yfD8B0/fX5cJOK62f/Uc+iS5WY0odKN7CXAUL6qY=";
   };
 
-  packageJSON = ./package.json;
-  yarnLock = ./yarn.lock;
-  yarnNix = ./yarn.nix;
-  yarnFlags = [ "--production" ];
+  postPatch = ''
+    sed -i '/"electron"/d' package.json
+  '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  npmDepsHash = "sha256-IOlYip1AXsqsjRD/5Cd/E+hsT3ZbXP7qSHfCDzESisc=";
+  dontNpmBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
 
   desktopItem = makeDesktopItem {
     name = "vieb";
@@ -37,25 +36,22 @@ mkYarnPackage rec {
   };
 
   postInstall = ''
-    unlink $out/libexec/vieb/deps/vieb/node_modules
-    ln -s $out/libexec/vieb/node_modules $out/libexec/vieb/deps/vieb/node_modules
-
     install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop
 
-    pushd $out/libexec/vieb/node_modules/vieb/app/img/icons
+    pushd $out/lib/node_modules/vieb/app/img/icons
     for file in *.png; do
       install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png
     done
     popd
 
     makeWrapper ${electron}/bin/electron $out/bin/vieb \
-      --add-flags $out/libexec/vieb/node_modules/vieb/app \
+      --add-flags $out/lib/node_modules/vieb/app \
       --set npm_package_version ${version}
   '';
 
   distPhase = ":"; # disable useless $out/tarballs directory
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script {};
 
   meta = with lib; {
     homepage = "https://vieb.dev/";

pkgs/applications/networking/browsers/vieb/package.json

@@ -1,49 +0,0 @@
-{
-  "name": "vieb",
-  "productName": "Vieb",
-  "version": "9.5.1",
-  "description": "Vim Inspired Electron Browser",
-  "main": "app/index.js",
-  "scripts": {
-    "dev": "electron app --datafolder=./ViebData/",
-    "fix": "eslint --fix app .eslintrc.js build.js",
-    "lint": "eslint app .eslintrc.js build.js",
-    "start": "electron app",
-    "test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u",
-    "test:all": "npm run test && npm run lint && echo 'All good :)'"
-  },
-  "repository": "https://github.com/Jelmerro/Vieb",
-  "homepage": "https://vieb.dev",
-  "keywords": [
-    "Vim",
-    "Electron",
-    "Browser",
-    "Internet"
-  ],
-  "author": "Jelmer van Arnhem",
-  "email": "Jelmerro@users.noreply.github.com",
-  "funding": "https://github.com/sponsors/Jelmerro/",
-  "license": "GPL-3.0-or-later",
-  "devDependencies": {
-    "electron": "22.0.3",
-    "electron-builder": "24.0.0-alpha.10",
-    "eslint": "8.32.0",
-    "eslint-plugin-sort-keys": "2.3.5",
-    "jest": "29.3.1",
-    "jest-environment-jsdom": "29.3.1",
-    "terser-webpack-plugin": "5.3.6",
-    "webpack": "5.75.0",
-    "webpack-cli": "5.0.1",
-    "webpack-node-externals": "3.0.0"
-  },
-  "dependencies": {
-    "@cliqz/adblocker-electron": "1.25.2",
-    "@cliqz/adblocker-electron-preload": "1.25.2",
-    "@mozilla/readability": "0.4.2",
-    "darkreader": "4.9.58",
-    "highlight.js": "11.7.0",
-    "jsdom": "21.0.0",
-    "marked": "4.2.12",
-    "picomatch": "2.3.1"
-  }
-}

pkgs/applications/networking/browsers/vieb/pin.json

@@ -1,4 +0,0 @@
-{
-  "version": "9.5.1",
-  "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw="
-}

pkgs/applications/networking/browsers/vieb/update.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash wget jq yarn yarn2nix nix-prefetch-github
-
-set -euo pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-if [ "$#" -gt 1 ] || [[ "${1:-}" == -* ]]; then
-  echo "Regenerates packaging data for the vieb package."
-  echo "Usage: $0 [git release tag]"
-  exit 1
-fi
-
-version="${1:-}"
-
-if [ -z "$version" ]; then
-  version="$(wget -O- "https://api.github.com/repos/Jelmerro/Vieb/releases?per_page=1" | jq -r '.[0].tag_name')"
-fi
-
-SRC="https://raw.githubusercontent.com/Jelmerro/Vieb/$version"
-
-tmpdir="$(mktemp -d --tmpdir update-vieb-XXXXXX)"
-pushd "$tmpdir"
-
-wget "$SRC/package-lock.json"
-wget "$SRC/package.json"
-yarn import
-yarn2nix >yarn.nix
-
-popd
-cp -ft . "$tmpdir/"{package.json,yarn.lock,yarn.nix}
-rm -rf "$tmpdir"
-
-src_hash=$(nix-prefetch-github Jelmerro Vieb --rev "${version}" | jq -r .sha256)
-
-cat > pin.json << EOF
-{
-  "version": "$version",
-  "sha256": "$src_hash"
-}
-EOF