From f553f295e37751ef24450cf1c5801912a3d235b4 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 17 Apr 2025 21:27:40 -0700 Subject: [PATCH 1/2] t-rec: moderinize --- pkgs/misc/t-rec/default.nix | 43 ++++++++++++++++++--------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index 5e8ff5be7ed1..b9b13483c7f5 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -1,55 +1,58 @@ { lib, stdenv, - imagemagick, - ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper, + imagemagick, libiconv, - Foundation, + ffmpeg, + versionCheckHook, + nix-update-script, }: - -let - binPath = lib.makeBinPath [ - imagemagick - ffmpeg - ]; -in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "t-rec"; version = "0.7.9"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g="; }; + cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY="; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Foundation ]; postInstall = '' - wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + wrapProgram "$out/bin/t-rec" --prefix PATH : "${ + lib.makeBinPath [ + imagemagick + ffmpeg + ] + }" ''; - useFetchCargoVendor = true; - cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; homepage = "https://github.com/sassman/t-rec-rs"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ + changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ hoverbear matthiasbeyer ]; mainProgram = "t-rec"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff9041c61f98..74462d6bb175 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16411,9 +16411,7 @@ with pkgs; tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { }; - t-rec = callPackage ../misc/t-rec { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + t-rec = callPackage ../misc/t-rec { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; From 91515e02ae291e317187cdc1f7346b672680114b Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 17 Apr 2025 21:29:34 -0700 Subject: [PATCH 2/2] t-rec: move to by-name --- pkgs/{misc/t-rec/default.nix => by-name/t-/t-rec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/t-rec/default.nix => by-name/t-/t-rec/package.nix} (100%) diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/by-name/t-/t-rec/package.nix similarity index 100% rename from pkgs/misc/t-rec/default.nix rename to pkgs/by-name/t-/t-rec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74462d6bb175..cfab10ea016b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16411,8 +16411,6 @@ with pkgs; tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { }; - t-rec = callPackage ../misc/t-rec { }; - twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; terminal-typeracer = callPackage ../applications/misc/terminal-typeracer {