Merge https://github.com/NixOS/nixpkgs

1 files changed, 32 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/nixpkgs/pkgs/development/python-modules/riscof/default.nix
index d774e0ed3e8a..fc5874e39e33 100644
--- a/nixpkgs/pkgs/development/python-modules/riscof/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/riscof/default.nix
@@ -1,15 +1,19 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchFromGitHub
-, lib
 , git
-, riscv-isac
-, riscv-config
 , jinja2
+, pythonOlder
+, riscv-config
+, riscv-isac
 }:
 
 buildPythonPackage rec {
   pname = "riscof";
   version = "1.25.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
@@ -18,18 +22,36 @@ buildPythonPackage rec {
     hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY=";
   };
 
-  postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython";
-
-  propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ];
-
   patches = [
-    # riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable
+    # riscof copies a template directory from the store, but breaks because it
+    # doesn't change permissions and expects it to be writeable
     ./make_writeable.patch
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "import pip" ""
+    substituteInPlace riscof/requirements.txt \
+      --replace "GitPython==3.1.17" "GitPython"
+  '';
+
+  propagatedBuildInputs = [
+    riscv-isac
+    riscv-config
+    jinja2
+  ];
+
+  pythonImportsCheck = [
+    "riscof"
+  ];
+
+  # No unitests available
+  doCheck = false;
+
   meta = with lib; {
-    homepage = "https://github.com/riscv-software-src/riscof";
     description = "RISC-V Architectural Test Framework";
+    homepage = "https://github.com/riscv-software-src/riscof";
+    changelog = "https://github.com/riscv-software-src/riscof/blob/${version}/CHANGELOG.md";
     maintainers = with maintainers; [ genericnerdyusername ];
     license = licenses.bsd3;
   };