From d0e8117ccb3a1d4665b6b327f509373e4b6be265 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Nov 2016 11:37:20 +0900 Subject: [PATCH] rainbowstream: 1.3.5 -> 1.3.6 --- .../python-modules/rainbowstream/setup.patch | 24 ------------------- pkgs/top-level/python-packages.nix | 7 ++---- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/rainbowstream/setup.patch diff --git a/pkgs/development/python-modules/rainbowstream/setup.patch b/pkgs/development/python-modules/rainbowstream/setup.patch deleted file mode 100644 index 55afa49a96e8..000000000000 --- a/pkgs/development/python-modules/rainbowstream/setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/setup.py b/setup.py -index 07b5913..2b7b15e 100644 ---- a/setup.py -+++ b/setup.py -@@ -24,15 +24,16 @@ install_requires = [ - ] - - # Default user (considers non virtualenv method) --user = os.environ.get('SUDO_USER', os.environ['USER']) -+user = os.environ.get('SUDO_USER', os.environ.get('USER', None)) - - # Copy default config if not exists - default = os.path.expanduser("~") + os.sep + '.rainbow_config.json' - if not os.path.isfile(default): - cmd = 'cp rainbowstream/colorset/config ' + default - os.system(cmd) -- cmd = 'chown ' + quote(user) + ' ' + default -- os.system(cmd) -+ if user: -+ cmd = 'chown ' + quote(user) + ' ' + default -+ os.system(cmd) - cmd = 'chmod 777 ' + default - os.system(cmd) - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d19e2d77800..d80324a9fb1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14248,18 +14248,15 @@ in { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.5"; + version = "1.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; - sha256 = "0a8bs9g81ns47d4vaj5pfgw9zwbcp0nivlm5rps4dlb6qwvzni1w"; + sha256 = "04ki61mc2f5rw60zssr1rr6dmjmvhlws5rpnwd3zih6pi5b7cy4a"; }; - doCheck = false; - patches = [ ../development/python-modules/rainbowstream/image.patch - ../development/python-modules/rainbowstream/setup.patch ]; postPatch = ''