swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-27 23:50:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
rainbowstream: 1.3.5 -> 1.3.6
This commit is contained in:
Frederik Rietdijk 2016-11-27 09:35:52 +01:00 committed by GitHub
parent f1f16ba8ac d0e8117ccb
commit dcff4fdf07
2 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/python-modules/rainbowstream/setup.patch
View file

@ -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)

7
pkgs/top-level/python-packages.nix
View file

@ -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 = ''