diff --git a/flake.lock b/flake.lock index 3601be1..62e1a48 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7758d1a..9490079 100644 --- a/flake.nix +++ b/flake.nix @@ -8,75 +8,88 @@ nixpkgs, }: let system = "x86_64-linux"; - version = "1.0.2-b.5"; - downloadUrl.url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-x86_64.tar.bz2"; - downloadUrl.sha256 = "1xp0z86l7z661cwckgr623gwwjsy3h66900xqjq6dvgx5a3njbxi"; + + prepareUrl = version: arch: "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-${arch}.tar.bz2"; + + beta_version = "1.0.2-b.5"; + + # https://github.com/zen-browser/desktop/releases/download/1.0.2-b.5/zen.linux-x86_64.tar.bz2 + beta = { + url = prepareUrl beta_version "x86_64"; + sha256 = "1xp0z86l7z661cwckgr623gwwjsy3h66900xqjq6dvgx5a3njbxi"; + version = beta_version; + }; + + # https://github.com/zen-browser/desktop/releases/download/twilight/zen.linux-x86_64.tar.bz2 + twilight = { + url = prepareUrl "twilight" "x86_64"; + sha256 = "0j5dy58kammrz56j3id149k3kdnc0b2y7h03yq6l1n2fpklxq2kc"; + version = "twilight"; + }; pkgs = import nixpkgs {inherit system;}; - runtimeLibs = with pkgs; - [ - libGL - libGLU - libevent - libffi - libjpeg - libpng - libstartup_notification - libvpx - libwebp - stdenv.cc.cc - fontconfig - libxkbcommon - zlib - freetype - gtk3 - libxml2 - dbus - xcb-util-cursor - alsa-lib - libpulseaudio - pango - atk - cairo - gdk-pixbuf - glib - udev - libva - mesa - libnotify - cups - pciutils - ffmpeg - libglvnd - pipewire - speechd - ] - ++ (with pkgs.xorg; [ - libxcb - libX11 - libXcursor - libXrandr - libXi - libXext - libXcomposite - libXdamage - libXfixes - libXScrnSaver - ]); - - mkZen = {}: let - downloadData = downloadUrl; + mkZen = { + url, + sha256, + version, + }: let + runtimeLibs = with pkgs; + [ + libGL + libGLU + libevent + libffi + libjpeg + libpng + libstartup_notification + libvpx + libwebp + stdenv.cc.cc + fontconfig + libxkbcommon + zlib + freetype + gtk3 + libxml2 + dbus + xcb-util-cursor + alsa-lib + libpulseaudio + pango + atk + cairo + gdk-pixbuf + glib + udev + libva + mesa + libnotify + cups + pciutils + ffmpeg + libglvnd + pipewire + speechd + ] + ++ (with pkgs.xorg; [ + libxcb + libX11 + libXcursor + libXrandr + libXi + libXext + libXcomposite + libXdamage + libXfixes + libXScrnSaver + ]); in pkgs.stdenv.mkDerivation { inherit version; pname = "zen-browser"; - src = builtins.fetchTarball { - url = downloadData.url; - sha256 = downloadData.sha256; - }; - + src = builtins.fetchTarball {inherit url sha256;}; desktopSrc = ./.; phases = ["installPhase" "fixupPhase"]; @@ -130,6 +143,10 @@ meta.mainProgram = "zen"; }; in { - packages."${system}".default = mkZen {}; + packages."${system}" = { + default = mkZen beta; + beta = mkZen beta; + twilight = mkZen twilight; + }; }; }