From dccbe20d9e8207171db3e5223c571081251a259c Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 25 Mar 2025 23:08:43 +0100 Subject: [PATCH 1/4] nettee: 0.3.4 -> 0.3.5, switch to SourceForge --- pkgs/tools/networking/nettee/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index ccdc96cd3c42..070c06d9c238 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -6,8 +6,8 @@ }: let - version = "0.3.4"; - sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; + version = "0.3.5"; + hash = "sha256-WeZ18CLexdWy8RlHNh0Oo/6KXxzShZT8/xklAWyB8ss="; in stdenv.mkDerivation { @@ -15,8 +15,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; - inherit sha256; + url = "mirror://sourceforge/nettee/nettee-${version}.tar.gz"; + inherit hash; }; meta = { From 84a3c4c87921f99faf92645fe10ab87f4861d585 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 25 Mar 2025 23:09:32 +0100 Subject: [PATCH 2/4] nettee: fix build, switch to CMake --- pkgs/tools/networking/nettee/default.nix | 82 ++++--------------- .../networking/nettee/fix-cmake-output.patch | 25 ++++++ 2 files changed, 43 insertions(+), 64 deletions(-) create mode 100644 pkgs/tools/networking/nettee/fix-cmake-output.patch diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index 070c06d9c238..949cf1bde017 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -2,81 +2,35 @@ stdenv, lib, fetchurl, - cleanPackaging, + cmake, + versionCheckHook, }: -let - version = "0.3.5"; - hash = "sha256-WeZ18CLexdWy8RlHNh0Oo/6KXxzShZT8/xklAWyB8ss="; - -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "nettee"; - inherit version; + version = "0.3.5"; src = fetchurl { - url = "mirror://sourceforge/nettee/nettee-${version}.tar.gz"; - inherit hash; + url = "mirror://sourceforge/nettee/nettee-${finalAttrs.version}.tar.gz"; + hash = "sha256-WeZ18CLexdWy8RlHNh0Oo/6KXxzShZT8/xklAWyB8ss="; }; + patches = [ ./fix-cmake-output.patch ]; + + nativeBuildInputs = [ cmake ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + meta = { - homepage = "http://saf.bio.caltech.edu/nettee.html"; + homepage = "https://sourceforge.net/projects/nettee"; description = ''Network "tee" program''; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.linux; mainProgram = "nettee"; }; - - outputs = [ - "bin" - "man" - "doc" - "out" - ]; - - patchPhase = '' - # h_addr field was removed - sed -e '1 i #define h_addr h_addr_list[0]' \ - -i nettee.c - ''; - - buildPhase = '' - cat README.TXT - mkdir -p $bin/bin - $CC -o $bin/bin/nettee \ - -Wall -pedantic -std=c99\ - -D_LARGEFILE64_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE\ - nettee.c rb.c nio.c - ''; - - installPhase = '' - ${ - cleanPackaging.commonFileActions { - docFiles = [ - "*.html" - "*.TXT" - "LICENSE" - "*.sh" - "topology.txt" - "beowulf.master" - "topology_info" - ]; - noiseFiles = [ - "*.c" - "*.h" - "nettee" - ]; - } - } $doc/share/doc/nettee - - mkdir -p $man/share/man/{man1,man3} - mv nettee.1 $man/share/man/man1 - mv nettee_cmd.3 $man/share/man/man3 - ''; - - postFixup = '' - ${cleanPackaging.checkForRemainingFiles} - ''; - -} +}) diff --git a/pkgs/tools/networking/nettee/fix-cmake-output.patch b/pkgs/tools/networking/nettee/fix-cmake-output.patch new file mode 100644 index 000000000000..205cfa36bc62 --- /dev/null +++ b/pkgs/tools/networking/nettee/fix-cmake-output.patch @@ -0,0 +1,25 @@ +Index: a/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,17 +6,18 @@ + SET(FS11 -D_POSIX_SOURCE) + endif (UNIX) + + #modify next line if a different installation target is required +-SET(CMAKE_INSTALL_PREFIX "/usr/local") +-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin) ++#SET(CMAKE_INSTALL_PREFIX "/usr/local") ++#SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin) + add_executable(nettee nettee.c rb.c nio.c) + ###add_executable(stub_child_process stub_child_process.c rb.c nio.c) + ###add_executable(stub_parent_process stub_parent_process.c rb.c nio.c) + # + target_compile_options(nettee PRIVATE ${FS9} ${FS10} ${FS11}) + ###target_compile_options(stub_child_process PRIVATE ${FS9} ${FS11}) + ###target_compile_options(stub_parent_process PRIVATE ${FS9} ${FS11}) ++install(TARGETS nettee DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + # + ##################################################### + # + #install man pages From 5a441fd2f27de02894449fbdb7aba487042772b0 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 25 Mar 2025 23:11:19 +0100 Subject: [PATCH 3/4] nettee: move to by-name/ --- .../networking => by-name/ne}/nettee/fix-cmake-output.patch | 0 .../nettee/default.nix => by-name/ne/nettee/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{tools/networking => by-name/ne}/nettee/fix-cmake-output.patch (100%) rename pkgs/{tools/networking/nettee/default.nix => by-name/ne/nettee/package.nix} (100%) diff --git a/pkgs/tools/networking/nettee/fix-cmake-output.patch b/pkgs/by-name/ne/nettee/fix-cmake-output.patch similarity index 100% rename from pkgs/tools/networking/nettee/fix-cmake-output.patch rename to pkgs/by-name/ne/nettee/fix-cmake-output.patch diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/by-name/ne/nettee/package.nix similarity index 100% rename from pkgs/tools/networking/nettee/default.nix rename to pkgs/by-name/ne/nettee/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4402029d4d5..20670836c15f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10235,10 +10235,6 @@ with pkgs; inherit (skawarePackages) cleanPackaging; }; - nettee = callPackage ../tools/networking/nettee { - inherit (skawarePackages) cleanPackaging; - }; - slibGuile = callPackage ../development/libraries/slib { scheme = guile; }; From 25feed0b26a86fbffc181135b2ccef577066fd58 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 25 Mar 2025 23:45:58 +0100 Subject: [PATCH 4/4] nettee: remove broken shell scripts --- pkgs/by-name/ne/nettee/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ne/nettee/package.nix b/pkgs/by-name/ne/nettee/package.nix index 949cf1bde017..5528cd19bc55 100644 --- a/pkgs/by-name/ne/nettee/package.nix +++ b/pkgs/by-name/ne/nettee/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # additional shell scripts require accudate (not in nixpkgs) + postInstall = '' + rm $out/bin/*.sh + ''; + nativeInstallCheckInputs = [ versionCheckHook ];