From af292cd163813965164bfb54ff72867dded07d45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 13:02:46 +0200 Subject: [PATCH] protocol: fix build --- .../networking/protocol/default.nix | 21 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 6690a75485b..535cc3aa317 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,8 +1,12 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib +, python3 +, fetchFromGitHub +}: -buildPythonApplication { - pname = "protocol-unstable"; - version = "2019-03-28"; +python3.pkgs.buildPythonApplication rec { + pname = "protocol"; + version = "unstable-2019-03-28"; + format = "setuptools"; src = fetchFromGitHub { owner = "luismartingarcia"; @@ -11,10 +15,15 @@ buildPythonApplication { sha256 = "13l10jhf4vghanmhh3pn91b2jdciispxy0qadz4n08blp85qn9cm"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "scripts=['protocol', 'constants.py', 'specs.py']" "scripts=['protocol'], py_modules=['constants', 'specs']" + ''; + meta = with lib; { - description = "An ASCII Header Generator for Network Protocols"; + description = "ASCII Header Generator for Network Protocols"; homepage = "https://github.com/luismartingarcia/protocol"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d99d208f71..a1056b931f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34417,7 +34417,7 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; - protocol = python3Packages.callPackage ../applications/networking/protocol { }; + protocol = callPackage ../applications/networking/protocol { }; pykms = callPackage ../tools/networking/pykms { };