Commit graph

18506 commits

Author SHA1 Message Date
Benjamin Staffin
4c95e49593 prometheus-node-exporter: fold into go-packages.nix 2015-08-30 00:16:00 -07:00
Benjamin Staffin
6122488297 prometheus-nginx-exporter: fold into go-packages.nix 2015-08-30 00:12:09 -07:00
Benjamin Staffin
4f53847ca2 prometheus-mysqld-exporter: fold into go-packages.nix 2015-08-29 23:51:19 -07:00
Benjamin Staffin
52dd6ea9d9 prometheus-mesos-exporter: fold into go-packages.nix 2015-08-29 23:47:13 -07:00
Benjamin Staffin
9001ad4106 prometheus-haproxy-exporter: fold into go-packages.nix 2015-08-29 23:37:48 -07:00
Benjamin Staffin
c5b6f17e1c prometheus-collectd-exporter: fold into go-packages.nix 2015-08-29 23:30:27 -07:00
Benjamin Staffin
fe5a2b0a39 prom2json: fold into go-packages.nix 2015-08-29 23:19:48 -07:00
Benjamin Staffin
853602fae5 prometheus-cli: fold into go-packages.nix 2015-08-29 23:17:13 -07:00
Benjamin Staffin
87655d9fe8 prometheus-alertmanager: fold into go-packages.nix 2015-08-29 22:55:22 -07:00
Benjamin Staffin
d74e65bd6f prometheus: fold definition into go-packages.nix 2015-08-29 22:46:57 -07:00
William A. Kennington III
affead28cb goPackages: Update core packages from golang 2015-08-29 19:11:11 -07:00
William A. Kennington III
043839368e goPackages: Exclude commonly useless go packages from being built 2015-08-29 19:10:24 -07:00
Thomas Tuegel
fc0baf0ebe Merge pull request #9343 from akaWolf/qtcreator
qtcreator: refactor for using qt54; qt4SDK, qt5SDK: commented
2015-08-29 18:10:27 -05:00
Thomas Tuegel
7c3d65ec41 qt5Full: build from Qt 5.4 with qtEnv 2015-08-29 17:48:03 -05:00
Thomas Tuegel
b873f5bd62 Add qtEnv 2015-08-29 17:47:49 -05:00
Benjamin Staffin
04bb91bcce consul: revert to stable 0.5.2 rather than a snapshot
Follup to #9515: It appears that Prometheus doesn't actually require an
unreleased version of Consul.
2015-08-29 23:23:09 +02:00
Daniel Fox Franke
e69a162ced pythonPackages.gevent: works just fine on Darwin
Closes #8569, #7275, and #5782. Obviates #8730. As asserted by
@lethalman and observed by @aflatter and @ecyrb, this package
is currently building just fine on Darwin.
2015-08-29 23:10:11 +02:00
William A. Kennington III
26f9ea6dd5 goPackages: Fix tools 2015-08-29 13:25:00 -07:00
Bjørn Forsman
16b5d3f70b Fix eval
Fallout from 83cf8b0cf (goPackages: Split into multiple derivations).
2015-08-29 22:18:59 +02:00
Rok Garbas
07c4cbccf1 pythonPackages.pycdio: applied patch since driver_id can be also long type 2015-08-29 22:03:45 +02:00
William A. Kennington III
83cf8b0cf8 goPackages: Split into multiple derivations
This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
2015-08-29 12:58:03 -07:00
Rok Garbas
0b4bcaad95 pythonPackages.gcutil: fix pinning of google_apputils version
also added some more metadata to the package
2015-08-29 21:39:35 +02:00
Rok Garbas
32dca6d3b2 pythonPackages.qscintilla: dont build on py3 and pypy
because qscintilla is not a standard python package ``buildPythonPackage`` is
not used and ``disabled`` does do anything.

diff --git a/pkgs/top-level/python-packages.nix
b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 ---
a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ let }; };

-  qscintilla = pkgs.stdenv.mkDerivation rec {
-    # TODO: Qt5 support
-    name = "qscintilla-${version}";
-    version = pkgs.qscintilla.version;
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.qscintilla.src;
-
-    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
-
-    preConfigure = ''
-      mkdir -p $out
-      lndir ${pkgs.pyqt4} $out
-      cd Python
-      ${python.executable} ./configure-old.py \
-          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
-          --apidir $out/api/${python.libPrefix} \
-          -n ${pkgs.qscintilla}/include \
-          -o ${pkgs.qscintilla}/lib \
-          --sipdir $out/share/sip
-    '';
+  qscintilla = if isPy3k || isPyPy
+    then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+    else pkgs.stdenv.mkDerivation rec {
+      # TODO: Qt5 support
+      name = "qscintilla-${version}";
+      version = pkgs.qscintilla.version;
+
+      src = pkgs.qscintilla.src;
+
+      buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+      preConfigure = ''
+        mkdir -p $out
+        lndir ${pkgs.pyqt4} $out
+        cd Python
+        ${python.executable} ./configure-old.py \
+            --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+            --apidir $out/api/${python.libPrefix} \
+            -n ${pkgs.qscintilla}/include \
+            -o ${pkgs.qscintilla}/lib \
+            --sipdir $out/share/sip
+      '';

-    meta = with stdenv.lib; {
-      description = "A Python binding to QScintilla, Qt based text editing control";
-      license = licenses.lgpl21Plus;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
-      platforms = platforms.linux;
+      meta = with stdenv.lib; {
+        description = "A Python binding to QScintilla, Qt based text editing control";
+        license = licenses.lgpl21Plus;
+        maintainers = [ "abcz2.uprola@gmail.com" ];
+        platforms = platforms.linux;
+      };
     };
-  };

   qserve = buildPythonPackage rec {
2015-08-29 21:22:29 +02:00
William A. Kennington III
3afc3494bb goPackages: Use parallel instead of forking in bash 2015-08-29 11:51:26 -07:00
Jaka Hudoklin
ed63e18652 Merge pull request #9384 from jefdaj/bitcoinxt-twopackages
Add BitcoinXT as a separate package
2015-08-29 18:47:48 +02:00
Bjørn Forsman
ab6af31ecb spyder: enable for all python interpreters
Rope is not ported to python3 yet, so it is disabled (it's a
"recommended" dependency, not critical).
2015-08-29 17:41:35 +02:00
Peter Simons
69b648ea95 Revert "Added K Framework package."
This reverts commit de02110903. The package doesn't
compile: https://github.com/NixOS/nixpkgs/pull/7419#issuecomment-135972366.
2015-08-29 15:38:33 +02:00
Domen Kožar
806b679b6d Merge pull request #9515 from benley/prometheus-0.15.1
Prometheus: update to 0.15.1
2015-08-29 14:04:43 +02:00
Domen Kožar
d9cb4f92b5 pythonPackages.protobuf: disable on pypy
(cherry picked from commit 172d2793b9819eb6fa87f88806aaf6c7587e3a2c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-08-29 13:17:33 +02:00
Frederik Rietdijk
50aed1ee10 importlib: disable for Python>2.6 and PyPy
importlib is part of the standard library for Python > 2.6 and PyPy.

Tested with nix-shell for all *Packages.importlib versions.
2015-08-29 10:43:42 +02:00
Benjamin Staffin
49f9aba5dd goPackages: update various Prometheus dependencies
Improving style and adding dates along the dependency tree.
2015-08-29 00:19:16 -07:00
Tuomas Tynkkynen
6b866a37fc xrdb: Use mcpp as the preprocessor
Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
William A. Kennington III
6d83b13734 ceph: 0.94.2 -> 0.94.3 2015-08-28 17:49:03 -07:00
William A. Kennington III
2d16959bb8 goPackages: gcloud-golang don't mark broken as this breaks anything depending on metadata 2015-08-28 16:29:48 -07:00
William A. Kennington III
c5e2beab9f Revert mongodb-tools: use Go 1.4
Unneeded as it works fine with Go 1.5 now
2015-08-28 15:44:50 -07:00
William A. Kennington III
43ea4b670c ipfs: Update 2015-08-28 15:43:35 -07:00
Domen Kožar
6dab6ed76b Merge pull request #9494 from FRidh/nibabel
nibabel: remove failing test
2015-08-28 19:20:26 +02:00
Domen Kožar
bd161d0dfc Merge pull request #9496 from FRidh/pyfribidi
pyfribidi: disable for pypy
2015-08-28 19:19:35 +02:00
Frederik Rietdijk
15aa28f71b pyfribidi: disable for pypy
Extension module. pypy is unsupported.
2015-08-28 16:51:07 +02:00
Arseniy Seroka
5ea112f4c3 Merge pull request #9465 from fazo96/ne
ne: init at 3.0.1
2015-08-28 17:43:12 +03:00
Frederik Rietdijk
2927f1a883 nibabel: remove failing test
One of the tests explicitly calls python, which will fail with python3.
The issue has been reported upstream,
https://github.com/nipy/nibabel/issues/341
For now, remove the test.

Fix also the license type.
2015-08-28 16:24:08 +02:00
Enrico Fasoli
0f041e5487 ne: init at 3.0.1
ne: building improvements
2015-08-28 14:24:03 +00:00
Luca Bruno
01a874b3cf gcloud-golang: mark as broken 2015-08-28 15:17:29 +02:00
Arseniy Seroka
4302291e3d Merge pull request #9483 from lebastr/qmidiroute
qmidiroute: init at 0.3.0
2015-08-28 11:49:38 +03:00
Frederik Rietdijk
6ec74dfdef gmpy/gmpy2 disable for PyPy
gmpy and gmpy2 are both extension modules that cannot be used with PyPy.
2015-08-28 09:28:31 +02:00
Arseniy Seroka
096515656d Merge pull request #9475 from dezgeg/pr-uboot-update
u-boot: 2015.04 -> 2015.07
2015-08-28 01:31:02 +03:00
Alexander Lebedev
e96ee79006 qmidiroute: init at 0.3.0 2015-08-27 19:00:08 +00:00
Eelco Dolstra
0ac4ad33fd Unify the docbook-xsl and docbook-xsl-ns expressions 2015-08-27 19:07:44 +02:00
Tuomas Tynkkynen
071009ee4f ubootJetsonTK1: Install some more files
tegra-uboot-flasher needs 'u-boot', 'u-boot-nodtb-tegra.bin' and
'u-boot.dtb' for its 'flash' subcommand, and 'u-boot-dtb-tegra.bin'
for its exec subcommand.

No, there's no sanity in the embedded world.
2015-08-27 17:14:46 +03:00
Domen Kožar
6fe7532396 Revert "vagrant: use ruby 2.2"
This reverts commit c00405d8d9bab331055f202f61ac117900454f36.
2015-08-27 13:41:37 +02:00