From 609374523c7dbb6c4a6d6834ade1a8ff90b1c354 Mon Sep 17 00:00:00 2001
From: Adam Washington <adam.washington@stfc.ac.uk>
Date: Wed, 21 Mar 2018 13:32:30 +0000
Subject: [PATCH] Remove explicit licenses import from python package sasmodels

The licenses variable was being required by sasmoels, but licenses was
already a child of the lib parameter and was redundant.
---
 pkgs/development/python-modules/sasmodels/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 1360864cf03..06e9adf197a 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchgit, licenses, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}:
+{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}:
 
 buildPythonPackage rec {
   name = "sasmodels-${version}";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library of small angle scattering models";
     homepage = http://sasview.org;
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ rprospero ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c4452e04e7..4acbdade3b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15321,9 +15321,7 @@ in {
 
   sampledata = callPackage ../development/python-modules/sampledata { };
 
-  sasmodels = callPackage ../development/python-modules/sasmodels {
-    inherit licenses;
-  };
+  sasmodels = callPackage ../development/python-modules/sasmodels { };
 
   scapy = callPackage ../development/python-modules/scapy { };