build: expand base image to include all pinned apps

blaggacao · Jan 21, 2025 · 81cbc0a · 81cbc0a
1 parent 810ed28
commit 81cbc0a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 28 deletions.
diff --git a/apps/sources/config.toml b/apps/sources/config.toml
@@ -43,6 +43,7 @@ source = "github"
 github = "frappe/insights"
 use_max_tag = true
 submodules = true
+exclude_regex = '.*-beta$'
 
 [gameplan]
 source = "github"

diff --git a/apps/sources/insights.nix b/apps/sources/insights.nix
@@ -1,16 +1,16 @@
 {
   pname = "insights";
-  version = "v3.0.1-beta";
+  version = "v2.2.6";
   meta = {
-    url = "https://github.com/frappe/insights/releases/tag/v3.0.1-beta";
-    description = "Sources for insights (v3.0.1-beta)";
+    url = "https://github.com/frappe/insights/releases/tag/v2.2.6";
+    description = "Sources for insights (v2.2.6)";
   };
   src = builtins.fetchTree {
     type = "git";
     url = "[email protected]:frappe/insights.git";
     submodules = true;
-    narHash = "sha256-ShwElM2YfMobm4hup/ztgzM+reCpdEMwhxuTJKAOLZ8=";
-    rev = "bf0dd5648f0c20d0760917e9eba1d8662f79392d";
+    narHash = "sha256-ihSI55/2h31GqzhM6E4KvfI3kSJwhpHVOBGar+W8iGY=";
+    rev = "9e8acedb5cdbb75a5f446911519ba777633eac5c";
   };
   passthru = builtins.fromJSON ''{}'';
 }
diff --git a/apps/sources/newver.json b/apps/sources/newver.json
@@ -52,10 +52,10 @@
       "url": "https://github.com/frappe/hrms/releases/tag/v15.33.0"
     },
     "insights": {
-      "version": "v3.0.1-beta",
-      "gitref": "refs/tags/v3.0.1-beta",
-      "revision": "bf0dd5648f0c20d0760917e9eba1d8662f79392d",
-      "url": "https://github.com/frappe/insights/releases/tag/v3.0.1-beta"
+      "version": "v2.2.6",
+      "gitref": "refs/tags/v2.2.6",
+      "revision": "9e8acedb5cdbb75a5f446911519ba777633eac5c",
+      "url": "https://github.com/frappe/insights/releases/tag/v2.2.6"
     },
     "payments": {
       "version": "20240801.123129",
@@ -75,9 +75,9 @@
       "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.7.1"
     },
     "webshop": {
-      "version": "20241007.103637",
-      "revision": "5d35bcf50e19b2c4a54ed58a072de9836e5bfac9",
-      "url": "https://github.com/frappe/webshop/commit/5d35bcf50e19b2c4a54ed58a072de9836e5bfac9"
+      "version": "20241025.155637",
+      "revision": "a1151d0ea6469add0b30b4f540e1adb5ee8b830d",
+      "url": "https://github.com/frappe/webshop/commit/a1151d0ea6469add0b30b4f540e1adb5ee8b830d"
     },
     "wiki": {
       "version": "20241021.075720",

diff --git a/apps/sources/oldver.json b/apps/sources/oldver.json
@@ -52,10 +52,10 @@
       "url": "https://github.com/frappe/hrms/releases/tag/v15.33.0"
     },
     "insights": {
-      "version": "v3.0.1-beta",
-      "gitref": "refs/tags/v3.0.1-beta",
-      "revision": "bf0dd5648f0c20d0760917e9eba1d8662f79392d",
-      "url": "https://github.com/frappe/insights/releases/tag/v3.0.1-beta"
+      "version": "v2.2.6",
+      "gitref": "refs/tags/v2.2.6",
+      "revision": "9e8acedb5cdbb75a5f446911519ba777633eac5c",
+      "url": "https://github.com/frappe/insights/releases/tag/v2.2.6"
     },
     "payments": {
       "version": "20240801.123129",
@@ -75,9 +75,9 @@
       "url": "https://github.com/The-Commit-Company/Raven/releases/tag/v1.7.1"
     },
     "webshop": {
-      "version": "20241007.103637",
-      "revision": "5d35bcf50e19b2c4a54ed58a072de9836e5bfac9",
-      "url": "https://github.com/frappe/webshop/commit/5d35bcf50e19b2c4a54ed58a072de9836e5bfac9"
+      "version": "20241025.155637",
+      "revision": "a1151d0ea6469add0b30b4f540e1adb5ee8b830d",
+      "url": "https://github.com/frappe/webshop/commit/a1151d0ea6469add0b30b4f540e1adb5ee8b830d"
     },
     "wiki": {
       "version": "20241021.075720",

diff --git a/apps/sources/webshop.nix b/apps/sources/webshop.nix
@@ -1,16 +1,16 @@
 {
   pname = "webshop";
-  version = "20241007.103637";
+  version = "20241025.155637";
   meta = {
-    url = "https://github.com/frappe/webshop/commit/5d35bcf50e19b2c4a54ed58a072de9836e5bfac9";
-    description = "Sources for webshop (20241007.103637)";
+    url = "https://github.com/frappe/webshop/commit/a1151d0ea6469add0b30b4f540e1adb5ee8b830d";
+    description = "Sources for webshop (20241025.155637)";
   };
   src = builtins.fetchTree {
     type = "github";
     owner = "frappe";
     repo = "webshop";
-    narHash = "sha256-3yUP0miuUTICPTGuTCf6qGanq2gdA4PkLhFjvEUhKYc=";
-    rev = "5d35bcf50e19b2c4a54ed58a072de9836e5bfac9";
+    narHash = "sha256-bvufqqUvJpTSwfNk2Mad3UmHLpwvv+nM0Vju6NTBWyo=";
+    rev = "a1151d0ea6469add0b30b4f540e1adb5ee8b830d";
   };
   passthru = builtins.fromJSON ''{}'';
 }
diff --git a/src/oci.nix b/src/oci.nix
@@ -24,7 +24,7 @@
       lib,
       ...
     }: {
-      _file = ./nixos.nix;
+      _file = ./oci.nix;
       imports = map (m: lib.modules.setDefaultModuleLocation m m) [
         ./oci/testrig.nix
       ];

diff --git a/src/oci/testrig.nix b/src/oci/testrig.nix
@@ -2,8 +2,16 @@
   oci.frappix = {
     name = "ghcr.io/blaggacao/frappix-test-oci";
     debug = false;
-    apps = with pkgs.frappix; [
-      erpnext
-    ];
+    apps = builtins.attrValues (builtins.removeAttrs pkgs.frappix [
+      "appSources"
+      "callPackage"
+      "newScope"
+      "overrideScope"
+      "overrideScope'"
+      "builder" # brakes via https://github.com/frappe/builder/commit/cae39ff422812b52d3c1b25ae4756669add794d1#commitcomment-148362353
+      "crm" # brakes via https://github.com/frappe/crm/commit/a439433977321188266ff38cdef09642e4166080#commitcomment-148363342
+      "drive" # waiting on https://github.com/blaggacao/frappix/pull/11
+      "hrms" # brakes via https://github.com/frappe/hrms/issues/2342
+    ]);
   };
 }