diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 16:13:33 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 16:13:33 -0400 |
commit | 89c21fce3fae63cb1460f7da7e9edfe5f6f503c9 (patch) | |
tree | 86f6fa7a6ef0d784f50fcd99e17b5098340976a9 /pkgs/top-level | |
parent | b9fbcfb4878bd6cccad7344acb67e062f40febba (diff) | |
parent | 89a89ddfb3665561a3410420634ada773dfea691 (diff) | |
download | nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar.gz nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar.bz2 nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar.lz nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar.xz nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.tar.zst nixlib-89c21fce3fae63cb1460f7da7e9edfe5f6f503c9.zip |
Merge commit 'master' into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 179 |
2 files changed, 45 insertions, 161 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9886ae43a113..8dfcca681fb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -670,6 +670,8 @@ with pkgs; gitless = callPackage ../applications/version-management/gitless { }; + gitter = callPackage ../applications/networking/instant-messengers/gitter { }; + grc = callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { @@ -1322,6 +1324,8 @@ with pkgs; glide = callPackage ../development/tools/glide { }; + globalarrays = callPackage ../development/libraries/globalarrays { }; + glock = callPackage ../development/tools/glock { }; glslviewer = callPackage ../development/tools/glslviewer { @@ -1442,6 +1446,8 @@ with pkgs; pbzx = callPackage ../tools/compression/pbzx { }; + photon = callPackage ../tools/networking/photon { }; + playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; @@ -2725,6 +2731,8 @@ with pkgs; inherit (gnome2) gnome_python gnome_python_desktop; }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -4250,6 +4258,8 @@ with pkgs; ocproxy = callPackage ../tools/networking/ocproxy { }; + ocserv = callPackage ../tools/networking/ocserv { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; @@ -5442,6 +5452,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; + tio = callPackage ../tools/misc/tio { }; tldr = callPackage ../tools/misc/tldr { }; @@ -7081,6 +7093,7 @@ with pkgs; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; + cargo-update = callPackage ../tools/package-management/cargo-update { }; cargo-asm = callPackage ../development/tools/rust/cargo-asm { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; @@ -7968,6 +7981,8 @@ with pkgs; corundum = callPackage ../development/tools/corundum { }; + confluent = callPackage ../servers/confluent {}; + ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; @@ -8614,6 +8629,8 @@ with pkgs; travis = callPackage ../development/tools/misc/travis { }; + trellis = callPackage ../development/tools/trellis { }; + tweak = callPackage ../applications/editors/tweak { }; uhd = callPackage ../development/tools/misc/uhd { }; @@ -11420,6 +11437,8 @@ with pkgs; pugixml = callPackage ../development/libraries/pugixml { }; + pybind11 = callPackage ../development/libraries/pybind11 { }; + re2 = callPackage ../development/libraries/re2 { }; qbs = callPackage ../development/tools/build-managers/qbs { }; @@ -15181,7 +15200,8 @@ with pkgs; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - androidStudioPackages = callPackage ../applications/editors/android-studio { }; + androidStudioPackages = recurseIntoAttrs + (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; android-studio-preview = androidStudioPackages.beta; @@ -20301,6 +20321,8 @@ with pkgs; octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; + pymol = callPackage ../applications/science/chemistry/pymol { }; ### SCIENCE/GEOMETRY @@ -20414,6 +20436,8 @@ with pkgs; snpeff = callPackage ../applications/science/biology/snpeff { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; + star = callPackage ../applications/science/biology/star { }; varscan = callPackage ../applications/science/biology/varscan { }; @@ -22022,4 +22046,5 @@ with pkgs; powershell = callPackage ../shells/powershell { }; + doing = callPackage ../applications/misc/doing { }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28cb0509e97d..757849dd2e93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -69,8 +69,6 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - graphiteVersion = "1.0.2"; - fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: let fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: @@ -340,12 +338,16 @@ in { outcome = callPackage ../development/python-modules/outcome {}; + palettable = callPackage ../development/python-modules/palettable { }; + pdf2image = callPackage ../development/python-modules/pdf2image { }; pdfminer = callPackage ../development/python-modules/pdfminer_six { }; pdfx = callPackage ../development/python-modules/pdfx { }; + phonopy = callPackage ../development/python-modules/phonopy { }; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -420,6 +422,8 @@ in { }; pykerberos = callPackage ../development/python-modules/pykerberos { }; + + pymatgen = callPackage ../development/python-modules/pymatgen { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -499,6 +503,8 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + sumo = callPackage ../development/python-modules/sumo { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; syncserver = callPackage ../development/python-modules/syncserver {}; @@ -4774,13 +4780,14 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; django_tagging_0_4_3 = if - self.django != self.django_1_8 + self.django.version != "1.8.18" then throw "django_tagging_0_4_3 should be build with django_1_8" else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { - name = "django-tagging-0.4.3"; + pname = "django-tagging"; + version = "0.4.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; propagatedBuildInputs = with self; [ django ]; @@ -15393,24 +15400,7 @@ EOF whichcraft = callPackage ../development/python-modules/whichcraft { }; - whisper = buildPythonPackage rec { - name = "whisper-${version}"; - version = graphiteVersion; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/whisper/${name}.tar.gz"; - sha256 = "1v1bi3fl1i6p4z4ki692bykrkw6907dn3mfq0151f70lvi3zpns3"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Fixed size round-robin style database"; - maintainers = with maintainers; [ rickynils offline ]; - }; - }; + whisper = callPackage ../development/python-modules/whisper { }; worldengine = buildPythonPackage rec { name = "worldengine-${version}"; @@ -15460,27 +15450,7 @@ EOF }; }; - carbon = buildPythonPackage rec { - name = "carbon-${version}"; - version = graphiteVersion; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/carbon/${name}.tar.gz"; - sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn"; - }; - - propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ]; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Backend data caching and persistence daemon for Graphite"; - maintainers = with maintainers; [ rickynils offline ]; - license = licenses.asl20; - }; - }; - + carbon = callPackage ../development/python-modules/carbon { }; ujson = buildPythonPackage rec { name = "ujson-1.35"; @@ -15608,126 +15578,15 @@ EOF }; }; - graphite_web = if - self.django != self.django_1_8 - || self.django_tagging != self.django_tagging_0_4_3 - then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3" - else buildPythonPackage rec { - name = "graphite-web-${version}"; - disabled = isPy3k; - version = graphiteVersion; - - src = pkgs.fetchurl rec { - url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "0q8bwlj75jqyzmazfsi5sa26xl58ssa8wdxm2l4j0jqyn8xpfnmc"; - }; - - propagatedBuildInputs = with self; [ - django django_tagging whisper pycairo cairocffi - ldap memcached pytz urllib3 scandir - ]; - - postInstall = '' - wrapProgram $out/bin/run-graphite-devel-server.py \ - --prefix PATH : ${pkgs.which}/bin - ''; - - preConfigure = '' - # graphite is configured by storing a local_settings.py file inside the - # graphite python package. Since that package is stored in the immutable - # Nix store we can't modify it. So how do we configure graphite? - # - # First of all we rename "graphite.local_settings" to - # "graphite_local_settings" so that the settings are not looked up in the - # graphite package anymore. Secondly we place a directory containing a - # graphite_local_settings.py on the PYTHONPATH in the graphite module - # <nixpkgs/nixos/modules/services/monitoring/graphite.nix>. - substituteInPlace webapp/graphite/settings.py \ - --replace "graphite.local_settings" " graphite_local_settings" - - substituteInPlace webapp/graphite/settings.py \ - --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Enterprise scalable realtime graphing"; - maintainers = with maintainers; [ rickynils offline ]; - }; - }; + graphite-web = callPackage ../development/python-modules/graphite-web { }; graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite_beacon = buildPythonPackage rec { - name = "graphite_beacon-0.27.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz"; - sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; - }; - - propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ]; - - preBuild = "> requirements.txt"; - - meta = { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/klen/graphite-beacon; - maintainers = [ maintainers.offline ]; - license = licenses.mit; - }; - }; - - graphite_influxdb = buildPythonPackage rec { - name = "graphite-influxdb-0.3"; - - src = pkgs.fetchgit { - url = "https://github.com/vimeo/graphite-influxdb.git"; - rev = "2273d12a24e1d804685a36debfd4224b7416b62f"; - sha256 = "1v00fgrnmsd9c0ahggyw9sia5m7dyzz16i5pa4vy6w2sbfyrmm4v"; - }; - - propagatedBuildInputs = with self; [ influxdb graphite_api ]; + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - passthru.moduleName = "graphite_influxdb.InfluxdbFinder"; - - meta = { - description = "An influxdb backend for Graphite-web and graphite-api"; - homepage = https://github.com/vimeo/graphite-influxdb; - license = licenses.asl20; - }; - }; - - graphite_pager = buildPythonPackage rec { - name = "graphite-pager-${version}"; - version = "2bbfe91220ec1e0ca1cdf4b5564386482a44ed7d"; - - src = pkgs.fetchgit { - url = "https://github.com/offlinehacker/graphite-pager.git"; - sha256 = "0ylal0vkc2yrjvssfz1gls84yk9vkvvkx3pyv4lx15jm2qqzdmxd"; - rev = version; - }; - - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ - jinja2 pyyaml redis requests pagerduty - python-simple-hipchat pushbullet - ]; - - patchPhase = "> requirements.txt"; - checkPhase = "nosetests"; - - meta = { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/seatgeek/graphite-pager; - maintainers = with maintainers; [ offline ]; - license = licenses.bsd2; - }; - }; + influxgraph = callPackage ../development/python-modules/influxgraph { }; + graphitepager = callPackage ../development/python-modules/graphitepager { }; pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; |