From 05d971b394fb1f1890db59a154389243b7876564 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Tue, 27 Aug 2024 02:09:18 -0700 Subject: [PATCH] pkgs: use dedicated flake for manga-tui --- flake.lock | 179 +++++++++++++++++++++++++++++++++++-------- flake.nix | 2 + overlays/default.nix | 3 +- 3 files changed, 149 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index a18ba31..0c30e5a 100755 --- a/flake.lock +++ b/flake.lock @@ -91,6 +91,27 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "manga-tui", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724006180, + "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -325,6 +346,24 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -554,6 +593,27 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" } }, + "manga-tui": { + "inputs": { + "crane": "crane_2", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1724635557, + "narHash": "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg=", + "owner": "josueBarretogit", + "repo": "manga-tui", + "rev": "e24c9686eefe78826eca2b0d480973d2ad5df348", + "type": "github" + }, + "original": { + "owner": "josueBarretogit", + "repo": "manga-tui", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -576,7 +636,7 @@ }, "nix-darwin_2": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1716329735, @@ -617,9 +677,9 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1719720211, @@ -637,15 +697,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -693,6 +756,19 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1687274257, + "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", + "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1716330097, "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", @@ -708,7 +784,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1724479785, "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", @@ -724,22 +800,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1724224976, @@ -772,6 +832,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -803,7 +879,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "personal-neovim", "nixvim", @@ -827,7 +903,7 @@ "personal-neovim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim" }, "locked": { @@ -881,9 +957,10 @@ "homebrew-core": "homebrew-core", "lanzaboote": "lanzaboote", "lix-module": "lix-module", + "manga-tui": "manga-tui", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable-small": "nixpkgs-unstable-small", "personal-neovim": "personal-neovim", "spicetify": "spicetify", @@ -934,6 +1011,27 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "manga-tui", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724206841, + "narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "spicetify": { "inputs": { "flake-compat": "flake-compat_4", @@ -1046,6 +1144,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1070,8 +1183,8 @@ }, "vesktop-bin": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1724592759, @@ -1105,7 +1218,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1724719995, diff --git a/flake.nix b/flake.nix index 27eeb56..4173060 100755 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,8 @@ }; zen-browser.url = "github:youwen5/zen-browser-flake"; + + manga-tui.url = "github:josueBarretogit/manga-tui"; }; outputs = { diff --git a/overlays/default.nix b/overlays/default.nix index 6467f69..6bb7b41 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,8 +9,7 @@ in { nixpkgs.overlays = [ (self: super: { - manga-tui = bleedingpkgs.manga-tui; + manga-tui = inputs.manga-tui.packages.${pkgs.system}.default; }) - # inputs.zen-browser.overlays.default ]; }