From fcf3c29623e3e2f04d546510ae12ee1d1df0c7dd Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 8 Sep 2024 07:51:50 +0000 Subject: [PATCH 1/2] trunk-io: move to by-name --- .../trunk-io/default.nix => by-name/tr/trunk-io/package.nix} | 0 pkgs/{development/tools => by-name/tr}/trunk-io/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/trunk-io/default.nix => by-name/tr/trunk-io/package.nix} (100%) rename pkgs/{development/tools => by-name/tr}/trunk-io/update.sh (100%) diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/by-name/tr/trunk-io/package.nix similarity index 100% rename from pkgs/development/tools/trunk-io/default.nix rename to pkgs/by-name/tr/trunk-io/package.nix diff --git a/pkgs/development/tools/trunk-io/update.sh b/pkgs/by-name/tr/trunk-io/update.sh similarity index 100% rename from pkgs/development/tools/trunk-io/update.sh rename to pkgs/by-name/tr/trunk-io/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7deff9c7b8c4..0d5287c7fa83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13292,8 +13292,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; - trunk-io = callPackage ../development/tools/trunk-io { }; - trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; From 7d19fce17692055a2ac0f57d828210b2a327d482 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 8 Sep 2024 07:55:17 +0000 Subject: [PATCH 2/2] trunk-io: 1.3.1 -> 1.3.2 --- pkgs/by-name/tr/trunk-io/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trunk-io/package.nix b/pkgs/by-name/tr/trunk-io/package.nix index 8990dc934113..cb02c0b393d0 100644 --- a/pkgs/by-name/tr/trunk-io/package.nix +++ b/pkgs/by-name/tr/trunk-io/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "trunk-io"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; - hash = "sha256-kiUcc7RFPo7UWzEe2aQ2nrbI3GZ/zfxOlOdWw7YFoAs="; + hash = "sha256-zrfnPWHFoFQkVtxPedKrL1Y1xLZSDX3JuF0qgo/hhnE="; }; dontUnpack = true; @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://trunk.io/"; description = "Developer experience toolkit used to check, test, merge, and monitor code"; license = licenses.unfree; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aaronjheng ]; }; })