Merge pull request #20747 from ericsagnes/pkg-update/rainbowstream

rainbowstream: 1.3.5 -> 1.3.6

authored by Frederik Rietdijk and committed by GitHub dcff4fdf f1f16ba8

+2 -29
-24
pkgs/development/python-modules/rainbowstream/setup.patch
··· 1 - diff --git a/setup.py b/setup.py 2 - index 07b5913..2b7b15e 100644 3 - --- a/setup.py 4 - +++ b/setup.py 5 - @@ -24,15 +24,16 @@ install_requires = [ 6 - ] 7 - 8 - # Default user (considers non virtualenv method) 9 - -user = os.environ.get('SUDO_USER', os.environ['USER']) 10 - +user = os.environ.get('SUDO_USER', os.environ.get('USER', None)) 11 - 12 - # Copy default config if not exists 13 - default = os.path.expanduser("~") + os.sep + '.rainbow_config.json' 14 - if not os.path.isfile(default): 15 - cmd = 'cp rainbowstream/colorset/config ' + default 16 - os.system(cmd) 17 - - cmd = 'chown ' + quote(user) + ' ' + default 18 - - os.system(cmd) 19 - + if user: 20 - + cmd = 'chown ' + quote(user) + ' ' + default 21 - + os.system(cmd) 22 - cmd = 'chmod 777 ' + default 23 - os.system(cmd) 24 -
···
+2 -5
pkgs/top-level/python-packages.nix
··· 14248 14249 rainbowstream = buildPythonPackage rec { 14250 name = "rainbowstream-${version}"; 14251 - version = "1.3.5"; 14252 14253 src = pkgs.fetchurl { 14254 url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; 14255 - sha256 = "0a8bs9g81ns47d4vaj5pfgw9zwbcp0nivlm5rps4dlb6qwvzni1w"; 14256 }; 14257 14258 - doCheck = false; 14259 - 14260 patches = [ 14261 ../development/python-modules/rainbowstream/image.patch 14262 - ../development/python-modules/rainbowstream/setup.patch 14263 ]; 14264 14265 postPatch = ''
··· 14248 14249 rainbowstream = buildPythonPackage rec { 14250 name = "rainbowstream-${version}"; 14251 + version = "1.3.6"; 14252 14253 src = pkgs.fetchurl { 14254 url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; 14255 + sha256 = "04ki61mc2f5rw60zssr1rr6dmjmvhlws5rpnwd3zih6pi5b7cy4a"; 14256 }; 14257 14258 patches = [ 14259 ../development/python-modules/rainbowstream/image.patch 14260 ]; 14261 14262 postPatch = ''