From aaa50e707a4e58bc6a84ef505f1a19e3f1028e6c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 27 Jun 2024 14:12:38 +0200 Subject: [PATCH 1/3] linuxptp: 4.2 -> 4.3 Switch src from sourcefourge to Github. Update homepage --- pkgs/os-specific/linux/linuxptp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index de215024555d..1b35b195a383 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, linuxHeaders } : +{ lib, stdenv, fetchFromGitHub, linuxHeaders } : stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.2"; + version = "4.3"; - src = fetchurl { - url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - hash = "sha256-cOOOXSdk4CF0Q9pvFOiEb+QBpHIpOsE42EGcB6ZlRHo="; + src = fetchFromGitHub { + owner = "nwtime"; + repo = "linuxptp"; + rev = "v${version}"; + hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI="; }; postPatch = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "https://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.nwtime.org"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; From 34c951329b6aaaddc6ad401d30c758f85d5a4d1b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 27 Jun 2024 14:31:03 +0200 Subject: [PATCH 2/3] linuxptp: split outputs -> out, man --- pkgs/os-specific/linux/linuxptp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 1b35b195a383..c02297002fd9 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI="; }; + outputs = [ "out" "man" ]; + postPatch = '' substituteInPlace incdefs.sh --replace \ '/usr/include/linux/' "${linuxHeaders}/include/linux/" From 8f2ec0d69082062460d32311a431184ebfbf2612 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 29 Jun 2024 00:01:31 +0200 Subject: [PATCH 3/3] linuxptp: switch to substituteInPlace --replace-fail --- pkgs/os-specific/linux/linuxptp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index c02297002fd9..23f79e7f6653 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; postPatch = '' - substituteInPlace incdefs.sh --replace \ + substituteInPlace incdefs.sh --replace-fail \ '/usr/include/linux/' "${linuxHeaders}/include/linux/" '';