chore: update to new unified zen browser flake

This commit is contained in:
Youwen Wu 2024-11-11 23:54:23 -08:00
parent 27f22ecc19
commit 4bfb254c0c
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
3 changed files with 8 additions and 81 deletions

View file

@ -289,24 +289,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -728,18 +710,6 @@
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1710695816,
@ -804,22 +774,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plugins-lsp-progress": { "plugins-lsp-progress": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -899,8 +853,7 @@
"vesktop-bin": "vesktop-bin", "vesktop-bin": "vesktop-bin",
"viminal": "viminal", "viminal": "viminal",
"wallpapers": "wallpapers", "wallpapers": "wallpapers",
"zen-browser": "zen-browser", "zen-browser": "zen-browser"
"zen-browser-source": "zen-browser-source_2"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -1203,6 +1156,8 @@
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"zen-browser",
"zen-browser-source",
"nixpkgs" "nixpkgs"
], ],
"zen-browser-source": "zen-browser-source" "zen-browser-source": "zen-browser-source"
@ -1223,7 +1178,9 @@
}, },
"zen-browser-source": { "zen-browser-source": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": [
"flake-parts"
],
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
@ -1239,27 +1196,6 @@
"repo": "zen-browser-source-flake", "repo": "zen-browser-source-flake",
"type": "github" "type": "github"
} }
},
"zen-browser-source_2": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1731292739,
"narHash": "sha256-c0ED1Yu1AamD3RXsH1kLvvP8gdhGp/HB8AJfzJw7Ph0=",
"owner": "youwen5",
"repo": "zen-browser-source-flake",
"rev": "dc72f9d9456cd732ad9eb78f8e3d676aa807d554",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-source-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -91,11 +91,8 @@
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.zen-browser-source.inputs.flake-parts.follows = "flake-parts";
}; };
zen-browser-source.url = "github:youwen5/zen-browser-source-flake";
zen-browser-source.inputs.flake-parts.follows = "flake-parts";
}; };
outputs = outputs =

View file

@ -12,13 +12,7 @@ in
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
zen-browser = zen-browser = inputs.zen-browser.packages.${system}.default;
if system == "x86_64-linux" then
inputs.zen-browser.packages.${system}.default
else if system == "aarch64-linux" then
inputs.zen-browser-source.packages.${system}.default
else
null;
}) })
]; ];
} }