3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

80467 commits

Author SHA1 Message Date
Vladimír Čunát c73191f11e nixpkgs manual: add multiple-output chapter 2016-04-07 16:00:41 +02:00
Vladimír Čunát 710573ce6d Merge #12653: rework default outputs 2016-04-07 16:00:09 +02:00
Vladimír Čunát 9a824f2f1d treewide: rename extraOutputs{ToLink,ToInstall}
This is to get more consistent with `meta.outputsToInstall`.
2016-04-07 15:59:44 +02:00
Vladimír Čunát 2995439003 buildEnv: respect meta.outputsToInstall
As a result `systemPackages` now also respect it.
Only nix-env remains and that has a PR filed:
    https://github.com/NixOS/nix/pull/815
2016-04-07 15:59:44 +02:00
Vladimír Čunát 3342f717da stdenv: set meta.outputsToInstall unless overridden 2016-04-07 15:59:43 +02:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Eelco Dolstra c55cfe0cb3 stdenv-linux: Update bootstrap tools 2016-04-07 13:17:16 +02:00
Charles Strahan bde82098b8 stdenv: don't complain about configure script not existing
Close #14335.
Since 89036ef76a, when a package doesn't include a configure script,
the build complains with:

    grep: : No such file or directory
    grep: : No such file or directory

This prevents that.
2016-04-02 20:52:19 +02:00
Tomasz Kontusz 6c9ce23c00 cc-wrapper: Fix a typo in param parsing (close #14401) 2016-04-02 20:51:48 +02:00
Vladimír Čunát 056b5a1a5f tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
2016-04-02 16:26:32 +02:00
Thomas Tuegel d681d580ae Merge branch 'qt-unsetenv' into staging 2016-04-01 06:31:29 -05:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Thomas Tuegel 314792d9eb qtquick1: unset QML_IMPORT_PATH after loading 2016-03-31 16:12:35 -05:00
Thomas Tuegel da4b9d3b62 qtdeclarative: unset QML2_IMPORT_PATH after loading 2016-03-31 16:08:24 -05:00
Thomas Tuegel 7f336a4513 qtbase: unset QT_PLUGIN_PATH after loading 2016-03-31 14:36:30 -05:00
Nikolay Amiantov f752424924 qt55.qtbase: use more system libraries 2016-03-31 15:53:06 +03:00
Nikolay Amiantov 5199176b65 Merge branch 'master' into staging 2016-03-31 15:46:52 +03:00
Eelco Dolstra 4e356cefd7 Move the EC2 AMI registry from the NixOps repo
NixOps has infrequent releases, so it's not the best place for keeping
the list of current AMIs. Putting them in Nixpkgs means that AMI
updates will be delivered as part of the NixOS channels.
2016-03-31 14:16:51 +02:00
Michael Raskin cdb2bc77c4 davfs2: 1.4.7 -> 1.5.2; fixes the build 2016-03-31 14:14:40 +02:00
Lluís Batlle i Rossell d2c00001f8 freeimage: updating to 3.17
It is buggy in 32-bit: sizeof(uint64) != 8 !!.
2016-03-31 12:35:57 +02:00
Eelco Dolstra e60be0923b NixOS manual: Add some release notes 2016-03-31 12:32:33 +02:00
Eelco Dolstra 60f07e8e10 Revert "gcc: Use the pre-C++11 ABI by default"
This reverts commit 83011723af. This
never worked because gcc's setup hook is never actually sourced. I
could fix this but since nobody complained, we probably don't need it.
2016-03-31 12:30:54 +02:00
Nikolay Amiantov 594cd3bf5e Merge pull request #14337 from dguibert/fix/skype
skype: build qt4 with the 32bits clangStdenv
2016-03-31 13:49:58 +04:00
vbgl 149b9faac0 Merge pull request #14323 from nathan7/fsharp-4.0.1.1
fsharp: 4.0.0.4 -> 4.0.1.1
2016-03-31 11:43:13 +02:00
Frederik Rietdijk 97a29ff817 Merge pull request #14110 from lancelotsix/clean_sqlalchemy_legacy
Clean sqlalchemy legacy
2016-03-31 10:52:53 +02:00
David Guibert 7f69d5ed8c skype: build qt4 with the 32bits clangStdenv
This allows to build skype without errors like this:
clang++ -Wl,-O1 -o libmng libmng.o     -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/72nklasrjg774iwxxnpyxwkzxz2j37v5-libmng-2.0.2/lib/libmng.so when searching for -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: cannot find -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.so when searching for -lm
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.a when searching for -lm
clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation)
2016-03-31 10:37:02 +02:00
Franz Pletz e5334ceca2 Merge pull request #14305 from benwbooth/xe-guest-utilities-6.2.0
xe-guest-utilities: init at 6.2.0
2016-03-31 10:12:42 +02:00
aszlig a3ac630092
nixos/tests: Add a test for keyboard layouts
I had the basic version of this laying around for some while but didn't
continue on it. Originally it was for testing support for the Neo layout
introduced back then (8cd6d53).

We only test the first three Neo layers, because the last three layers
are largely comprised of special characters and in addition to that the
support for the VT keymap seems to be limited compared to the Xorg
keymap.

Yesterday @NicolasPetton on IRC had troubles with the Colemak layout
(IRC logs: http://nixos.org/irc/logs/log.20160330, starting at 16:08)
and I found that test again, so I went for improving and adding to
<nixpkgs>.

While the original problem seemed to be related to GDM, we can still add
another subtest that checks whether GDM correctly applies the keyboard
layout. However I don't have a clue how to properly configure the
keyboard layout on GDM, at least not within the NixOS configuration.

The main goal of this test is not to test a complete set of all key
mappings but to check whether the keymap is loaded and working at all.

It also serves as an example for NixOS keyboard configurations.

The list of keyboard layouts is by no means complete, so everybody is
free to add their own to the test or improve the existing ones.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-31 09:49:08 +02:00
Lluís Batlle i Rossell ab93f8c137 Making vm's qemu cache=unsafe. Faster.
I don't think it's unsafe, if it's meant for nix expressions.
2016-03-31 09:27:25 +02:00
Lluís Batlle i Rossell e21dd19168 Making vm's interactive shell handle the terminal well. 2016-03-31 09:27:14 +02:00
Frederik Rietdijk 933e46c095 Merge pull request #14329 from bcdarwin/fix-python-packages
fix nesting error resulting in topydo metadata being attached to the …
2016-03-31 09:05:56 +02:00
Frederik Rietdijk 1281a1bd5c Merge pull request #14331 from ne0phyte/librecad-2.0.9
librecad: 2.0.8 -> 2.0.9
2016-03-31 09:04:45 +02:00
Franz Pletz 53cf0cfd71 Merge pull request #14322 from bobvanderlinden/pr-hwinfo-21.23
hwinfo: 21.12 -> 21.23
2016-03-31 08:33:50 +02:00
Tuomas Tynkkynen c12f63821f ios-cross-compile: Don't build on hydra 2016-03-31 07:20:21 +03:00
ne0phyte 1532ce35b8 librecad: 2.0.8 -> 2.0.9 2016-03-31 04:28:01 +02:00
Tobias Geerinckx-Rice 57f4678bbb x2goclient: 4.0.5.0 -> 4.0.5.1 2016-03-31 02:53:31 +02:00
Tobias Geerinckx-Rice e0c53be991 tzdata: 2016b -> 2016c 2016-03-31 02:53:31 +02:00
Ben Darwin 8347f94216 fix nesting error resulting in topydo metadata being attached to the enclosing set 2016-03-30 19:56:01 -04:00
Michael Raskin 016d523d82 cvc4: fix the build by skipping line markers in cpp expansions during configure, helps the configure script to find Boost version 2016-03-31 01:52:33 +02:00
Vladimír Čunát 254e2cc982 hhvm: disable parallel building
/cc #14151.
http://hydra.nixos.org/build/33846692/nixlog/1/tail
2016-03-31 00:56:34 +02:00
Domen Kožar 207549ec9d Merge pull request #14325 from teozkr/fix-oidentd-gcc5
oidentd: Set C dialect to gnu89 (broken by GCC 5)
2016-03-30 23:22:16 +01:00
Michael Raskin cd87edce14 tinycc: 0.9.26 -> 0.9.27pre-20160328 (from git); apparently fixes the segfaults 2016-03-31 00:17:55 +02:00
Teo Klestrup Röijezon 2d4af4b979 oidentd: Set C dialect to gnu89 (broken by GCC 5) 2016-03-31 00:08:27 +02:00
Frederik Rietdijk 40ed938ef2 Merge pull request #14267 from FRidh/openblas
openblas: 0.2.15 -> 0.2.17
2016-03-30 23:30:40 +02:00
Eelco Dolstra 1783e33b06 Fix the boot-ec2-config test 2016-03-30 22:22:40 +02:00
Domen Kožar 1845159705 perlPackages.UnicodeString: fix build (also imapsync) 2016-03-30 21:06:40 +01:00
Luca Bruno 04d4d0000f namazu: mark as broken 2016-03-30 21:54:03 +02:00
Eelco Dolstra 0d3738cdcc Fix the EC2 test
We now generate a qcow2 image to prevent hitting Hydra's output size
limit. Also updated /root/user-data -> /etc/ec2-metadata/user-data.

http://hydra.nixos.org/build/33843133
2016-03-30 21:50:23 +02:00
Nathan Zadoks 77d79ef6a4 fsharp: 4.0.0.4 -> 4.0.1.1 2016-03-30 21:46:56 +02:00
Luca Bruno 184b7ba3c6 glib-tested: suppress gdbus test needing machine-id 2016-03-30 21:27:29 +02:00