From f8d8564c34378a490d0e5cae4d51d1c8f1062723 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Oct 2020 10:15:22 +0800 Subject: [PATCH] crudini: py2 -> py3 --- pkgs/tools/misc/crudini/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index f63cd0d32c9c..1a49446e9c01 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitHub, python2Packages, help2man, installShellFiles }: +{ stdenv, fetchFromGitHub, python3Packages, help2man, installShellFiles }: -let - # py3 is supposedly working in version 0.9.3 but the tests fail so stick to py2 - pypkgs = python2Packages; - -in -pypkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "crudini"; version = "0.9.3"; src = fetchFromGitHub { - owner = "pixelb"; - repo = "crudini"; - rev = version; + owner = "pixelb"; + repo = "crudini"; + rev = version; sha256 = "0298hvg0fpk0m0bjpwryj3icksbckwqqsr9w1ain55wf5s0v24k3"; }; nativeBuildInputs = [ help2man installShellFiles ]; - propagatedBuildInputs = with pypkgs; [ iniparse ]; + propagatedBuildInputs = with python3Packages; [ iniparse ]; postPatch = '' substituteInPlace crudini-help \ @@ -48,7 +43,7 @@ pypkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A utility for manipulating ini files "; homepage = "https://www.pixelbeat.org/programs/crudini/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; }; }