treewide: remove redundant rec

2019-08-13 21:52:01 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -18,7 +18,7 @@ let

 in

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "PyLD";
  version = "0.7.2";

--- a/pkgs/development/python-modules/adb-homeassistant/default.nix
+++ b/pkgs/development/python-modules/adb-homeassistant/default.nix
@@ -7,7 +7,7 @@
 , pytest
 , mock
 }:
-buildPythonPackage rec {
+buildPythonPackage {
  pname = "adb-homeassistant";
  version = "1.3.1";

--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -8,7 +8,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "azure-mgmt-billing";
  version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb

--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -8,7 +8,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "azure-mgmt-commerce";
  version = "1.0.1";

--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -5,7 +5,7 @@
 , requests
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "0.20.7";
  pname = "azure-servicemanagement-legacy";

--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -5,7 +5,7 @@
 , pythonOlder
 }:

-if !(pythonOlder "3.3") then null else buildPythonPackage rec {
+if !(pythonOlder "3.3") then null else buildPythonPackage {
  pname = "backports.shutil_get_terminal_size";
  version = "unstable-2016-02-21";

--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -15,7 +15,7 @@
 , mpi4py
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "baselines";
  version = "0.1.6"; # remember to manually adjust the rev

--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -15,7 +15,7 @@

 let visualizationSupport = (pyqtgraph != null);
 in
-buildPythonPackage rec {
+buildPythonPackage {
  pname = "binwalk";
  version = "2.1.1";

--- a/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/pkgs/development/python-modules/bt-proximity/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
 , pybluez }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "bt-proximity";
  version = "0.0.20180217";

--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/development/python-modules/bugz/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "bugz-0.9.3";
  version = "0.13";

--- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
+++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
@@ -4,7 +4,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "asynkdev";
  pname = "caldavclientlibrary-asynk";

--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -5,7 +5,7 @@
 , can
 , canmatrix }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "canopen";
  version = "0.5.1";

--- a/pkgs/development/python-modules/chevron/default.nix
+++ b/pkgs/development/python-modules/chevron/default.nix
@@ -4,7 +4,7 @@
 , python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "chevron";
  version = "0.13.1";

--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -5,7 +5,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "cliapp";
  version = "1.20150305";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -8,7 +8,7 @@
 /* There is a project called "closure-linter" on PyPI that is the
   same as this, but it does not appear to be owned by Google.
   So we're pulling from Google's GitHub repo instead. */
-buildPythonPackage rec {
+buildPythonPackage {
  pname = "closure-linter";
  version = "2.3.19";

--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -14,7 +14,7 @@
 let
  cntk = pkgs.cntk;
 in
-buildPythonPackage rec {
+buildPythonPackage {
  inherit (cntk) name version src;

  nativeBuildInputs = [ swig openmpi ];
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
  pname = "contextlib2";
  version = "0.5.5";

-  src = fetchPypi rec {
+  src = fetchPypi {
    inherit pname version;
    sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48";
  };
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ b/pkgs/development/python-modules/deskcon/default.nix
@@ -6,7 +6,7 @@
 , python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "deskcon-0.3";
  disabled = isPy3k;

--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -18,7 +18,7 @@ let
  version = "1.33";

  # first build all binaries and generate setup.py using bazel
-  bazel-build = buildBazelPackage rec {
+  bazel-build = buildBazelPackage {
    name = "dm-sonnet-bazel-${version}";

    src = fetchFromGitHub {
@@ -60,7 +60,7 @@ let
  };

 # now use pip to install the package prepared by bazel
-in buildPythonPackage rec {
+in buildPythonPackage {
  pname = "dm-sonnet";
  inherit version;

--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -15,7 +15,7 @@
 # , fetchPypi
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "dogtail";
  version = "0.9.10";

--- a/pkgs/development/python-modules/dopy/default.nix
+++ b/pkgs/development/python-modules/dopy/default.nix
@@ -4,7 +4,7 @@
 , six
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "2016-01-04";
  pname = "dopy";

--- a/pkgs/development/python-modules/filemagic/default.nix
+++ b/pkgs/development/python-modules/filemagic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildPythonPackage, fetchFromGitHub, file
 , isPy3k, mock, unittest2 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "filemagic";
  version = "1.6";

--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -4,7 +4,7 @@
 , flask
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "Flask-Silk";
  version = "2018-06-28";

--- a/pkgs/development/python-modules/gateone/default.nix
+++ b/pkgs/development/python-modules/gateone/default.nix
@@ -7,7 +7,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "gateone-1.2-0d57c3";
  disabled = isPy3k;

--- a/pkgs/development/python-modules/geeknote/default.nix
+++ b/pkgs/development/python-modules/geeknote/default.nix
@@ -10,7 +10,7 @@
 , evernote
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "2015-05-11";
  pname = "geeknote";
  disabled = ! isPy27;
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix
@@ -5,7 +5,7 @@
 , google_auth
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "google-cloud-testutils";
  version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";

--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "GreatFET";
  version = "2019.5.1.dev0";

--- a/pkgs/development/python-modules/gyp/default.nix
+++ b/pkgs/development/python-modules/gyp/default.nix
@@ -4,7 +4,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "gyp";
  version = "2015-06-11";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/pkgs/development/python-modules/ipfsapi/default.nix
@@ -6,7 +6,7 @@
 , requests
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "ipfsapi";
  version = "0.4.2.post1";
  disabled = isPy27;
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pytest }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "iso3166";
  version = "0.8";

--- a/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/pkgs/development/python-modules/jsonwatch/default.nix
@@ -5,7 +5,7 @@
 , isPyPy
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "jsonwatch";
  version = "0.2.0";
  disabled = isPyPy; # doesn't find setuptools
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -7,7 +7,7 @@
 , enum34
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname   = "libsoundtouch";
  version = "0.4.0";

--- a/pkgs/development/python-modules/lpod/default.nix
+++ b/pkgs/development/python-modules/lpod/default.nix
@@ -7,7 +7,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "1.1.7";
  pname = "python-lpod";
  # lpod library currently does not support Python 3.x
--- a/pkgs/development/python-modules/lxc/default.nix
+++ b/pkgs/development/python-modules/lxc/default.nix
@@ -5,7 +5,7 @@
 , pkgs
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "python-lxc-unstable";
  version = "2016-08-25";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/magic/default.nix
+++ b/pkgs/development/python-modules/magic/default.nix
@@ -3,7 +3,7 @@
 , pkgs
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "${pkgs.file.name}";

  src = pkgs.file.src;
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -5,7 +5,7 @@
 , pyparsing
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "mutag-0.0.2-2ffa0258ca";
  disabled = ! isPy3k;

--- a/pkgs/development/python-modules/muttils/default.nix
+++ b/pkgs/development/python-modules/muttils/default.nix
@@ -4,7 +4,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "muttils";
  version = "1.3";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -8,7 +8,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  inherit (pkgs.mxnet) name version src meta;

  buildInputs = [ pkgs.mxnet ];
--- a/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/pkgs/development/python-modules/nanomsg-python/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "nanomsg-python";
  version = "1.0.20190114";

--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -4,7 +4,7 @@ let
  pname = "nbxmpp";
  version = "0.6.10";
  name = "${pname}-${version}";
-in buildPythonPackage rec {
+in buildPythonPackage {
  inherit pname version;
  # Tests aren't included in PyPI tarball.
  src = fetchzip {
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -6,7 +6,7 @@
 , pkgs
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "python-notify";
  version = "0.1.1";

--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -4,7 +4,7 @@
 , python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "python-${pkgs.notmuch.name}";

  src = pkgs.notmuch.src;
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -8,7 +8,7 @@
 , git
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "unstable-20160819";
  pname = "nxt-python";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -4,7 +4,7 @@
 , pyusb
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "openant-unstable";
  version = "2017-02-11";

--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -4,7 +4,7 @@
 , pythonPackages
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
  # This is not the "released" 3.0.0 just a commit
  version = "3.0.0";
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -4,7 +4,7 @@

 with stdenv.lib;

-buildPythonPackage rec {
+buildPythonPackage {
  inherit (protobuf) name src version;
  inherit disabled doCheck;

--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/pkgs/development/python-modules/ptable/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, nose }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "ptable";
  version = "unstable-2019-06-14";

--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/pkgs/development/python-modules/purepng/default.nix
@@ -7,7 +7,7 @@
 , numpy ? null
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "purepng";
  version = "0.2.0";

--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pybfd";
  version = "-0.1.1.2017-12-31";

--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.53";
  md5_path = "f6d33a8362dee358517d0a9e2ebdd044";

-  src = pkgs.fetchurl rec {
+  src = pkgs.fetchurl {
    url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
    sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -4,7 +4,7 @@

 let
  rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
-in buildPythonPackage rec {
+in buildPythonPackage {
  pname = "pycangjie";
  version = "1.3_rev_${rev}";
  format = "other";
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 }:

-mkDerivation rec {
+mkDerivation {
  pname = "compyte";
  version = "git-20150817";

--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -8,7 +8,7 @@
 , pkgs
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pycurl2";
  version = "7.20.0";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub }:

-buildPythonPackage rec {
+buildPythonPackage {
    pname = "pyext";
    version = "0.8";

--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/pkgs/development/python-modules/pyfantom/default.nix
@@ -3,7 +3,7 @@
 , fetchgit
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pyfantom";
  version = "unstable-2013-12-18";

--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -27,7 +27,7 @@ let
    '';
  });

-in buildPythonPackage rec {
+in buildPythonPackage {
  pname = "pygmo";
  version = pagmo2WithPython.version;

--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/pkgs/development/python-modules/pygreat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pygreat";
  version = "2019.5.1.dev0";

--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pyinputevent";
  version = "2016-10-18";

--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -3,13 +3,13 @@

 let
  kdelibs = callPackage ./kdelibs.nix {};
-  sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
+  sip4_19_3 = sip.overrideAttrs (oldAttrs: {
    src = fetchurl {
      url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
      sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
    };
  });
-  pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec {
+  pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
    propagatedBuildInputs = [ sip4_19_3 ];
  });
 in stdenv.mkDerivation rec {
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
  version = "1.99.39";
  md5_path = "d249f60aa89b1b4facd63f776925116d";

-  src = fetchurl rec {
+  src = fetchurl {
    url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
    + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
    sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/pkgs/development/python-modules/pylev/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pylev";
  version = "1.3.0";

--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pymaging";
  version = "unstable-2016-11-16";

--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@@ -4,7 +4,7 @@
 , pymaging
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pymaging-png";
  version = "unstable-2016-11-16";

--- a/pkgs/development/python-modules/pynac/default.nix
+++ b/pkgs/development/python-modules/pynac/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pynac";
  version = "0.2";

--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -16,7 +16,7 @@
 , sc2-headless
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "PySC2";
  version = "1.2";

--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -9,7 +9,7 @@
 , pythonOlder
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pyScss";
  version = "1.3.5";

--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
-buildPythonPackage rec {
+buildPythonPackage {
  version = "2017-07-13";
  pname = "pysensors";

--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -5,7 +5,7 @@ let
  pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
  pname = "pyside-generatorrunner";
  version = "0.6.16";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
  name = "${pname}-${version}";

  src = fetchurl {
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5,
  shiboken2, pyside2 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "pyside2-tools";

  inherit (pyside2) version src;
--- a/pkgs/development/python-modules/pysparse/default.nix
+++ b/pkgs/development/python-modules/pysparse/default.nix
@@ -8,7 +8,7 @@
 , python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "pysparse";
  version = "1.3-dev";
  disabled = !isPy27;
--- a/pkgs/development/python-modules/python-unshare/default.nix
+++ b/pkgs/development/python-modules/python-unshare/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "python-unshare";
  # pypi version doesn't support Python 3 and the package didn't update for a long time:
  # https://github.com/TheTincho/python-unshare/pull/8
--- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -7,7 +7,7 @@
 , stdenv
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "python-xmp-toolkit";
  version = "2.0.2";

--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -11,7 +11,7 @@
 , pythonOlder
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "qasm2image";
  version = "0.8.0";

--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -5,7 +5,7 @@
 , qtbase
 }:
 with pythonPackages;
-buildPythonPackage rec {
+buildPythonPackage {
  pname = "qscintilla";
  version = qscintilla.version;
  src = qscintilla.src;
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -9,7 +9,7 @@
 }:

 disabledIf (isPy3k || isPyPy)
-  (buildPythonPackage rec {
+  (buildPythonPackage {
    # TODO: Qt5 support
    pname = "qscintilla";
    version = pkgs.qscintilla.version;
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "radicale_infcloud";
  version = "2017-07-27";

--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -6,7 +6,7 @@
 assert useUnrar -> unrar != null;
 assert !useUnrar -> libarchive != null;

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "rarfile";
  version = "3.0";

--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -6,7 +6,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "rbtools";
  version = "0.7.2";
  disabled = isPy3k;
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "python-recursive-pth-loader";
  version = "1.0";

--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -5,7 +5,7 @@
 , cython
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "rencode";
  version = "git20150810";
  disabled = isPy33;
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,6 +1,6 @@
 {buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "rhpl";
  version = "0.218";
  format = "other";
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -4,7 +4,7 @@
 , pkgs
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "scikits.samplerate";
  version = "0.3.3";

--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pytest }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "semver";
  version = "2.8.1";

--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, python, fetchurl, stdenv, pyside2,
  cmake, qt5, llvmPackages }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "shiboken2";

  inherit (pyside2) version src;
--- a/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "simple-websocket-server";
  version = "20180414";
  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/pkgs/development/python-modules/simplebayes/default.nix
@@ -6,7 +6,7 @@
 , isPy3k
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "simplebayes";
  version = "1.5.8";

--- a/pkgs/development/python-modules/slob/default.nix
+++ b/pkgs/development/python-modules/slob/default.nix
@@ -6,7 +6,7 @@
 , python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "slob";
  verison = "unstable-2016-11-03";
  disabled = !isPy3k;
--- a/pkgs/development/python-modules/snappergui/default.nix
+++ b/pkgs/development/python-modules/snappergui/default.nix
@@ -5,7 +5,7 @@
 , dbus-python
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "Snapper-GUI";
  version = "0.1";

--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -14,7 +14,7 @@
 , codecov
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "stumpy";
  version = "1.0";

--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -4,7 +4,7 @@
 , testscenarios
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = pkgs.subunit.name;
  src = pkgs.subunit.src;

--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub, nose }:

-buildPythonPackage rec {
+buildPythonPackage {
  version = "0.5.3-2016-09-28";
  pname = "tempita";

--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -63,7 +63,7 @@ let
      '';
    };
  };
-in buildPythonPackage rec {
+in buildPythonPackage {
  inherit version pname;
  format = "wheel";

--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -45,7 +45,7 @@ let
  variant = if cudaSupport then "-gpu" else "";
  pname = "tensorflow${variant}";

-in buildPythonPackage rec {
+in buildPythonPackage {
  inherit pname;
  inherit (packages) version;
  format = "wheel";
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -61,7 +61,7 @@ let
  # TODO: remove after there's support for setupPyDistFlags
  setuppy = ../../../development/interpreters/python/run_setup.py;

-  bazel-build = buildBazelPackage rec {
+  bazel-build = buildBazelPackage {
    name = "${pname}-${version}";

    src = fetchFromGitHub {
@@ -300,7 +300,7 @@ let
    };
  };

-in buildPythonPackage rec {
+in buildPythonPackage {
  inherit version pname;

  src = bazel-build.python;
--- a/pkgs/development/python-modules/tess/default.nix
+++ b/pkgs/development/python-modules/tess/default.nix
@@ -6,7 +6,7 @@
 , scipy
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "tess";
  version = "unstable-2019-05-07";

--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -5,7 +5,7 @@
 , isPyPy
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  name = "tkinter-${python.version}";
  src = py;
  format = "other";
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -4,7 +4,7 @@
 , cmake
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "tlsh";
  version = "3.4.5";

--- a/pkgs/development/python-modules/typesentry/default.nix
+++ b/pkgs/development/python-modules/typesentry/default.nix
@@ -6,7 +6,7 @@
 , pytestcov
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "typesentry";
  version = "0.2.7";

--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage, django_1_8, waitress }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "waitress-django";
  version = "0.0.0";

--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -2,7 +2,7 @@
 , mock
 , boto3, envs, python-jose, requests }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "warrant";
  version = "0.6.1";

--- a/Show More
+++ b/Show More