alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
68231 commits 217 branches 121 tags 4.5 GiB
Commit graph

58965 commits

Author SHA1 Message Date
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
Eelco Dolstra 9000ddce90 openvpn: Update to 2.3.7 2015-08-31 17:54:56 +02:00
Eelco Dolstra a88b9bf19e Revert "openvpn: 2.3.6 -> 2.3.8" 
This reverts commit f547eaab44 because
it breaks asking passphrased via systemd.
 2015-08-31 17:54:56 +02:00
Tobias Geerinckx-Rice 6a02e7201c packagekit: 1.0.7 -> 1.0.8 2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice 2245e09218 geolite-legacy: update 2015-08-24 -> 2015-08-31 2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice 80a882e6cc dpkg: 1.18.1 -> 1.18.2 2015-08-31 17:17:33 +02:00
Tobias Geerinckx-Rice 5ab17dbe98 rescuetime: 2.8.8.1040 -> 2.8.9.1170 
Fix build broken by upstream (unversioned) .deb change.

CC maintainer @cstrahan.
 2015-08-31 17:17:32 +02:00
Tobias Geerinckx-Rice 45d5833e82 debian_devscripts: 2.15.4 -> 2.15.8 
Also:
- add some previously missing dependencies and patch /usr paths
- fix fetching of https:// URIs with perlPackages.LWPProtocolHttps
- remove the bash completion work-around (no longer needed)
- add newly required make flags
- change licence from string to attribute (still unspecified)

CC maintainer @raskin.
 2015-08-31 17:17:32 +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
Tobias Geerinckx-Rice 8a0a151d60 freefall: 3.19 -> 4.2 2015-08-31 17:17:30 +02:00
Peter Simons 4a8797d827 haskell-generic-builder: stop pre-pending "haskell-" to package names 
A derivation of the Hackage package "foo" is called "haskell-foo" if it is a
library, but only "foo" if it is an executable (without a library). This
distinction used to be fine when Haskell packages where visible to operations
like "nix-env -qa" or "nix-env -i", but after our switch to Haskell NG it has
no more purpose. Consequently, this patch removes the name prefix from all
Haskell packages -- every Haskell package is now called exactly like it's
called on Hackage.

Closes https://github.com/NixOS/nixpkgs/pull/9538.
 2015-08-31 16:50:12 +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 de2c043d5f ghc: install bash completion shipped in version 7.10.x and later 
Addresses one half of https://github.com/NixOS/nixpkgs/issues/9265.
 2015-08-31 16:49:00 +02:00
Peter Simons c7a9fa11c0 haskell-DSA fails its test suite. 2015-08-31 16:46:39 +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
Peter Simons 34687b53e6 haskell-amazonka-core: test suite build failure has been fixed upstream 2015-08-31 16:46:39 +02:00
Peter Simons 0059984294 haskell-MFlow: build fixed upstream 2015-08-31 16:46:39 +02:00
Peter Simons 82160f77a3 hackage-packages.nix: update to 9ef9917fdb with hackage2nix v20150824-49-gbeb4fa1 2015-08-31 16:46:36 +02:00
Nikolay Amiantov 4ce182c736 xlockmore: clean configure flags and add Xinerama and DPMS support 
Close #9391.
 2015-08-31 16:35:26 +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
Mateusz Kowalczyk b263ca0208 Merge pull request #9513 from andrewrk/ffmpeg-2.7.2 
ffmpeg: 2.7.1 -> 2.7.2
 2015-08-31 14:07:27 +01:00
rnhmjoj 5553280940 pirate-get: init at 0.2.7 2015-08-31 13:04:20 +00:00
Austin Seipp 03bc71f174 nixpkgs: tarsnap 1.0.35 -> 1.0.36.1 
This also fixes the same build failure present in `scrypt-1.2.0`,
which is quite trivial.

(partially cherry picked from commit 54c7053b)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 08:01:38 -05:00
Austin Seipp 8a74451273 nixpkgs: scrypt 1.1.6 -> 1.2.0 
Now with less build breakage!
 2015-08-31 07:54:49 -05:00
Nikolay Amiantov ed5f04eb86 deadbeef: fix patch checksum 2015-08-31 14:57:17 +03:00
Cillian de Róiste 75f880b1d1 mednafen: fix src url (sourceforge -> mednafen.fobby.net) 
Also bump the minor version 0.9.38.5 -> 0.9.38.6
 2015-08-31 13:50:14 +02: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
Austin Seipp 7399c600e4 Revert "nixpkgs: scrypt 1.1.6 -> 1.2.0" 
This breaks the build. :(

This reverts commit 4022e07c1e.
 2015-08-31 05:43:40 -05:00
Luca Bruno 3e391b839a mongo-tools: fix build 2015-08-31 11:17:33 +02:00
Eelco Dolstra 4725d21583 bibtex-tools: Mark as broken 
Tarball is missing.
 2015-08-31 11:13:12 +02:00
Austin Seipp 4068869d62 nixpkgs: openresty 1.7.10.1 -> 1.9.3.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:18:13 -05:00
Austin Seipp 6e9b561a88 nixpkgs: trace-cmd 2.5.3 -> 2.6 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:18 -05:00
Austin Seipp 4022e07c1e nixpkgs: scrypt 1.1.6 -> 1.2.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp ce73dbd791 nixpkgs: pax-utils 1.0.5 -> 1.1.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp 860d720940 nixpkgs: nginxUnstable 1.9.3 -> 1.9.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp 5f5cc4e4f4 nixpkgs: musl 1.1.10 -> 1.1.11 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp 23b16c8d19 nixpkgs: mono 4.0.2.5 -> 4.0.3.20 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp b1f502b94e nixpkgs: afl 1.86b -> 1.88b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:16 -05:00
Austin Seipp e84c8772c9 nixpkgs: nmap 6.47 -> 6.49BETA4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:16 -05:00
Peter Simons 5a961f4e84 Merge pull request #9568 from dfoxfranke/haskell-lucid 
haskell-lucid: disable tests
 2015-08-31 10:16:51 +02:00
Peter Simons 8a7d90499d Merge pull request #9569 from dfoxfranke/haskell-comonad 
haskell-comonad: re-enable tests
 2015-08-31 10:16:23 +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
Daniel Fox Franke ca673d66de policycoreutils: fix i686-linux compilation error, closes #9544 
This adds a patch to quiet a compiler warning which would be harmless
except that it breaks the build due to use of -Werror.
See http://hydra.nixos.org/build/25151888/nixlog/1
 2015-08-31 09:39:07 +02:00
William A. Kennington III 38e2c1586b zfs_git: 2015-07-21 -> 2015-08-30 2015-08-31 00:09:18 -07:00
William A. Kennington III bdbe9fc172 spl_git: 2015-07-21 -> 2015-08-25 2015-08-31 00:09:02 -07:00
William A. Kennington III 5056267761 nvidia: Add 4.2 patch 2015-08-31 00:08:33 -07:00
Daniel Fox Franke 76a497c95e haskell-comonad: re-enable tests 
https://github.com/ekmett/comonad/issues/25 is fixed now and they
work again.
 2015-08-30 22:19:36 -04:00
Daniel Fox Franke cf3e2a5f5b haskell-lucid: disable tests 
They buggily make assumptions about the order in which strings appear
in a hash table and thereby fail on i686-linux. See
http://hydra.nixos.org/build/25132604/log/raw and
https://github.com/chrisdone/lucid/issues/25
 2015-08-30 21:46:09 -04:00
William A. Kennington III 8e26a55dc4 linux: Add 4.2.0 2015-08-30 18:20:19 -07:00
rnhmjoj 721dc51640 telegram-cli: keep arguments passed to the wrapper 
Also break long lines
 2015-08-30 22:57:08 +00:00
Benjamin Staffin cd142cea4f vimPlugins.unite: Init at 2015-08-29 
unite works nicely together with vimshell.
 2015-08-30 15:31:52 -07:00
Domen Kožar 556eb9b30b Merge pull request #9546 from dfoxfranke/openafs-client 
openafs-client: 1.6.9 -> 1.6.14, fix build
 2015-08-31 00:18:27 +02:00
Domen Kožar 83b5a75d94 nettle27: remove uneeded package superseeded by 3.x 
(cherry picked from commit b4b6b914c4)
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 96ce94c151 Merge pull request #9557 from kamilchm/bluejeans-pulseaudio 
bleujeans: fix hanging on connect screen
 2015-08-31 00:59:25 +03:00
Arseniy Seroka 7cf4d2cf5b Merge pull request #9556 from kamilchm/vim-go 
vimPlugins: replace unmaintained vim-golang with vim-go
 2015-08-31 00:58:54 +03:00
Arseniy Seroka 167f1891c3 Merge pull request #9565 from nbarbey/fuseiso 
fuseiso: init at 20070708
 2015-08-31 00:58:12 +03:00
Kamil Chmielewski 25f19c2725 vimPlugins: replace unmaintained vim-golang with vim-go 2015-08-30 22:36:02 +02:00
Nicolas Barbey b4215fdda5 fuseiso: init at 20070708 2015-08-30 22:28:39 +02:00
Arseniy Seroka 984ca122f4 Merge pull request #9506 from benley/vim2nix 
vimUtils.pluginnames2nix: fixes for non-nixos systems
 2015-08-30 23:15:26 +03:00
Arseniy Seroka 4d76808fca Merge pull request #9548 from hiberno/bump-rofi-pass 
rofi-pass: 1.0 -> 1.2
 2015-08-30 23:12:24 +03:00
Arseniy Seroka 582ed94aa2 Merge pull request #9559 from k0ral/conky 
conky: 1.9.0 -> 1.10.0
 2015-08-30 23:10:13 +03:00
Arseniy Seroka 89de878498 Merge pull request #9564 from k0ral/beets 
beets: 1.3.13 -> 1.3.14
 2015-08-30 23:09:39 +03: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
Thomas Tuegel 5d57d8244a Merge pull request #9427 from henrytill/racket-6.2.1 
racket: 6.2 -> 6.2.1
 2015-08-30 13:56:54 -05: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
koral d3723b300e beets: 1.3.13 -> 1.3.14 2015-08-30 18:34:10 +00:00
William A. Kennington III ba8b70bd54 etcd: 2.1.1 -> 2.1.2 2015-08-30 10:57:17 -07:00
William A. Kennington III d96b30f5b0 dos2unix: 7.2.2 -> 7.3 2015-08-30 10:57:16 -07:00
William A. Kennington III 0210ecab70 ceph-git: 2015-08-18 -> 2015-08-29 2015-08-30 10:57:16 -07:00
William A. Kennington III dc506110c1 nvidia: 352.30 -> 352.41 2015-08-30 10:57:16 -07:00
William A. Kennington III b3d5a11b5b lmbd: 0.9.15 -> 0.9.16 2015-08-30 10:57:16 -07:00
William A. Kennington III d4fc051c06 jemalloc: 3.6.0 -> 4.0.0 2015-08-30 10:57:16 -07:00
Cillian de Róiste 2c5e423a77 calf: fix src URL (sourceforge->calf-studio-gear.org) 2015-08-30 19:02:09 +02:00
Cillian de Róiste e67a0119e2 kde4.digikam: update from 4.11.0 to 4.12.0 2015-08-30 17:38:03 +02:00
Cillian de Róiste 6e58e2307a xf86_input_wacom: update from 0.30.0 to 0.31.0 2015-08-30 17:37:36 +02:00
koral 7eb5b00d82 conky: 1.9.0 -> 1.10.0 2015-08-30 14:18:47 +00:00
Kamil Chmielewski 4b522294c8 bleujeans: fix hanging on connect screen 2015-08-30 16:13:49 +02:00
Thomas Tuegel 875f660481 wrapFirefox: remove (broken) sed trick 
This sed trick to set argv[0] is made obsolete by c234f37, which sets
argv[0] correctly anyway.
 2015-08-30 08:33:44 -05:00
Peter Simons 78f1720532 haskell-lib: make sdistTarball and buildStrictly functions fuzzier to cope with Hydra builds 
In Hydra CI environments, the version strings we get from Hydra don't
necessarily match those hard-coded into the Cabal files. To make those builds
succeed anyway, we have to apply some pattern matching.
 2015-08-30 15:20:21 +02:00
Thomas Tuegel 29ee3ec8c4 cantor: patch to fix filename string type 2015-08-30 07:23:44 -05:00
Peter Simons b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN 523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
Austin Seipp 16b47aff4b nixpkgs: saw-tools 0.1-20150609 -> 0.1.1-20150731 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-30 02:58:47 -05: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
hiberno a51efdcb48 rofi-pass: 1.0 -> 1.2 2015-08-30 09:54:21 +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
Benjamin Staffin ff03cf23c6 prometheus-*: trivial cleanup 2015-08-29 22:30:26 -07:00
Benjamin Staffin e734ce05b8 prometheus-pushgateway: move go-bindata into nativeBuildInputs 
Thereotically make life easier for a future cross-compilation path.
 2015-08-29 22:13:51 -07:00
Benjamin Staffin 94407ad644 prometheus-alertmanager: streamline build, prune buildInputs 
It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
 2015-08-29 22:13:51 -07:00
Benjamin Staffin a480bd89dc prometheus-*: fixes to deal with goPackages multiple-outputs changes 2015-08-29 22:13:51 -07:00
Benjamin Staffin 96882b14d5 prometheus: Include console templates and libraries 
Also tweaked to work with the recent goPackages multiple-outputs stuff.
 2015-08-29 22:13:51 -07:00
Daniel Fox Franke dbf8feb815 openafs-client: 1.6.9 -> 1.6.14, fix build 
* Upgrade 1.6.9 -> 1.6.14
* Support all kernels
* Clean up nested smart-quotes that seemed to be causing a build failure
* Remove redundant `assert isLinux`: already checked by meta.platforms
 2015-08-29 23:34:56 -04:00
Nikolay Amiantov 1d78437848 wesnoth: 1.10.7 -> 1.12.4 2015-08-30 05:36:17 +03: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
William A. Kennington III ba7335700a nghttp2: 1.1.2 -> 1.2.1 2015-08-29 18:19:38 -07:00
Carter Charbonneau ffc679460f networkmanager: build with dnsmasq 
Networkmanager requires dnsmasq for network sharing
 2015-08-30 02:55:56 +02:00
Thomas Tuegel e9a8c5a988 Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl 
qt5: embed path to mesa (libGL) in Qt mkspecs file
 2015-08-29 18:11:15 -05: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
Daniel Fox Franke 36ac761340 expect: fix Darwin linkage 
expect's build system doesn't seem to provide the proper linker flags
for the expect programs to be able to find libexpect on Darwin. (Stuff
like this should really just use libtool. *sigh*). Setting
DYLD_LIBRARY_PATH is an inelegant hack, but it gets the job done
without risking affecting other platforms.
 2015-08-30 00:50:48 +02: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
koral da6b369029 xurls: 0.6.0 -> 0.7.0 2015-08-29 23:46:18 +02:00
ro6 3207b9f70f urweb: 20150520 -> 20150819 2015-08-29 23:41:22 +02: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 06ed82677a qt5: embed path to mesa (libGL) in Qt mkspecs file 
Fixes this problem, when building apps in QtCreator:

  ...(compile output window)
  g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -o qt-test3 main.o mainwindow.o moc_mainwindow.o \
      -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
  collect2: error: ld returned 1 exit status

mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.

Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
 2015-08-29 22:21:57 +02: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
Rok Garbas 33cb16104c vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons 2015-08-29 21:01:38 +02:00
Rok Garbas c61ade7b52 vimPlugins: updated (and sorted alphabetically) 2015-08-29 21:01:28 +02:00
William A. Kennington III 3afc3494bb goPackages: Use parallel instead of forking in bash 2015-08-29 11:51:26 -07:00
Peter Simons b9e999a595 Merge pull request #9526 from dfoxfranke/cvs-fast-export 
cvs-fast-export: don't link against librt
 2015-08-29 20:09:59 +02:00
Peter Simons 6b1bcc66ae haskell-MFlow: fix build 2015-08-29 20:01:49 +02:00
William A. Kennington III 4121c5064a parallel: Fix some needed dependencies 2015-08-29 10:49:23 -07:00
Jaka Hudoklin 8ceca44dbd Merge pull request #9363 from Havvy/iojs 
iojs: 3.0.0 -> 3.1.0
 2015-08-29 19:00:15 +02: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
Jaka Hudoklin 5c91812c79 Merge pull request #9351 from offlinehacker/pkgs/xca/update/1.3.0 
xca: Update to 1.3.0
 2015-08-29 18:44:56 +02:00
Jaka Hudoklin 256d2950b9 xca: 0.9.3 -> 1.3.0 2015-08-29 18:44:02 +02:00
Jaka Hudoklin bb708a5dad Merge pull request #9531 from offlinehacker/pkgs/skydns/update_2.5.2b 
skydns: 2.5.0a -> 2.5.2b
 2015-08-29 18:34:04 +02:00
Jaka Hudoklin 03b564620b Merge pull request #9529 from offlinehacker/pkgs/qtpass/1.0.1 
qtpass: 0.8.4 -> 1.0.1
 2015-08-29 18:33:29 +02:00
Jaka Hudoklin 95e2403f86 Merge pull request #9530 from offlinehacker/pkgs/docker/fix_add_utillinux 
docker: add blkid from utillinux to path
 2015-08-29 18:32:52 +02:00
Jaka Hudoklin e2f673e024 skydns: 2.5.0a -> 2.5.2b 2015-08-29 18:28:50 +02:00
Jaka Hudoklin ff0575a2f1 docker: add blkid from utillinux to path 2015-08-29 18:25:39 +02:00