summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorAnna Lee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2023-11-13 17:19:27 -0800
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-11-16 11:59:16 -0300
commit3655645e4c848b269fcba0bb15c606208788b8c3 (patch)
treea014e31c0f24ee963e67fb75c5dca963d7660916 /pkgs/os-specific/linux
parent841b8c6073c3825608217f982428e32cd07b758b (diff)
downloadnixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar.gz
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar.bz2
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar.lz
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar.xz
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.tar.zst
nixpkgs-3655645e4c848b269fcba0bb15c606208788b8c3.zip
trinity: 1.9 -> 1.9-unstable-2023-07-10; fix build
tags not updated since 2019. updating to last commit puts nixpkgs on par
with debian/ubuntu/Devuan/Kali distributions.

update homepage to github (same as debian) as old page
https://codemonkey.org.uk/projects/trinity/ is not reachable.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/trinity/default.nix23
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 09a2d8bf638..e0ab2b2802f 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,25 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "trinity";
-  version = "1.9";
+  version = "1.9-unstable-2023-07-10";
 
   src = fetchFromGitHub {
     owner = "kernelslacker";
     repo = "trinity";
-    rev = "v${version}";
-    sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv";
+    rev = "e71872454d26baf37ae1d12e9b04a73d64179555";
+    hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps=";
   };
 
-  patches = [
-    # Pull upstream fix for -fno-common toolchains
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch";
-      sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg";
-    })
-  ];
-
   postPatch = ''
     patchShebangs configure
     patchShebangs scripts
@@ -27,12 +18,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "DESTDIR=$(out)" ];
+  installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with lib; {
     description = "A Linux System call fuzz tester";
-    homepage = "https://codemonkey.org.uk/projects/trinity/";
-    license = licenses.gpl2;
+    homepage = "https://github.com/kernelslacker/trinity";
+    license = licenses.gpl2Only;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;
   };