refactor(zen-browser): use yae for dependency pinning

5 files changed, 36 insertions, 9 deletions

diff --git a/flake.nix b/flake.nix
index 3b71b1f..f2e2823 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,6 @@
       pre-commit-hooks,
       rui,
       self,
-      yae,
       ...
     }:
     flake-utils.lib.eachDefaultSystem (
@@ -43,6 +42,8 @@
             })
           ];
         };
+
+        yae = builtins.fromJSON (builtins.readFile "${self}/yae.json");
       in
       {
         packages = {
@@ -69,10 +70,10 @@
           thorium = pkgs.callPackage ./pkgs/thorium.nix { };
           yae = yae.packages.${system}.default;
           yaak = pkgs.callPackage ./pkgs/yaak.nix { };
-          zen-browser-bin = pkgs.callPackage ./pkgs/zen-browser-bin.nix { inherit pkgs self; };
+          zen-browser-bin = pkgs.callPackage ./pkgs/zen-browser-bin.nix { inherit pkgs self yae; };
 
           zen-browser-twilight-bin = pkgs.callPackage ./pkgs/zen-browser-twilight-bin.nix {
-            inherit pkgs self;
+            inherit pkgs self yae;
           };
         };
 
diff --git a/lib/zen-browser-bin.nix b/lib/zen-browser-bin.nix
index 8c6e952..c334366 100644
--- a/lib/zen-browser-bin.nix
+++ b/lib/zen-browser-bin.nix
@@ -18,7 +18,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-{ version, hash }:
+{
+  version,
+  hash ? "",
+  sha256 ? "",
+}:
 { pkgs }:
 let
   desktopItem = pkgs.makeDesktopItem {
@@ -79,7 +83,7 @@ pkgs.stdenv.mkDerivation rec {
   pname = "zen-browser-bin";
 
   src = pkgs.fetchzip {
-    inherit hash;
+    inherit hash sha256;
 
     url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2";
   };
diff --git a/pkgs/zen-browser-bin.nix b/pkgs/zen-browser-bin.nix
index 0cb6c02..4efd9bc 100644
--- a/pkgs/zen-browser-bin.nix
+++ b/pkgs/zen-browser-bin.nix
@@ -1,5 +1,10 @@
-{ pkgs, self }:
+{
+  pkgs,
+  self,
+  yae,
+}:
 import "${self}/lib/zen-browser-bin.nix" {
+  inherit (yae.zen-browser-bin) sha256;
+
   version = "1.0.1-a.7";
-  hash = "sha256-0EYfH8hFStQMpxn5YZ/EP4vX8sn4bGmWobpZgygTi7Y=";
 } { inherit pkgs; }
diff --git a/pkgs/zen-browser-twilight-bin.nix b/pkgs/zen-browser-twilight-bin.nix
index 5c316a1..7ae875a 100644
--- a/pkgs/zen-browser-twilight-bin.nix
+++ b/pkgs/zen-browser-twilight-bin.nix
@@ -1,5 +1,10 @@
-{ pkgs, self }:
+{
+  pkgs,
+  self,
+  yae,
+}:
 import "${self}/lib/zen-browser-bin.nix" {
+  inherit (yae.zen-browser-twilight-bin) sha256;
+
   version = "twilight";
-  hash = "sha256-MAUJpJE3rqBcDAJqKwM8gCaRuAft32OvC75DSdctDHU=";
 } { inherit pkgs; }
diff --git a/yae.json b/yae.json
new file mode 100644
index 0000000..3462f25
--- /dev/null
+++ b/yae.json
@@ -0,0 +1,12 @@
+{
+  "zen-browser-bin": {
+    "url": "https://github.com/zen-browser/desktop/releases/download/1.0.1-a.7/zen.linux-specific.tar.bz2",
+    "sha256": "1dlb2cl86ndsl6b6jv7qr7rdg2rzqjgn3y8rlw6d8jj5r0giyinh",
+    "unpack": true
+  },
+  "zen-browser-twilight-bin": {
+    "url": "https://github.com/zen-browser/desktop/releases/download/twilight/zen.linux-specific.tar.bz2",
+    "sha256": "1rppq9swq65ck98lm4skbd5jaxslbz72ijnh66z8c580wwbca2da",
+    "unpack": true
+  }
+}