From c77b284a0eb5745b95924d6b962f8952fac2ee21 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 9 Jun 2026 13:49:34 -0500 Subject: [PATCH] fltrdr: migrate to finalAttrs, use tag and SRI hash, add strictDeps and structuredAttrs Assisted-by: Cursor Composer 2.5 fltrdr: migrate to by-name Assisted-by: Cursor Composer 2.5 --- .../fl/fltrdr/package.nix} | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 12 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/fltrdr/default.nix => by-name/fl/fltrdr/package.nix} (84%) diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/by-name/fl/fltrdr/package.nix similarity index 84% rename from pkgs/tools/misc/fltrdr/default.nix rename to pkgs/by-name/fl/fltrdr/package.nix index 1f5884f4fed8..7716f364b0fa 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/by-name/fl/fltrdr/package.nix @@ -3,19 +3,26 @@ stdenv, fetchFromGitHub, cmake, - icu, + icu63, openssl, }: -stdenv.mkDerivation rec { +let + icu = icu63; +in + +stdenv.mkDerivation (finalAttrs: { pname = "fltrdr"; version = "0.3.1"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; - rev = version; - sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj"; + tag = finalAttrs.version; + hash = "sha256-UpunS1PvcJTd1jzWFhBzKZ8z0fj+xfeDaO2yj/eJ7O4="; }; nativeBuildInputs = [ cmake ]; @@ -48,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; mainProgram = "fltrdr"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e33b38e0e8e..d1bb499f4f81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2153,10 +2153,6 @@ with pkgs; binutils = binutils-unwrapped; }; - fltrdr = callPackage ../tools/misc/fltrdr { - icu = icu63; - }; - file = callPackage ../tools/misc/file { inherit (windows) libgnurx; };