From 8ec46932828001c7a9ad548a2e14cd40603bd5dd Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 26 Jun 2026 12:03:49 -0500 Subject: [PATCH 1/3] ostinato: move all args out of top-level Assisted-by: Cursor Composer 2.5 --- pkgs/applications/networking/ostinato/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 09001da1999b..a921d13a83fe 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -9,7 +9,7 @@ makeDesktopItem, qtbase, qtscript, - protobuf, + protobuf_21, libpcap, wireshark, gzip, @@ -17,7 +17,9 @@ gawk, libnl, }: - +let + protobuf = protobuf_21; +in stdenv.mkDerivation rec { pname = "ostinato"; version = "1.3.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb26534613f..23e7642ec1c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9198,9 +9198,7 @@ with pkgs; ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { - protobuf = protobuf_21; - }; + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; pcmanfm-qt = lxqt.pcmanfm-qt; From 1a4dd4c9842ddea5fea3330ff6f08cb89b71b85f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 26 Jun 2026 12:06:04 -0500 Subject: [PATCH 2/3] ostinato: migrate to by-name Assisted-by: Cursor Composer 2.5 --- .../os}/ostinato/drone_ini.patch | 0 .../os/ostinato/package.nix} | 23 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 10 insertions(+), 15 deletions(-) rename pkgs/{applications/networking => by-name/os}/ostinato/drone_ini.patch (100%) rename pkgs/{applications/networking/ostinato/default.nix => by-name/os/ostinato/package.nix} (95%) diff --git a/pkgs/applications/networking/ostinato/drone_ini.patch b/pkgs/by-name/os/ostinato/drone_ini.patch similarity index 100% rename from pkgs/applications/networking/ostinato/drone_ini.patch rename to pkgs/by-name/os/ostinato/drone_ini.patch diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/by-name/os/ostinato/package.nix similarity index 95% rename from pkgs/applications/networking/ostinato/default.nix rename to pkgs/by-name/os/ostinato/package.nix index a921d13a83fe..a2940e3f4a41 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/by-name/os/ostinato/package.nix @@ -3,12 +3,9 @@ stdenv, fetchFromGitHub, fetchurl, - qmake, + qt5, copyDesktopItems, - wrapQtAppsHook, makeDesktopItem, - qtbase, - qtscript, protobuf_21, libpcap, wireshark, @@ -19,6 +16,11 @@ }: let protobuf = protobuf_21; + + ostinatoIcon = fetchurl { + url = "https://ostinato.org/images/site-logo.png"; + sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; + }; in stdenv.mkDerivation rec { pname = "ostinato"; @@ -31,23 +33,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo="; }; - ostinatoIcon = fetchurl { - url = "https://ostinato.org/images/site-logo.png"; - sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; - }; - buildInputs = [ - qtbase + qt5.qtbase protobuf libpcap - qtscript + qt5.qtscript libnl ]; nativeBuildInputs = [ copyDesktopItems - qmake - wrapQtAppsHook + qt5.qmake + qt5.wrapQtAppsHook ]; patches = [ ./drone_ini.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23e7642ec1c7..eac80393c4c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9198,8 +9198,6 @@ with pkgs; ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; - pcmanfm-qt = lxqt.pcmanfm-qt; pijuice = with python3Packages; toPythonApplication pijuice; From 514cce26ef677decc6dafb2ff6b70274b2c7e0d7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 26 Jun 2026 12:12:59 -0500 Subject: [PATCH 3/3] ostinato: use finalAttrs and enable strictDeps Switch fetchers to hash/tag, and add qtscript and protobuf to nativeBuildInputs so qmake and protoc remain available under strictDeps. Assisted-by: Cursor Composer 2.5 --- pkgs/by-name/os/ostinato/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/os/ostinato/package.nix b/pkgs/by-name/os/ostinato/package.nix index a2940e3f4a41..c7bae24b536b 100644 --- a/pkgs/by-name/os/ostinato/package.nix +++ b/pkgs/by-name/os/ostinato/package.nix @@ -19,18 +19,21 @@ let ostinatoIcon = fetchurl { url = "https://ostinato.org/images/site-logo.png"; - sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; + hash = "sha256-9cBngj8pNOTTWNdvZaND79aa14OnrqvXq0zjzQNJDXA="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ostinato"; version = "1.3.0"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; - rev = "v${version}"; - sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo="; }; buildInputs = [ @@ -45,6 +48,8 @@ stdenv.mkDerivation rec { copyDesktopItems qt5.qmake qt5.wrapQtAppsHook + qt5.qtscript + protobuf ]; patches = [ ./drone_ini.patch ]; @@ -91,4 +96,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rick68 ]; platforms = with lib.platforms; linux ++ darwin ++ cygwin; }; -} +})