From 13445d815bc6ccf0f2d2a5e535ac1f413b4a7ae3 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 2 Oct 2022 00:18:35 +0800 Subject: [PATCH 1/2] add: flake auto track latest commit --- default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index 112c3d356..7e9eb1820 100755 --- a/default.nix +++ b/default.nix @@ -4,15 +4,8 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.13.1"; - - src = fetchFromGitHub { - owner = "MetaCubeX"; - repo = "Clash.Meta"; - rev = "1684756b79a232ee8f875bcfd87371f5c0ef066b"; - sha256 = "sha256-7g/Wcll0w4EhPI+KodtLHINqaR2larQNnP9YAsgNiN4="; - }; - + version = "dev"; + src = ./.; vendorSha256 = "sha256-7HjYcoqWA5gvPUc5psCgy0UTc17CBzBJ/OiGvII/iBA="; # Do not build testing suit From 6dd8cf6c0a4290c22e4007e34c17f519c5315e35 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 2 Oct 2022 02:15:37 +0800 Subject: [PATCH 2/2] refactor: multi-platform support for nix build --- flake.lock | 6 +++--- flake.nix | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index df343f24d..01b818075 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1664614409, - "narHash": "sha256-5y+zhLMzc/k4NYnCfW+seM9oaNuUI/UeGMGPFRj8cR0=", + "lastModified": 1664638641, + "narHash": "sha256-r2gVLq9DD1A0Igv4AdkmpuuVykXmKVsJTAJinS/ZFrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b746456c6f6ef8404ef6011df5eceba8644c49a9", + "rev": "cb81a9ca94e7631bc67788d858e214d56571983a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 297a284f2..3e8fd5578 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,22 @@ inputs.utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, utils }: - (utils.lib.eachDefaultSystem + utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in - { - defaultPackages = pkgs.callPackage ./. { }; - }) - ); + packages = rec{ + clash-meta = pkgs.callPackage ./. { }; + default = clash-meta; + }; + + apps = rec { + clash-meta = utils.lib.mkApp { drv = self.packages.${system}.clash-meta; }; + default = clash-meta; + }; + } + ); } +