cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
68645 commits 1 branch 0 tags 3.7 GiB
Commit graph

18751 commits

Author SHA1 Message Date
William A. Kennington III
31f5bbdaff go-repo-root: Move to go-packages 2015-09-05 00:38:42 -07:00
William A. Kennington III
7baf0e734e gotags: Move to go-packages 2015-09-05 00:27:16 -07:00
William A. Kennington III
9a5d1d85af goimports: Move to go-packages 2015-09-05 00:16:56 -07:00
William A. Kennington III
8c6088c0ce gocode: Move to go-packages 2015-09-05 00:15:02 -07:00
William A. Kennington III
4b02b32255 influxdb-backup: Move to go-packages 2015-09-05 00:06:05 -07:00
William A. Kennington III
fe8a27cd64 mesos-dns: Move to go-packages 2015-09-04 23:57:00 -07:00
William A. Kennington III
68be570a0a skydns: Move to go-packages 2015-09-04 21:26:35 -07:00
William A. Kennington III
8fe216dd3e bosun: Move to go-packages 2015-09-04 21:11:42 -07:00
William A. Kennington III
e617eeea41 syncthing: Move to go-packages 2015-09-04 21:00:57 -07:00
William A. Kennington III
eabf45a025 lxd: Don't build test binary 2015-09-04 20:28:45 -07:00
Tobias Geerinckx-Rice
336b79e6e3 {,pythonPackages.}libvirt: 1.2.17 -> 1.2.19 2015-09-05 04:20:22 +02:00
Arseniy Seroka
949cc5cd8d Merge pull request #9657 from kamilchm/gawp 
gawp: init at 2015-08-31
 2015-09-05 01:26:57 +03:00
Michael Raskin
56cbf88a18 Xpilot-NG: init @ 4.7.3 2015-09-04 23:45:13 +03:00
William A. Kennington III
3163d1aa65 libassuan2_1: remove 
This library was orphaned and out of date so it is fit for removal.
 2015-09-04 12:14:36 -07:00
Peter Simons
a8bf17e493 all-packages.nix: strip trailing whitespace 2015-09-04 12:41:36 +02:00
Peter Simons
398fc5d9fe emacs-ido-ubiquitous: add version 3.6-4-gb659bf8 2015-09-04 12:38:51 +02:00
Peter Simons
89e525eb4d python-packages.nix: drop trailing whitespace 2015-09-04 11:51:00 +02:00
Peter Simons
a7a125ac10 python-Babel: remove over-specified platform restrictions 2015-09-04 11:51:00 +02:00
Kamil Chmielewski
392c9655e1 gawp: init at 2015-08-31 2015-09-04 11:06:14 +02:00
Daniel Fox Franke
3129142f80 accelio: fix i686-linux build 
* Compile with gcc5 to avoid the compiler bug described in
  https://gcc.gnu.org/ml/gcc-patches/2014-05/msg02560.html

* Add a patch to fix the many incorrect printf format specifiers and
  other sloppy type conversions that gcc5 catches and warns on
  (erroring out due to -Werror).
 2015-09-03 20:20:53 -04:00
Yochai
6f3f5f536d rtl8812au: init at 4.2.2 2015-09-03 23:50:05 +02:00
Eelco Dolstra
38a74e27de Remove Linux 4.0 
It's EOL.
 2015-09-03 16:50:31 +02:00
Robert Scott
ecd873ddb0 pythonPackages.jsonpath_rw: init at 1.4.0, fixes #9493 2015-09-03 13:53:36 +02:00
Daniel Brockman
fe16722cf9 botocore: 1.1.4 -> 1.1.10 2015-09-03 13:51:08 +02:00
Mariusz `shd` Gliwiński
7bd6aac2d0 lgogdownloader: init at 2.24, fixes #9613 
htmlcxx: init at 0.85, dependency of lgogdownloader
 2015-09-03 13:09:06 +02:00
Kovacsics Robert (NixOS-SSD2)
b22e6cb299 wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609 
wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
 2015-09-03 12:58:24 +02:00
Kovacsics Robert (NixOS-SSD2)
c0b710fc68 wmii-hg: init at 2012-12-09 2015-09-03 12:58:11 +02:00
Kovacsics Robert (NixOS-SSD2)
b02921d4ca libixp-hg: init at 2012-12-02 2015-09-03 12:58:11 +02:00
Guillaume Maudoux
f5205a7ba6 python-web.py: disable Py3k interpreter, fixes #9619 2015-09-03 12:50:16 +02:00
Eric Sagnes
4080b744b2 php-imagick: init at 3.1.2, fixes #9627 2015-09-03 12:47:27 +02:00
Luca Bruno
271b7ad006 Revert "zbar: ghostscript was missing for zbar" 
This reverts commit a906355b8a.

Fixed imagemagick -lgs reference in .la file.

cc @garbas
 2015-09-03 12:21:34 +02:00
Eelco Dolstra
a536eda82e Add firefox-esr 2015-09-03 11:15:53 +02:00
Rok Garbas
c7580cd175 dragonegg: does not build with gcc49 
https://llvm.org/bugs/show_bug.cgi?id=19847
 2015-09-03 11:02:56 +02:00
Spencer Janssen
27ffcf7872 stevedore: add pbr to propagatedBuildInputs 
This fixes a crash in flexget and possibly other packages. I think the
issue was introduced in fc1165b0d9
 2015-09-03 01:24:52 -05:00
William A. Kennington III
4bd817b82a pond: Migrate to go-packages 2015-09-02 22:17:45 -07:00
William A. Kennington III
20a1c9cc3b goPackages: Update appengine 2015-09-02 22:17:31 -07:00
William A. Kennington III
45734349bf dclxvi: Init at 2013-01-27 2015-09-02 22:16:53 -07:00
Rok Garbas
a906355b8a zbar: ghostscript was missing for zbar 2015-09-03 03:41:00 +02:00
William A. Kennington III
4fc7619d23 nsq: Remove benchmark utilies as they are uneeded 2015-09-02 18:19:47 -07:00
William A. Kennington III
e7a783dccf goPackages: More cleanups 2015-09-02 18:18:08 -07:00
William A. Kennington III
cb8a2e9503 nsq: Move to go-packages and 0.2.28 -> 0.3.5 2015-09-02 18:15:01 -07:00
William A. Kennington III
5f35b0f7da serfdom: Migrate to go-packages 2015-09-02 17:51:03 -07:00
William A. Kennington III
8f34c44824 asciinema: Move to go-packages 2015-09-02 17:43:36 -07:00
William A. Kennington III
acd17d21b3 mtpfs: Fix accidental deletion 2015-09-02 17:39:42 -07:00
William A. Kennington III
b50567912a mtpfs: Update to 2015-08-01 and move to go-packages 2015-09-02 17:36:23 -07:00
William A. Kennington III
72d86374f2 all-packages: goPackages Cleanups 2015-09-02 17:35:09 -07:00
William A. Kennington III
a8d64c8eea fzf: Move to go-packages and 0.10.0 -> 0.10.4 2015-09-02 17:27:03 -07:00
William A. Kennington III
dea4d952ae ngrok: Move to go-packages 2015-09-02 17:18:40 -07:00
William A. Kennington III
5b13442747 flannel: Migrate to go-packages 2015-09-02 17:05:42 -07:00
Cillian de Róiste
424ad5302e Remove tessel: too outdated, and broken 2015-09-02 22:12:34 +02:00
Eric Seidel
acdc9370f5 emacs-packages: idris-mode 0.9.18 -> 0.9.19 2015-09-02 12:14:22 -07:00
Nikolay Amiantov
13b63c29ae rxvt_unicode_with-plugins: move to the deprecated names section 2015-09-02 21:41:20 +03:00
Nikolay Amiantov
513bae1f2e bomi, mpv: avoid using deprecated youtube-dl name 2015-09-02 21:14:46 +03:00
Peter Simons
614ed1e1ad ikiwiki: use PerlMagick with imagemagickBig rather than the light version 
Ikiwiki needs a version of PerlMagick that has ghostscript to fix
https://github.com/NixOS/nixpkgs/issues/9473.

This patch is brought to you courtesy of the venerable @vcunat.
 2015-09-02 12:55:24 +02:00
Peter Simons
c310a5f608 all-packages.nix: instantiate 'perlPackages' with callPackage rather than import 
This allows us to override the attributes passed to the package set, which is
needed to pass "imagemagickBig" to PerlMagic rather than the normal one (see
next commit).

This patch is brought to you courtesy of the venerable @vcunat.
 2015-09-02 12:52:41 +02:00
Luca Bruno
873a6ce9a8 imagemagickBig: enable ghostscript 2015-09-02 11:46:27 +02:00
Rok Garbas
25a29e6671 pythonPackages.scikitlearn: fix for python2 
test_standard_scaler_numerical_stability test fails on all i686 platforms
 2015-09-02 10:37:48 +02:00
lethalman
9da76d7d11 Merge pull request #9552 from mayflower/fix-lxd-images 
lxd: fix to include lxd-images
 2015-09-02 10:32:09 +02:00
ts468
eec0113516 Merge pull request #8705 from ts468/upstream.ocaml_renaming 
ocaml-modules: fix naming: "_" -> "-"
 2015-09-02 10:03:22 +02:00
Thomas Strobel
616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Matthias Beyer
0f4b9218d2 python27Packages.klaus: 0.4.10 -> 0.6.0, fixes #9597 2015-09-02 08:59:07 +02:00
Thomas Strobel
e80b41e94f xen: remove 4.4.1 + fixes compilation of 4.5.x, fixes #9572 2015-09-02 08:33:24 +02:00
Vladimír Čunát
2dccca399c libunwind: security fix for CVE-2015-3239 
Thanks to the monitor. Low security and high rebuild impact, but still...
 2015-09-02 05:23:55 +02:00
William A. Kennington III
4fecf15b4b syncthing: Fix top-level expression 2015-09-01 17:19:11 -07:00
Rok Garbas
08ef227a61 pythonPackages.scikitlearn: apply patch for doctests on i686 and skip one test 
fixes #9472
related scikit-learn/scikit-learn/#5198, scikit-learn/scikit-learn/#5197
 2015-09-01 21:48:46 +02:00
Vladimír Čunát
0327ee3f8e libevent: remove unused vulnerable 1.4.x version 2015-09-01 21:37:40 +02:00
Robin Gloster
d0d8828706 lxd: fix to include lxd-images 2015-09-01 18:14:31 +00:00
Arseniy Seroka
bb3bb95f9b Merge pull request #9582 from pjones/pkg/cura.lulzbot 
curaLulzbot: init at 15.02.1-1.03-5064
 2015-09-01 18:46:44 +03:00
lethalman
3427ce1b61 Merge pull request #9518 from FRidh/xray 
python-packages xray: init at 0.6.0
 2015-09-01 17:43:38 +02:00
Kovacsics Robert (NixOS-SSD2)
7234e89913 txt2tags: init at 2.6 
txt2tags is a KISS markup language
 2015-09-01 14:12:26 +01:00
Carles Pagès
b4ad13f667 opencv: add version 3.0 
Adding as a separate expression, as it is not api compatible with 2.x.
 2015-09-01 14:53:32 +02:00
Andreas Wagner
bea3ba66bb multimarkdown: init at 4.7.1 2015-09-01 06:52:54 -04:00
Rok Garbas
dbc6c2be3f pythonPackages: fix pyutil on pypy platform 2015-09-01 11:10:27 +02:00
Eelco Dolstra
9013dc5826 inotifyTools -> inotify-tools 
Fixes #9456.
 2015-09-01 10:52:47 +02:00
Eelco Dolstra
217fbea5f9 Move some misplaced attributes 2015-09-01 10:50:18 +02:00
Eelco Dolstra
3ea329c6aa Revert "all-packages: warn when using deprecated attributes" 
This reverts commit c53018c9a1. This
causes problems for "nix-env -qa", so we'll have to come up with a
clean solution first.

Issue #9456.
 2015-09-01 10:46:32 +02:00
William A. Kennington III
cf92e411ee Revert "mongo-tools: fix build" 
This reverts commit 3e391b839a.

This is a slower way to build the tools. Lets get this going in parallel
again. Instead of replacing the whole install process, keep the parts
which work and do just the binary copying ourselves.
 2015-09-01 01:41:07 -07:00
William A. Kennington III
8570384288 goPackages: Disable failing packages 2015-09-01 01:18:39 -07:00
Tobias Geerinckx-Rice
c2de55e6f8 python-packages: fusepy/gdrivefs platforms -> unix 
FUSE is available on other Unix-alikes as well.
 2015-09-01 05:30:17 +02:00
Arseniy Seroka
a3fab58287 Merge pull request #9583 from pjones/pkg/geda 
geda: init at 1.8.2-20130925
 2015-09-01 04:42:34 +03:00
Arseniy Seroka
beda13e18a Merge pull request #9240 from layus/inginious 
python-INGInious: add at 0.3.dev1
 2015-09-01 04:26:41 +03:00
Peter Jones
1d4135eab9 geda: init at 1.8.2-20130925 2015-08-31 15:09:58 -06:00
Arseniy Seroka
b653aac1cc Merge pull request #9576 from rnhmjoj/bdf2psf 
bdf2psf: init at 1.132
 2015-08-31 23:58:50 +03:00
Peter Jones
674d0a7992 curaLulzbot: init at 15.02.1-1.03-5064 2015-08-31 14:42:05 -06:00
Gabriel Ebner
6b42cd852a qalculate-gtk: init at 0.9.7 2015-08-31 19:20:29 +02:00
Guillaume Maudoux
c601814cd3 python-inginious: init at 0.3.dev1 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
7d4b026a81 python-PyVirtualDisplay: init at 0.1.5 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
72890773c4 python-EasyProcess: init at 0.1.9 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
2dedf83d37 python-web.py: init at 0.37 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
dee6dc162f python-semantic_version: init at 2.4.2 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
c070bd7e0a python-tidylib: init at 0.2.4 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
637097a142 python-simpleldap: init at 0.8 2015-08-31 18:27:20 +02:00
Guillaume Maudoux
00abee22be python-multiprocessing: init at 2.6.2.1 2015-08-31 18:27:19 +02:00
Guillaume Maudoux
0db8e6c792 python-PyLTI: init at 0.4.0 2015-08-31 18:27:19 +02:00
Guillaume Maudoux
96a1539256 python-cgroup-utils: init at 0.6 2015-08-31 18:27:19 +02:00
Guillaume Maudoux
73c61b6286 python-sh: update 1.08 -> 1.11 2015-08-31 18:26:44 +02:00
Guillaume Maudoux
579424f94a python-PyYAML: update 3.10 -> 3.11 2015-08-31 18:26:43 +02:00
Guillaume Maudoux
ba3e4f6c10 python-pymongo: update 2.8 -> 3.0.3 2015-08-31 18:26:43 +02:00
Guillaume Maudoux
a57e6da65a python-plumbum: update 1.4.2 -> 1.5.0 2015-08-31 18:26:43 +02:00
Tobias Geerinckx-Rice
e3a93b6e9a python-packages: mycli 1.3.0 -> 1.4.0 
Remove now unused prompt_toolkit0_45, and pull the unversioned
attribute back to release 0.46 until dependents catch up.
 2015-08-31 17:17:32 +02:00
Tobias Geerinckx-Rice
42f329e841 python-packages: pgcli 0.19.1 -> 0.19.2 2015-08-31 17:17:31 +02:00
Tobias Geerinckx-Rice
5d6323817c python-packages: sqlparse 0.1.14 -> 0.1.16 2015-08-31 17:17:31 +02:00
Peter Simons
dea5d87e42 ghc-7.10.2: enable documentation builds by passing the required XML/XSLT toolchain 
Closes https://github.com/NixOS/nixpkgs/issues/9265.

Also, pass a hscolour binary to get source code links in the generated Haddock
documentation: closes https://github.com/NixOS/nixpkgs/issues/2985.
 2015-08-31 16:49:37 +02:00
Peter Simons
d7055b15b7 ghc: drop obsolete version 7.10.1 
The new 7.10.2 version works fine.
 2015-08-31 16:46:39 +02:00
rnhmjoj
d4b4647857 bdf2psf: init at 1.132 2015-08-31 16:04:32 +02:00
Peter Simons
77f18a152b Merge pull request #9574 from rnhmjoj/pirate-get 
pirate-get: init at 0.2.7
 2015-08-31 15:43:56 +02:00
Arseniy Seroka
fc1165b0d9 Merge pull request #9550 from mbakke/pbr-1.6 
pbr: 0.9.0 -> 1.6.0
 2015-08-31 16:22:22 +03:00
rnhmjoj
5553280940 pirate-get: init at 0.2.7 2015-08-31 13:04:20 +00:00
Marius Bakke
1869b8f213 stevedore: 0.15 -> 1.7.0 2015-08-31 12:42:22 +01:00
Marius Bakke
642a10df0e oslosphinx: init at 3.1.0 2015-08-31 12:41:59 +01:00
Marius Bakke
f5f24ce884 pbr: 0.9.0 -> 1.6.0 2015-08-31 12:40:54 +01:00
Luca Bruno
3e391b839a mongo-tools: fix build 2015-08-31 11:17:33 +02:00
Vladimír Čunát
c53018c9a1 all-packages: warn when using deprecated attributes 
The aliases are split into two groups, as mass-renaming is anticipated.
Also added fold markers as in the rest of file.
https://github.com/NixOS/nixpkgs/issues/9456
 2015-08-31 09:56:03 +02:00
William A. Kennington III
8e26a55dc4 linux: Add 4.2.0 2015-08-30 18:20:19 -07:00
Domen Kožar
83b5a75d94 nettle27: remove uneeded package superseeded by 3.x 
(cherry picked from commit b4b6b914c45061b403e1d0db2858f44d7776e65e)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-08-31 00:07:55 +02:00
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