From 01c1385deca520ead374afcbc7591aed9e4e6ce8 Mon Sep 17 00:00:00 2001
From: Adam Washington <adam.washington@stfc.ac.uk>
Date: Wed, 21 Mar 2018 13:46:17 +0000
Subject: Make xhtml2pdf its own package in python-packages

xhtml2pdf now uses the main package html5lib with just an override to
pull the correct version number.
---
 pkgs/applications/science/misc/sasview/default.nix   |  6 ------
 pkgs/applications/science/misc/sasview/myHtml5.nix   | 20 --------------------
 pkgs/applications/science/misc/sasview/xhtml2pdf.nix | 15 ---------------
 3 files changed, 41 deletions(-)
 delete mode 100644 pkgs/applications/science/misc/sasview/myHtml5.nix
 delete mode 100644 pkgs/applications/science/misc/sasview/xhtml2pdf.nix

(limited to 'pkgs/applications/science')

diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix
index 45bdeef92bcb..d45eae1ac1f5 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/pkgs/applications/science/misc/sasview/default.nix
@@ -1,10 +1,5 @@
 {lib, fetchgit, gcc, python}:
 
-let
-  html5 = import ./myHtml5.nix {inherit python;};
-  xhtml2pdf = import ./xhtml2pdf.nix {inherit python html5;};
-in
-
 python.pkgs.buildPythonApplication rec {
   name = "sasview-${version}";
   version = "4.1.2";
@@ -13,7 +8,6 @@ python.pkgs.buildPythonApplication rec {
     bumps
     gcc
     h5py
-    html5
     libxslt
     lxml
     matplotlib
diff --git a/pkgs/applications/science/misc/sasview/myHtml5.nix b/pkgs/applications/science/misc/sasview/myHtml5.nix
deleted file mode 100644
index 17e6a6d52e2f..000000000000
--- a/pkgs/applications/science/misc/sasview/myHtml5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{python}:
-
-python.pkgs.buildPythonPackage (rec{
-  buildInputs = with python.pkgs; [ flake8 pytest pytest-expect mock ];
-  propagatedBuildInputs = with python.pkgs; [
-    six webencodings
-  ];
-
-  checkPhase = ''
-    py.test
-  '';
-  pname = "html5lib";
-  name = "html5lib-${version}";
-  version = "1.0b10";
-  src = python.pkgs.fetchPypi {
-    pname = "html5lib";
-    inherit version;
-    sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd";
-  };
-})
diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
deleted file mode 100644
index 9f2b8e01a27d..000000000000
--- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{python, html5}:
-
-python.pkgs.buildPythonPackage rec {
-  name = "${pname}-${version}";
-  pname = "xhtml2pdf";
-  version = "0.2.1";
-
-  buildInputs = [html5];
-  propagatedBuildInputs = with python.pkgs; [httplib2 pillow pypdf2 reportlab html5];
-
-  src = python.pkgs.fetchPypi {
-    inherit pname version;
-    sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1";
-  };
-}
-- 
cgit 1.4.1