alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
68056 commits 217 branches 116 tags 4 GiB
Commit graph

18519 commits

Author SHA1 Message Date
Domen Kožar 6936b5c183 Merge pull request #9547 from FRidh/scikitlearn 
scikit-learn: fix i686 build failures
 2015-08-31 00:05:43 +02:00
Arseniy Seroka ca29db9262 Merge pull request #9519 from FRidh/dask 
python-packages dask: init at 0.7.0
 2015-08-31 01:00:11 +03:00
Arseniy Seroka 167f1891c3 Merge pull request #9565 from nbarbey/fuseiso 
fuseiso: init at 20070708
 2015-08-31 00:58:12 +03:00
Nicolas Barbey b4215fdda5 fuseiso: init at 20070708 2015-08-30 22:28:39 +02:00
Bjørn Forsman e9ad37e231 gnuradio: rename *-wrapper and *-full attributes to *-with-packages 
Having both *-wrapper and *-full attribute names is rather confusing
(what's the difference?). And further, both packages are named
gnuradio-with-packages:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio          gnuradio-3.7.7.1
  gnuradio-osmosdr  gnuradio-osmosdr-0.1.4
  gnuradio-full     gnuradio-with-packages-3.7.7.1
  gnuradio-wrapper  gnuradio-with-packages-3.7.7.1

Get rid of *-wrapper and rename *-full to *-with-packages, to align it
with the package name.

Now:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio                gnuradio-3.7.7.1
  gnuradio-osmosdr        gnuradio-osmosdr-0.1.4
  gnuradio-with-packages  gnuradio-with-packages-3.7.7.1

And you can customize the *-with-packages variant like this:

  gnuradio-with-packages.override { extraPackages = [...]; }
 2015-08-30 22:01:46 +02:00
Andreas Wagner e7a024abc4 urjtag: init at 0.10 
[Bjørn: make the function argument lines occupy less vertical space.]
 2015-08-30 20:47:24 +02:00
William A. Kennington III ba8b70bd54 etcd: 2.1.1 -> 2.1.2 2015-08-30 10:57:17 -07:00
Frederik Rietdijk 46e51883d8 scikit-learn: fix i686 build failures 
Currently i686 builds fail because a couple of doctests fail.
The values are correct, but the dtype is missing.
This commit disables doctests.
 2015-08-30 09:55:29 +02:00
Benjamin Staffin 395c268ab7 prometheus-statsd-bridge: fold into go-packages.nix 2015-08-30 00:26:10 -07:00
Benjamin Staffin d17a29a150 prometheus-pushgateway: fold into go-packages.nix 2015-08-30 00:22:09 -07:00
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 172d2793b9)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-08-29 13:17:33 +02:00
Frederik Rietdijk 12553227d2 python-packages dask: init at 0.7.0 2015-08-29 13:03:36 +02:00
Frederik Rietdijk 582c9a81dc python-packages dill: init at 0.2.4 2015-08-29 13:03:01 +02:00
Frederik Rietdijk 88d444b36f python-packages objgraph: init at 2.0.1 2015-08-29 13:02:44 +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