From f4a1a8e76c9395de49d9ab85b9efc498db3e4949 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Wed, 11 Dec 2024 18:13:05 +0100 Subject: [PATCH] zen: update to 1.0.2-b1 --- flake.lock | 79 ++++++++++++++++++++++- flake.nix | 1 + overlay.nix | 9 ++- packages/x86_64-linux/zen-browser-bin.nix | 32 --------- 4 files changed, 86 insertions(+), 35 deletions(-) delete mode 100644 packages/x86_64-linux/zen-browser-bin.nix diff --git a/flake.lock b/flake.lock index 99cdaeb..ff394c3 100644 --- a/flake.lock +++ b/flake.lock @@ -1040,6 +1040,22 @@ "type": "github" } }, + "nixpkgs_11": { + "locked": { + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1676300157, @@ -1219,7 +1235,8 @@ "rust-overlay": "rust-overlay_3", "secrets": "secrets", "sops-nix": "sops-nix", - "youmubot": "youmubot" + "youmubot": "youmubot", + "zen-browser": "zen-browser" } }, "rust-analyzer-src": { @@ -1545,6 +1562,66 @@ "repo": "youmubot", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_11", + "zen-browser-aarch64": "zen-browser-aarch64", + "zen-browser-generic": "zen-browser-generic", + "zen-browser-specific": "zen-browser-specific" + }, + "locked": { + "lastModified": 1733866152, + "narHash": "sha256-r/uMP+ewTEoQLFaLa2EFktu9PCgOmat0xD1QvoPgwAY=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "ebb6df0cf500b36ce76bcd49a1ad246e66d9edc3", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" + } + }, + "zen-browser-aarch64": { + "flake": false, + "locked": { + "lastModified": 1733825278, + "narHash": "sha256-UkfTh+p+8D5qP8ZmcdiTIvUay0kNBjWA9Bi6OVZu/b8=", + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-aarch64.tar.bz2" + }, + "original": { + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-aarch64.tar.bz2" + } + }, + "zen-browser-generic": { + "flake": false, + "locked": { + "lastModified": 1733829638, + "narHash": "sha256-4gEnE+4v3A35ggUCZOkqBOXcRE7vAV2A+kEDhJ3gpAs=", + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-generic.tar.bz2" + }, + "original": { + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-generic.tar.bz2" + } + }, + "zen-browser-specific": { + "flake": false, + "locked": { + "lastModified": 1733830242, + "narHash": "sha256-nXDJ1ZGrGkMr6tdkMgDTFfXJLbzUDSuVMUM5i8g79Rg=", + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-specific.tar.bz2" + }, + "original": { + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.0/zen.linux-specific.tar.bz2" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8d3a2a8..8511cee 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki-dtth/phanpy?ref=dtth-fork"; conduit.url = "gitlab:famedly/conduit/v0.9.0"; nix-gaming.url = github:fufexan/nix-gaming; + zen-browser.url = "github:youwen5/zen-browser-flake"; # --- Sources kakoune.url = github:mawww/kakoune; diff --git a/overlay.nix b/overlay.nix index e0bff79..6a7a134 100644 --- a/overlay.nix +++ b/overlay.nix @@ -96,8 +96,13 @@ let ) ++ (with final; [ libiconv ]); }; - zen-browser-bin = final.callPackage ./packages/x86_64-linux/zen-browser-bin.nix { - nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ]; + zen-browser-bin = final.callPackage inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override { + wrap-firefox = opts: final.wrapFirefox (opts // { + nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ]; + }); + zen-browser-unwrapped = final.callPackage inputs.zen-browser.packages.${final.stdenv.system}.zen-browser-unwrapped.override { + sources = inputs.zen-browser.inputs; + }; }; }; in diff --git a/packages/x86_64-linux/zen-browser-bin.nix b/packages/x86_64-linux/zen-browser-bin.nix deleted file mode 100644 index 18d3d67..0000000 --- a/packages/x86_64-linux/zen-browser-bin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ appimageTools, fetchurl, nativeMessagingHosts ? [ ], ... }: -let - pname = "zen-browser-bin"; - version = "1.0.1-a.19"; - src = fetchurl { - url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-specific.AppImage"; - hash = "sha256-qAPZ4VyVmeZLRfL0kPHF75zyrSUFHKQUSUcpYKs3jk8="; - }; - - appimageContents = appimageTools.extract { - inherit pname version src; - }; - -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/${pname} $out/bin/zen - install -m 444 -D ${appimageContents}/zen.desktop $out/share/applications/zen.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/128x128/apps/zen.png \ - $out/share/icons/hicolor/128x128/apps/zen.png - - mkdir -p $out/lib/mozilla/native-messaging-hosts - for ext in ${toString nativeMessagingHosts}; do - ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* - done - ''; - - meta.mainProgram = "zen"; -} -