From 4d5c03fa7fec2b6d9a4d55fe7435d61db2d6ac00 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 19 Nov 2024 16:07:21 +0100 Subject: [PATCH 1/4] omnom: 0-unstable-2024-08-29 -> 0-unstable-2024-10-01 --- pkgs/by-name/om/omnom/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 6d89e3005b4d..987f6dad7585 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "omnom"; - version = "0-unstable-2024-08-29"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; - rev = "1fcd7787886503f703bbcd31b193d4c93acc5610"; - hash = "sha256-o/n8rgngQkYEn8J0aFpCiD4qrWVFaaa305OxiscU6+8="; + rev = "5e82dd40a36b38572b12fa8cbee6097bb40b499d"; + hash = "sha256-IhiiabJZi+UFvtmgfxLBeuUghB64qiaR4zk3Yotld7g="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule { # `db.sqlite3` in a temporary directory since they need to be writeable. # # NOTE: Currently, `static/data` only holds the snapshots directory. - substituteInPlace config.yml \ + substituteInPlace config.yml_sample \ --replace-fail 'root: "./static/data"' 'root: "/tmp/omnom/static/data"' \ --replace-fail 'connection: "./db.sqlite3"' 'connection: "/tmp/omnom/db.sqlite3"' \ --replace-fail 'debug: true' 'debug: false' @@ -41,7 +41,7 @@ buildGoModule { postInstall = '' mkdir -p $out/share - cp -r config.yml static templates $out/share + cp -r config.yml_sample static templates $out/share wrapProgram $out/bin/omnom \ --chdir $out/share \ From 9e7cbd1095934de179850ec75ef44ed98bdb739a Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 19 Nov 2024 16:23:25 +0100 Subject: [PATCH 2/4] omnom: package Firefox and Chrome addons --- pkgs/by-name/om/omnom/package.nix | 41 ++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 987f6dad7585..2006eaaec624 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -3,9 +3,13 @@ buildGoModule, fetchFromGitHub, makeWrapper, + + # for addons + buildNpmPackage, + zip, }: -buildGoModule { +buildGoModule rec { pname = "omnom"; version = "0-unstable-2024-10-01"; @@ -39,6 +43,41 @@ buildGoModule { --replace-fail 'debug: true' 'debug: false' ''; + postBuild = + let + omnom-addons = buildNpmPackage { + pname = "omnom-addons"; + inherit version src; + + npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M="; + sourceRoot = "${src.name}/ext"; + npmPackFlags = [ "--ignore-scripts" ]; + + nativeBuildInputs = [ zip ]; + + postBuild = '' + mkdir -p $out + + zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js + + pushd build + zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json + zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json + popd + ''; + + postCheck = '' + npm run build-test + ''; + }; + in + '' + mkdir -p $out/share/addons + + # Copy Firefox and Chrome addons + cp -r ${omnom-addons}/*.zip $out/share/addons + ''; + postInstall = '' mkdir -p $out/share cp -r config.yml_sample static templates $out/share From f7729271c847d3fd4b96fda10855aa46c8aa4721 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 21 Nov 2024 00:32:16 +0100 Subject: [PATCH 3/4] omnom: don't wrap binary or patch config This is better handled using a service. --- pkgs/by-name/om/omnom/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 2006eaaec624..da1a126a4759 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -32,17 +32,6 @@ buildGoModule rec { "-w" ]; - postPatch = '' - # For the default config to work, we have to put `static/data` and - # `db.sqlite3` in a temporary directory since they need to be writeable. - # - # NOTE: Currently, `static/data` only holds the snapshots directory. - substituteInPlace config.yml_sample \ - --replace-fail 'root: "./static/data"' 'root: "/tmp/omnom/static/data"' \ - --replace-fail 'connection: "./db.sqlite3"' 'connection: "/tmp/omnom/db.sqlite3"' \ - --replace-fail 'debug: true' 'debug: false' - ''; - postBuild = let omnom-addons = buildNpmPackage { @@ -79,12 +68,10 @@ buildGoModule rec { ''; postInstall = '' - mkdir -p $out/share - cp -r config.yml_sample static templates $out/share + mkdir -p $out/share/examples - wrapProgram $out/bin/omnom \ - --chdir $out/share \ - --set-default GIN_MODE release + cp -r static templates $out/share + cp config.yml_sample $out/share/examples/config.yml ''; meta = { From bb3bf678201ff12abc2ffc516db77b0addb64487 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 21 Nov 2024 09:16:40 +0100 Subject: [PATCH 4/4] omnom: 0-unstable-2024-10-01 -> 0-unstable-2024-11-20 --- pkgs/by-name/om/omnom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index da1a126a4759..0b651a6451cf 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "omnom"; - version = "0-unstable-2024-10-01"; + version = "0-unstable-2024-11-20"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; - rev = "5e82dd40a36b38572b12fa8cbee6097bb40b499d"; - hash = "sha256-IhiiabJZi+UFvtmgfxLBeuUghB64qiaR4zk3Yotld7g="; + rev = "dbf40c9c50b74335286faea7c5070bba11dced83"; + hash = "sha256-dl0jfFwn+Fd8/aQNhXFNEoDIMgMia2MHZntp0EKhimg="; fetchSubmodules = true; };