From a60bf9d8bcebbf3fc39fcdf69748b8e3811f47f6 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 9 Nov 2024 17:03:14 +0000 Subject: [PATCH 1/2] python312Packages.graph-tool: 2.78 -> 2.79 https://git.skewed.de/count0/graph-tool/-/compare/refs/tags/release-2.78..refs/tags/release-2.79 --- .../python-modules/graph-tool/default.nix | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index ff0ab4f62787..923634117b28 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -4,7 +4,6 @@ fetchurl, stdenv, - autoreconfHook, boost185, cairomm, cgal, @@ -34,26 +33,19 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.78"; + version = "2.79"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-gG9TWKRJISOowRIXI1/ROTIwrVwhxFtMOextXqN6KiU="; + hash = "sha256-UqJUlC517TBw3qcOaSrhAYd7vvEAnkPsYv4YBqjeAVQ="; }; - # Remove error messages about tput during build process without adding ncurses, - # and replace unavailable git commit hash and date. postPatch = '' - substituteInPlace configure.ac \ + # remove error messages about tput during build process without adding ncurses + substituteInPlace configure \ --replace-fail 'tput setaf $1' : \ - --replace-fail 'tput sgr0' : \ - --replace-fail \ - "\"esyscmd(git show | head -n 1 | sed 's/commit //' | grep -o -e '.\{8\}' | head -n 1 |tr -d '\n')\"" \ - '["(nixpkgs-${version})"]' \ - --replace-fail \ - "\"esyscmd(git log -1 | head -n 3 | grep 'Date:' | sed s/'Date: '// | tr -d '\n')\"" \ - '["(unavailable)"]' + --replace-fail 'tput sgr0' : ''; configureFlags = [ @@ -64,10 +56,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - build-system = [ - autoreconfHook - pkg-config - ]; + build-system = [ pkg-config ]; # https://graph-tool.skewed.de/installation.html#manual-compilation dependencies = [ From c740e3e5439a1d2fd62cddd633e86596d36e1a76 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 10 Dec 2024 14:32:15 +0000 Subject: [PATCH 2/2] python312Packages.graph-tool: 2.79 -> 2.80 https://git.skewed.de/count0/graph-tool/-/compare/refs/tags/release-2.79..refs/tags/release-2.80 --- pkgs/development/python-modules/graph-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index 923634117b28..d652f9002c6c 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.79"; + version = "2.80"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-UqJUlC517TBw3qcOaSrhAYd7vvEAnkPsYv4YBqjeAVQ="; + hash = "sha256-wacOB12+co+tJdw/WpqVl4gKbW/2hDW5HSHwtE742+Y="; }; postPatch = ''