summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-11-27 15:25:14 +0000
committerGitHub <noreply@github.com>2017-11-27 15:25:14 +0000
commit57e8937c2537ce183fdfa90c8a06e2b1a3cde788 (patch)
treefc8e23ba92aa0294a723682b84f1c4da89198aa5
parent90ab4ef5a8ab1500042c6282fa8b0eaf1a53bc57 (diff)
parent844f24eb0af24f87af0d7088265f185614745515 (diff)
downloadnixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar.gz
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar.bz2
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar.lz
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar.xz
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.tar.zst
nixlib-57e8937c2537ce183fdfa90c8a06e2b1a3cde788.zip
Merge pull request #32110 from rycee/fix/carbon
python-carbon: disable on Python 3
-rw-r--r--pkgs/top-level/python-packages.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 90d8c177b1e7..7f565a73672a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21477,6 +21477,8 @@ EOF
     name = "carbon-${version}";
     version = graphiteVersion;
 
+    disabled = isPy3k;
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/carbon/${name}.tar.gz";
       sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn";
@@ -21488,6 +21490,7 @@ EOF
       homepage = http://graphite.wikidot.com/;
       description = "Backend data caching and persistence daemon for Graphite";
       maintainers = with maintainers; [ rickynils offline ];
+      license = licenses.asl20;
     };
   };