c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

ostinato: migrate to by-name, refactor (#535747)

Browse source
This commit is contained in:
Weijia Wang 2026-07-06 12:39:09 +00:00 • committed by GitHub
commit a3b23a411f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

0
pkgs/applications/networking/ostinato/drone_ini.patch → pkgs/by-name/os/ostinato/drone_ini.patch
View file

40
pkgs/applications/networking/ostinato/default.nix → pkgs/by-name/os/ostinato/package.nix
View file

@ -3,13 +3,10 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchurl, fetchurl,
qmake, qt5,
copyDesktopItems, copyDesktopItems,
wrapQtAppsHook,
makeDesktopItem, makeDesktopItem,
qtbase, protobuf_21,
qtscript,
protobuf,
libpcap, libpcap,
wireshark, wireshark,
gzip, gzip,
@ -17,35 +14,42 @@
gawk, gawk,
libnl, libnl,
}: }:
let
protobuf = protobuf_21;
stdenv.mkDerivation rec { ostinatoIcon = fetchurl {
url = "https://ostinato.org/images/site-logo.png";
hash = "sha256-9cBngj8pNOTTWNdvZaND79aa14OnrqvXq0zjzQNJDXA=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "ostinato"; pname = "ostinato";
version = "1.3.0"; version = "1.3.0";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pstavirs"; owner = "pstavirs";
repo = "ostinato"; repo = "ostinato";
rev = "v${version}"; tag = "v${finalAttrs.version}";
sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo="; hash = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
};
ostinatoIcon = fetchurl {
url = "https://ostinato.org/images/site-logo.png";
sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
}; };
buildInputs = [ buildInputs = [
qtbase qt5.qtbase
protobuf protobuf
libpcap libpcap
qtscript qt5.qtscript
libnl libnl
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
copyDesktopItems copyDesktopItems
qmake qt5.qmake
wrapQtAppsHook qt5.wrapQtAppsHook
qt5.qtscript
protobuf
]; ];
patches = [ ./drone_ini.patch ]; patches = [ ./drone_ini.patch ];
@ -92,4 +96,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ rick68 ]; maintainers = with lib.maintainers; [ rick68 ];
platforms = with lib.platforms; linux ++ darwin ++ cygwin; platforms = with lib.platforms; linux ++ darwin ++ cygwin;
}; };
} })

4
pkgs/top-level/all-packages.nix
View file

@ -9171,10 +9171,6 @@ with pkgs;
ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
protobuf = protobuf_21;
};
pcmanfm-qt = lxqt.pcmanfm-qt; pcmanfm-qt = lxqt.pcmanfm-qt;
pijuice = with python3Packages; toPythonApplication pijuice; pijuice = with python3Packages; toPythonApplication pijuice;