From eec6aa8119a08d6f99a6b352b1fde9a522e7765e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 16:47:01 +0000 Subject: [PATCH 1/2] python310Packages.graphtage: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/graphtage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index a1bec8f3a1f4..eb33bd48ece9 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.6"; + version = "0.2.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0="; + sha256 = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; propagatedBuildInputs = [ From d1d55b340279cfe93596a97704c134bd166e3017 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 18:44:36 +0100 Subject: [PATCH 2/2] python310Packages.graphtage: add changelog to meta --- .../python-modules/graphtage/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index eb33bd48ece9..063cece8a386 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , pytestCheckHook , pythonOlder - # Python dependencies , colorama , intervaltree , json5 @@ -16,15 +15,21 @@ buildPythonPackage rec { pname = "graphtage"; version = "0.2.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; + hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "json5==0.9.5" "json5>=0.9.5" + ''; + propagatedBuildInputs = [ colorama intervaltree @@ -35,18 +40,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; - - pythonImportsCheck = [ "graphtage" ]; + pythonImportsCheck = [ + "graphtage" + ]; meta = with lib; { - homepage = "https://github.com/trailofbits/graphtage"; description = "A utility to diff tree-like files such as JSON and XML"; + homepage = "https://github.com/trailofbits/graphtage"; + changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; };