From 04e04ead20d8f65618ce2db13533f93d5a00b1b3 Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Wed, 17 Feb 2021 14:29:04 +0100 Subject: [PATCH] lice: 0.4 -> 0.6 (#112895) Co-authored-by: Sandro --- pkgs/tools/misc/lice/default.nix | 21 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index 3322196d6ed..4cb3f794fd4 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -1,18 +1,17 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, buildPythonPackage, fetchPypi , setuptools, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { + pname = "lice"; + version = "0.6"; - version = "0.4"; - name = "lice-${version}"; - - src = fetchFromGitHub { - owner = "licenses"; - repo = "lice"; - rev = version; - sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; - fetchSubmodules = true; + src = fetchPypi { + inherit pname version; + sha256 = "0skyyirbidknfdzdvsjga8zb4ar6xpd5ilvz11dfm2a9yxh3d59d"; }; + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a32714ab317..2a04f92512c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29134,7 +29134,7 @@ in lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - lice = callPackage ../tools/misc/lice {}; + lice = python3Packages.callPackage ../tools/misc/lice {}; m33-linux = callPackage ../misc/drivers/m33-linux { };