From 32bfb8144402363b4d18813c72724f2f3db0e222 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 17 Oct 2024 12:39:43 +0800 Subject: [PATCH 1/2] coz: 0.2.1 -> 0.2.2 --- pkgs/by-name/co/coz/package.nix | 52 +++++++++++++++------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix index 3bf4826b4dad..b6febad074cb 100644 --- a/pkgs/by-name/co/coz/package.nix +++ b/pkgs/by-name/co/coz/package.nix @@ -1,50 +1,46 @@ -{ lib, stdenv -, fetchFromGitHub -, libelfin -, ncurses -, python3 -, python3Packages -, makeWrapper +{ + lib, + docutils, + fetchFromGitHub, + libelfin, + ncurses, + pkg-config, + python3Packages, + makeWrapper, }: -stdenv.mkDerivation rec { + +python3Packages.buildPythonApplication rec { pname = "coz"; - version = "0.2.1"; + version = "0.2.2"; + pyproject = false; # Built with make src = fetchFromGitHub { owner = "plasma-umass"; repo = "coz"; rev = version; - hash = "sha256-DHpXKyqaDflD2olAXnyaxXvwsB3Tx4hKCeugxL0ZVG0="; + hash = "sha256-tvFXInxjodB0jEgEKgnOGapiVPomBG1hvrhYtG2X5jI="; }; - postPatch = '' - sed -i -e '/pid_t gettid/,+2d' libcoz/ccutil/thread.h - ''; - - postConfigure = '' - # This is currently hard-coded. Will be fixed in the next release. - sed -e "s|/usr/lib/|$out/lib/|" -i ./coz - ''; - nativeBuildInputs = [ + pkg-config ncurses - makeWrapper - python3Packages.wrapPython + docutils ]; buildInputs = [ + ncurses libelfin - (python3.withPackages (p: [ p.docutils ])) ]; - installPhase = '' - mkdir -p $out/share/man/man1 - make install prefix=$out + dependencies = [ python3Packages.docutils ]; - # fix executable includes + makeFlags = [ "prefix=${placeholder "out"}" ]; + + strictDeps = true; + + # fix executable includes + postInstall = '' chmod -x $out/include/coz.h - - wrapPythonPrograms ''; meta = { From f8299f4b1838ed7d316b6ce34bf3237a52d271b6 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 17 Oct 2024 12:41:16 +0800 Subject: [PATCH 2/2] coz: add aleksana to maintainers --- pkgs/by-name/co/coz/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix index b6febad074cb..90e08f176aaf 100644 --- a/pkgs/by-name/co/coz/package.nix +++ b/pkgs/by-name/co/coz/package.nix @@ -48,6 +48,9 @@ python3Packages.buildPythonApplication rec { description = "Profiler based on casual profiling"; mainProgram = "coz"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ + zimbatm + aleksana + ]; }; }