Unverified Commit 8dccb0de authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

flent: fix build (#351169)

parents d2382fe2 254ddffa

pkgs/applications/networking/flent/default.nix→pkgs/by-name/fl/flent/package.nix

+66 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonApplication,

  python3Packages,

  fetchPypi,

  procps,

  python,

  qt5,

  xvfb-run,

}:

buildPythonApplication rec {

python3Packages.buildPythonApplication rec {

  pname = "flent";

  version = "2.1.1";

  version = "2.2.0";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";

    hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg=";

  };



  buildInputs = [python.pkgs.sphinx];

  build-system = [ python3Packages.sphinx ];



  nativeBuildInputs = [ qt5.wrapQtAppsHook ];

  propagatedBuildInputs = [

    procps

    python.pkgs.matplotlib

    python.pkgs.pyqt5

    python.pkgs.qtpy



  dependencies = with python3Packages; [

    matplotlib

    pyqt5

    qtpy

  ];



  nativeCheckInputs = [

    python.pkgs.mock

    python3Packages.mock

    xvfb-run

  ];



  checkPhase = ''

    runHook preCheck



    # we want the gui tests to always run

    sed -i 's|self.skip|pass; #&|' unittests/test_gui.py



    export XDG_RUNTIME_DIR=$(mktemp -d)

    export HOME=$(mktemp -d)

    cat >test-runner <<EOF

    #!/bin/sh

    ${python.pythonOnBuildForHost.interpreter} nix_run_setup test

    ${python3Packages.python.interpreter} -m unittest discover

    EOF

    chmod +x test-runner

    wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH

    xvfb-run -s '-screen 0 800x600x24' ./test-runner



    runHook postCheck

  '';



  preFixup = ''

    makeWrapperArgs+=("''${qtWrapperArgs[@]}")

    makeWrapperArgs+=(

      "''${qtWrapperArgs[@]}"

      --prefix PATH : ${lib.makeBinPath [ procps ]}

    )

  '';



  meta = with lib; {

  meta = {

    description = "FLExible Network Tester";

    homepage = "https://flent.org";

    license = licenses.gpl3;



    maintainers = [maintainers.mmlb];

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ mmlb ];

    mainProgram = "flent";

  };

}

pkgs/applications/networking/flent/http-getter.nix→pkgs/by-name/ht/http-getter/package.nix

+12 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }:

{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  curl,

  pkg-config,

}:



stdenv.mkDerivation {

  pname = "http-getter";
@@ -11,7 +18,10 @@ stdenv.mkDerivation { 
    sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";

  };



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [

    cmake

    pkg-config

  ];

  buildInputs = [ curl ];



  meta = with lib; {

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -7506,8 +7506,6 @@ with pkgs; 














  flashrom = callPackage ../tools/misc/flashrom { };



























  flent = python3Packages.callPackage ../applications/networking/flent { };



























  flexoptix-app = callPackage ../tools/misc/flexoptix-app { };





























  flpsed = callPackage ../applications/editors/flpsed { };










@@ -8471,8 +8469,6 @@ with pkgs;



























  http-prompt = callPackage ../tools/networking/http-prompt { };



























  http-getter = callPackage ../applications/networking/flent/http-getter.nix { };



























  httpdump = callPackage ../tools/security/httpdump { };





























  httpie = with python3Packages; toPythonApplication httpie;