Unverified Commit 600f03d7 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

flclash: 0.8.70 -> 0.8.76 (#382400)

parents 700cc1b1 af9e6a7c

pkgs/by-name/fl/flclash/package.nix

+28 −23
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  flutter324,

  flutter327,

  keybinder3,

  libayatana-appindicator,

  buildGoModule,

  makeDesktopItem,

  copyDesktopItems,

  wrapGAppsHook3,

  autoPatchelfHook,

}:



let

  pname = "flclash";

  version = "0.8.70";

  version = "0.8.76";



  src =

    (fetchFromGitHub {

      owner = "chen08209";

      repo = "FlClash";

      tag = "v${version}";

      hash = "sha256-6gDkRqbAGqwF+HCThWAHK0Jh/dxaYlnaYaAiXN48z5E=";

      hash = "sha256-LNHaleqh3eAQcfYSz7xIaWeNUtmlFXOyG2S7zz2+XeI=";

      fetchSubmodules = true;

    }).overrideAttrs

      (_: {
@@ -26,12 +27,21 @@ let 
        GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";

        GIT_CONFIG_VALUE_0 = "git@github.com:";

      });



  metaCommon = {

    description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";

    homepage = "https://github.com/chen08209/FlClash";

    license = with lib.licenses; [ gpl3Plus ];

    maintainers = with lib.maintainers; [ ];

  };



  libclash = buildGoModule {

    inherit pname version src;

    inherit version src;

    pname = "libclash";



    modRoot = "./core";

    modRoot = "core";



    vendorHash = "sha256-yam3DgY/dfwIRc7OvFltwX29x6xGlrrsK4Oj6oaGYRw=";

    vendorHash = "sha256-p6GE97n5/ZCIjgmfL//2doRW/PGpUtjeKxhRs/aveus=";



    env.CGO_ENABLED = 0;
@@ -44,22 +54,16 @@ let 
      runHook postBuild

    '';



    meta = {

      description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";

      homepage = "https://github.com/chen08209/FlClash";

      license = with lib.licenses; [ gpl3Plus ];

      maintainers = with lib.maintainers; [ ];

    };

    meta = metaCommon;

  };

in

flutter324.buildFlutterApplication {

flutter327.buildFlutterApplication {

  inherit pname version src;



  pubspecLock = lib.importJSON ./pubspec.lock.json;



  nativeBuildInputs = [

    copyDesktopItems

    wrapGAppsHook3

    autoPatchelfHook

  ];
@@ -88,20 +92,21 @@ flutter324.buildFlutterApplication { 
  ];



  preBuild = ''

    mkdir -p ./libclash/linux/

    cp ${libclash}/bin/FlClashCore ./libclash/linux/FlClashCore

    mkdir -p libclash/linux

    cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore

  '';



  postInstall = ''

    install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png

    install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png

  '';



  meta = {

    description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";

    homepage = "https://github.com/chen08209/FlClash";

  passthru = {

    inherit libclash;

    updateScript = ./update.sh;

  };



  meta = metaCommon // {

    mainProgram = "FlClash";

    license = with lib.licenses; [ gpl3Plus ];

    maintainers = with lib.maintainers; [ ];

    platforms = lib.platforms.linux;

  };

}

pkgs/by-name/fl/flclash/pubspec.lock.json

+78 −88
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ 
      "dependency": "direct main",

      "description": {

        "name": "cached_network_image",

        "sha256": "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819",

        "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "3.4.0"

      "version": "3.4.1"

    },

    "cached_network_image_platform_interface": {

      "dependency": "transitive",
@@ -190,11 +190,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "cached_network_image_web",

        "sha256": "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996",

        "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "1.3.0"

      "version": "1.3.1"

    },

    "characters": {

      "dependency": "transitive",
@@ -206,16 +206,6 @@ 
      "source": "hosted",

      "version": "1.3.0"

    },

    "charcode": {

      "dependency": "transitive",

      "description": {

        "name": "charcode",

        "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "1.3.1"

    },

    "checked_yaml": {

      "dependency": "transitive",

      "description": {
@@ -270,11 +260,11 @@ 
      "dependency": "direct main",

      "description": {

        "name": "connectivity_plus",

        "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3",

        "sha256": "e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "6.1.0"

      "version": "6.1.1"

    },

    "connectivity_plus_platform_interface": {

      "dependency": "transitive",
@@ -336,6 +326,16 @@ 
      "source": "hosted",

      "version": "0.7.10"

    },

    "defer_pointer": {

      "dependency": "direct main",

      "description": {

        "name": "defer_pointer",

        "sha256": "d69e6f8c1d0f052d2616cc1db3782e0ea73f42e4c6f6122fd1a548dfe79faf02",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "0.0.2"

    },

    "device_info_plus": {

      "dependency": "direct main",

      "description": {
@@ -350,11 +350,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "device_info_plus_platform_interface",

        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",

        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "7.0.1"

      "version": "7.0.2"

    },

    "dio": {

      "dependency": "direct main",
@@ -396,6 +396,16 @@ 
      "source": "hosted",

      "version": "0.0.5"

    },

    "equatable": {

      "dependency": "transitive",

      "description": {

        "name": "equatable",

        "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.0.7"

    },

    "fake_async": {

      "dependency": "transitive",

      "description": {
@@ -440,21 +450,21 @@ 
      "dependency": "direct main",

      "description": {

        "name": "file_picker",

        "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",

        "sha256": "c2376a6aae82358a9f9ccdd7d1f4006d08faa39a2767cce01031d9f593a8bd3b",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "8.0.7"

      "version": "8.1.6"

    },

    "file_selector_linux": {

      "dependency": "transitive",

      "description": {

        "name": "file_selector_linux",

        "sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",

        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "0.9.3"

      "version": "0.9.3+2"

    },

    "file_selector_macos": {

      "dependency": "transitive",
@@ -690,16 +700,6 @@ 
      "source": "hosted",

      "version": "4.0.2"

    },

    "image": {

      "dependency": "direct main",

      "description": {

        "name": "image",

        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "4.3.0"

    },

    "image_picker": {

      "dependency": "direct main",

      "description": {
@@ -714,11 +714,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "image_picker_android",

        "sha256": "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32",

        "sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "0.8.12+17"

      "version": "0.8.12+18"

    },

    "image_picker_for_web": {

      "dependency": "transitive",
@@ -794,31 +794,31 @@ 
      "dependency": "transitive",

      "description": {

        "name": "io",

        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",

        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "1.0.4"

      "version": "1.0.5"

    },

    "isolate_contactor": {

      "dependency": "transitive",

      "description": {

        "name": "isolate_contactor",

        "sha256": "f1be0a90f91e4309ef37cc45280b2a84e769e848aae378318dd3dd263cfc482a",

        "sha256": "6ba8434ceb58238a1389d6365111a3efe7baa1c68a66f4db6d63d351cf6c3a0f",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "4.2.0"

      "version": "4.1.0"

    },

    "isolate_manager": {

      "dependency": "transitive",

      "description": {

        "name": "isolate_manager",

        "sha256": "8fb916c4444fd408f089448f904f083ac3e169ea1789fd4d987b25809af92188",

        "sha256": "22ed0c25f80ec3b5f21e3a55d060f4650afff33f27c2dff34c0f9409d5759ae5",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "4.3.1"

      "version": "4.1.5+1"

    },

    "js": {

      "dependency": "transitive",
@@ -844,11 +844,11 @@ 
      "dependency": "direct dev",

      "description": {

        "name": "json_serializable",

        "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",

        "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "6.8.0"

      "version": "6.9.0"

    },

    "launch_at_startup": {

      "dependency": "direct main",
@@ -1024,31 +1024,31 @@ 
      "dependency": "transitive",

      "description": {

        "name": "package_config",

        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",

        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.1.0"

      "version": "2.1.1"

    },

    "package_info_plus": {

      "dependency": "direct main",

      "description": {

        "name": "package_info_plus",

        "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce",

        "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "8.1.1"

      "version": "8.1.2"

    },

    "package_info_plus_platform_interface": {

      "dependency": "transitive",

      "description": {

        "name": "package_info_plus_platform_interface",

        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",

        "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "3.0.1"

      "version": "3.0.2"

    },

    "path": {

      "dependency": "direct main",
@@ -1074,21 +1074,21 @@ 
      "dependency": "transitive",

      "description": {

        "name": "path_provider_android",

        "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",

        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.2.12"

      "version": "2.2.15"

    },

    "path_provider_foundation": {

      "dependency": "transitive",

      "description": {

        "name": "path_provider_foundation",

        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",

        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.4.0"

      "version": "2.4.1"

    },

    "path_provider_linux": {

      "dependency": "transitive",
@@ -1164,11 +1164,11 @@ 
      "dependency": "direct main",

      "description": {

        "name": "process_run",

        "sha256": "5736140acb1c54a11bd4c1e8d4821bfd684de69a4bf88835316cb05e596d8091",

        "sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "1.2.2"

      "version": "1.2.2+1"

    },

    "provider": {

      "dependency": "direct main",
@@ -1193,11 +1193,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "pub_semver",

        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",

        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.1.4"

      "version": "2.1.5"

    },

    "pubspec_parse": {

      "dependency": "transitive",
@@ -1303,31 +1303,31 @@ 
      "dependency": "direct main",

      "description": {

        "name": "shared_preferences",

        "sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82",

        "sha256": "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.3.3"

      "version": "2.5.1"

    },

    "shared_preferences_android": {

      "dependency": "transitive",

      "description": {

        "name": "shared_preferences_android",

        "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",

        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.3.3"

      "version": "2.4.0"

    },

    "shared_preferences_foundation": {

      "dependency": "transitive",

      "description": {

        "name": "shared_preferences_foundation",

        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",

        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.5.3"

      "version": "2.5.4"

    },

    "shared_preferences_linux": {

      "dependency": "transitive",
@@ -1383,11 +1383,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "shelf_web_socket",

        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",

        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.0.0"

      "version": "2.0.1"

    },

    "shortid": {

      "dependency": "transitive",
@@ -1469,11 +1469,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "sqflite_common",

        "sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490",

        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "2.5.4+5"

      "version": "2.5.4+6"

    },

    "sqflite_darwin": {

      "dependency": "transitive",
@@ -1569,11 +1569,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "timing",

        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",

        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "1.0.1"

      "version": "1.0.2"

    },

    "tray_manager": {

      "dependency": "direct main",
@@ -1629,31 +1629,31 @@ 
      "dependency": "transitive",

      "description": {

        "name": "url_launcher_ios",

        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",

        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "6.3.1"

      "version": "6.3.2"

    },

    "url_launcher_linux": {

      "dependency": "transitive",

      "description": {

        "name": "url_launcher_linux",

        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",

        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "3.2.0"

      "version": "3.2.1"

    },

    "url_launcher_macos": {

      "dependency": "transitive",

      "description": {

        "name": "url_launcher_macos",

        "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",

        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "3.2.1"

      "version": "3.2.2"

    },

    "url_launcher_platform_interface": {

      "dependency": "transitive",
@@ -1729,11 +1729,11 @@ 
      "dependency": "transitive",

      "description": {

        "name": "web",

        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",

        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "0.5.1"

      "version": "1.1.0"

    },

    "web_socket": {

      "dependency": "transitive",
@@ -1769,11 +1769,11 @@ 
      "dependency": "direct main",

      "description": {

        "name": "win32",

        "sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2",

        "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "5.8.0"

      "version": "5.9.0"

    },

    "win32_registry": {

      "dependency": "direct main",
@@ -1853,16 +1853,6 @@ 
      },

      "source": "hosted",

      "version": "2.2.1"

    },

    "zxing2": {

      "dependency": "direct main",

      "description": {

        "name": "zxing2",

        "sha256": "6cf995abd3c86f01ba882968dedffa7bc130185e382f2300239d2e857fc7912c",

        "url": "https://pub.dev"

      },

      "source": "hosted",

      "version": "0.2.3"

    }

  },

  "sdks": {

pkgs/by-name/fl/flclash/update.sh

0 → 100755
+20 −0
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update



set -eou pipefail



ROOT="$(dirname "$(readlink -f "$0")")"



latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)

latestVersion=$(echo "$latestTag" | sed 's/^v//')



currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"')



if [[ "$currentVersion" == "$latestVersion" ]]; then

    echo "package is up-to-date: $currentVersion"

    exit 0

fi



nix-update --subpackage libclash flclash



curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json