From ac06d8d3433f5bb8ad5c3b132d52ad2586228744 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Sun, 15 Aug 2021 03:22:35 -0700 Subject: [PATCH 1/6] linuxPackages.ply: 1.0.beta1-9e810b1 -> 2.1.1 --- pkgs/os-specific/linux/ply/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index e62716e47967..af076e937626 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -3,7 +3,7 @@ assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; let - version = "1.0.beta1-9e810b1"; + version = "2.1.1"; in stdenv.mkDerivation { pname = "ply"; inherit version; @@ -12,8 +12,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "iovisor"; repo = "ply"; - rev = "9e810b157ba079c32c430a7d4c6034826982056e"; - sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50"; + rev = "899afb0c35ba2191dd7aa21f13bc7fde2655c475"; + sha256 = "0mfnfczk6kw6p15nx5l735qmcnb0pkix7ngq0j8nndg7r2fsckah"; }; preAutoreconf = '' @@ -34,7 +34,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { - description = "dynamic Tracing in Linux"; + description = "Dynamic tracing in Linux"; homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; From 594d0501b6a02a2300c87b6e8e63fd2f33fbaeed Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Mon, 16 Aug 2021 23:08:02 -0700 Subject: [PATCH 2/6] Assign assertion to meta.broken --- pkgs/os-specific/linux/ply/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index af076e937626..44cce6870e97 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }: -assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; - let version = "2.1.1"; in stdenv.mkDerivation { @@ -38,5 +36,6 @@ in stdenv.mkDerivation { homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; + broken = lib.versionAtLeast kernel.version "4.0"; }; } From bcb2def465a16a224452d7be8333fbc54c8f2d53 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Mon, 16 Aug 2021 23:11:22 -0700 Subject: [PATCH 3/6] Switch to version tag for package revision --- pkgs/os-specific/linux/ply/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 44cce6870e97..aa8be5c6611d 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "iovisor"; repo = "ply"; - rev = "899afb0c35ba2191dd7aa21f13bc7fde2655c475"; + rev = version; sha256 = "0mfnfczk6kw6p15nx5l735qmcnb0pkix7ngq0j8nndg7r2fsckah"; }; From a07505d5181dcde3a6e0a817af16905dc04bc32e Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Tue, 17 Aug 2021 22:41:30 -0700 Subject: [PATCH 4/6] Reverse conditional in meta.broken --- pkgs/os-specific/linux/ply/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index aa8be5c6611d..a85c3c87cb80 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -36,6 +36,6 @@ in stdenv.mkDerivation { homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; - broken = lib.versionAtLeast kernel.version "4.0"; + broken = lib.versionOlder kernel.version "4.0"; }; } From cebb66308668299b89f897e38ea469d31f271e31 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Tue, 17 Aug 2021 22:42:23 -0700 Subject: [PATCH 5/6] Clarify specific GPL license --- pkgs/os-specific/linux/ply/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index a85c3c87cb80..0456efff1902 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Dynamic tracing in Linux"; homepage = "https://wkz.github.io/ply/"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Only ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; broken = lib.versionOlder kernel.version "4.0"; }; From 637bb5d08591bc329b2a2f85e8c386add2e5ec57 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Tue, 17 Aug 2021 22:42:58 -0700 Subject: [PATCH 6/6] Update package version to fix build The build for the 2.1.1 release is broken, so I updated the packge version to use the newer commits to fix the build. --- pkgs/os-specific/linux/ply/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 0456efff1902..916aa39eee22 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,17 +1,16 @@ { lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }: -let - version = "2.1.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ply"; - inherit version; + version = "2.1.1-${lib.substring 0 7 src.rev}"; + nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ]; src = fetchFromGitHub { owner = "iovisor"; repo = "ply"; - rev = version; - sha256 = "0mfnfczk6kw6p15nx5l735qmcnb0pkix7ngq0j8nndg7r2fsckah"; + rev = "e25c9134b856cc7ffe9f562ff95caf9487d16b59"; + sha256 = "1178z7vvnjwnlxc98g2962v16878dy7bd0b2njsgn4vqgrnia7i5"; }; preAutoreconf = ''