Commit graph

70179 commits

Author SHA1 Message Date
Tuomas Tynkkynen 61b4bdded4 gcc 4.9: Port multiple-outputs changes from gcc 4.8 2015-10-03 14:08:49 +02:00
Tuomas Tynkkynen d844a1002f stdenv/multiple-outputs: Fix checking of propagatedOutputs
'[[ ! -v "$propagatedOutputs" ]]' is incorrect and always evaluates to
true. The correct form using double brackets would be
'[[ ! -v propagatedOutputs ]]', but I strongly dislike '[[ ]]' due to
the totally different quoting rules compared to everything else in bash.
2015-10-03 14:08:48 +02:00
Tuomas Tynkkynen 52c4337356 stdenv/multiple-outputs: Guard greps with 'set +/-o pipefail'
This is required since #7524 is fixed ("stdenv: Errors in hooks (such as
postUnpack) get ignored")
2015-10-03 14:08:48 +02:00
Vladimír Čunát 2b67ba2ad2 pkgconfig: post-merge fixup 2015-10-03 14:08:48 +02:00
Tuomas Tynkkynen f72376fd20 x11: Remove conflicting outputs produced by auto merge 2015-10-03 13:39:33 +02:00
Tuomas Tynkkynen 98419b2e54 flac: Remove conflicting outputs produced by auto merge 2015-10-03 13:36:16 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát 33373d939a Merge: staging with systemd 2015-10-02 10:24:41 +02:00
Tobias Geerinckx-Rice d1047f7c12 shared-mime-info: 1.3 -> 1.5 2015-10-02 05:31:41 +02:00
Tobias Geerinckx-Rice 18b3295970 tzdata: 2015f -> 2015g 2015-10-02 05:31:41 +02:00
Vladimír Čunát 4d3198ca31 libaccounts-glib: fixup build after glib update 2015-10-01 21:37:19 +02:00
William A. Kennington III 98172435f7 Merge branch 'master.upstream' into staging.upstream 2015-10-01 10:43:44 -07:00
William A. Kennington III 14961c8781 v8: Fix compilation issue with gcc4.9+ 2015-10-01 10:40:50 -07:00
Jude Taylor ccf48cea4d revert rubies callPackages change 2015-10-01 09:45:05 -07:00
Jude Taylor 4520a19151 add darwin libtool to nodejs 4.1.0 2015-10-01 09:20:12 -07:00
Jude Taylor 4833a37791 bring darwin libtool back into scope for node 2015-10-01 09:20:12 -07:00
Thomas Strobel 64eed4b98a deskcon: init at 0.3 2015-10-01 18:14:03 +02:00
Jude Taylor 2b1d851e3e add mpw 2015-10-01 08:58:28 -07:00
Jude Taylor 10054a676a update bundler-head SHA256 2015-10-01 08:58:28 -07:00
Jude Taylor 5379504451 Merge pull request #9834 from NixOS/rubies
Merge Ruby versions into one file
2015-10-01 08:58:28 -07:00
Thomas Strobel c720f06f7c linux kernel common config: re-enable NFC support
As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
2015-10-01 17:53:51 +02:00
Thomas Strobel 6dfb16730b networking module: fix DocBook tags 2015-10-01 17:50:42 +02:00
goibhniu 972b100b9a Merge pull request #10167 from ardumont/update-elpy-environment
[python+emacs packages] Update elpy environment
2015-10-01 17:45:10 +02:00
ts468 922d3ec839 Merge pull request #10121 from ts468/upstream.wlan
networking module: init 'wlanInterfaces' option
2015-10-01 15:40:03 +02:00
Thomas Strobel c0248c0c1f networking module: init 'wlanInterfaces' option
Configuration option for setting up virtual WLAN interfaces.

If the hardware NIC supports it, then multiple virtual WLAN interfaces can be
configured through the options of the new 'networking.wlanInterfaces' module.
For example, the following configuration transforms the device with the persistent
udev name 'wlp6s0' into a managed and a ad hoc device with the device names
'wlan-managed0' and 'wlan-adhoc0', respectively:

networking.wlanInterfaces = {
    "wlan-managed0" = {
        type = "managed";
        device = "wlp6s0";
    };
    "wlan-adhoc0" = {
        type = "ibss";
        device = "wlp6s0";
    };
};

Internally, a udev rule is created that matches wlp6s0 and runs a script which adds
the missing virtual interfaces and re-configures the wlp6s0 interface accordingly.
Once the new interfaces are created by the Linux kernel, the configuration of the
interfaces is managed by udev and systemd in the usual way.
2015-10-01 15:35:30 +02:00
Thomas Strobel e0d5b14ce4 neard: enable support for Secure Elements 2015-10-01 15:30:34 +02:00
Eelco Dolstra b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Eelco Dolstra 96e1b7eaf9 gnome-settins-daemon: Use libgudev 2015-10-01 14:17:24 +02:00
Arseniy Seroka 375ab720b3 Merge pull request #10124 from maurer/capnproto-bump
capnproto: 0.5.1.2 -> 0.5.3
2015-10-01 15:16:44 +03:00
Antoine R. Dumont (@ardumont) 2f5cbb1b62 emacs-packages: elpy add runtime dependencies on pythonpackages.elpy 2015-10-01 14:08:19 +02:00
Eelco Dolstra 562851a068 thunderbird: Update to 38.3.0 2015-10-01 13:54:00 +02:00
Eelco Dolstra 25bb1e10f3 firefox: Update to 41.0.1 2015-10-01 13:51:24 +02:00
Eelco Dolstra 52179a2518 Merge pull request #10166 from taku0/firefox-bin-41.0.1
firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0
2015-10-01 13:49:13 +02:00
taku0 57155e04a7 firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0 2015-10-01 20:44:37 +09:00
Arseniy Seroka 237428a938 Merge pull request #10130 from matthiasbeyer/update-avfs
avfs: 1.0.2 -> 1.0.3
2015-10-01 14:22:09 +03:00
Arseniy Seroka 3489413f46 Merge pull request #10131 from matthiasbeyer/update-openbox
openbox: 3.5.2 -> 3.6.1
2015-10-01 14:21:53 +03:00
Arseniy Seroka e0ae584dc7 Merge pull request #10134 from matthiasbeyer/update-wmutils-core
wmutils-core: 1.0 -> 1.1
2015-10-01 14:21:44 +03:00
Arseniy Seroka b752952a33 Merge pull request #10132 from matthiasbeyer/update-jetty
jetty: 5.1.4 -> 6.1.4
2015-10-01 14:21:38 +03:00
Arseniy Seroka ebfc08b92e Merge pull request #10154 from Twey/master
openfire: Fix JVM test
2015-10-01 14:20:59 +03:00
Arseniy Seroka f34aedfbd7 Merge pull request #10161 from dezgeg/pr-update-rpm
rpm: 4.11.2 -> 4.12.0
2015-10-01 14:20:43 +03:00
Luca Bruno e9b3a4f7c4 rl-1509.xml: Gnome -> GNOME 2015-10-01 12:53:27 +02:00
Antoine R. Dumont 3e91739437 emacs-packages: elpy init at 1.9.0 2015-10-01 12:34:19 +02:00
Antoine R. Dumont d69c493eed emacs-packages: pyvenv init at 1.7 2015-10-01 12:34:19 +02:00
Antoine R. Dumont b429a536de emacs-packages: highlight-indentation init at 0.7.0 2015-10-01 12:34:19 +02:00
Antoine R. Dumont c623972091 emacs-packages: find-file-in-project init at 3.5 2015-10-01 12:34:19 +02:00
Antoine R. Dumont 8755a79cb8 emacs-packages: yasnippet init at 0.8.1 2015-10-01 12:34:19 +02:00
Antoine R. Dumont (@ardumont) 364667c390 python-packages: elpy add runtime dependencies 2015-10-01 12:34:19 +02:00
Antoine R. Dumont 7fa6cc7529 python-packages: elpy 1.0.1 -> 1.9.0 2015-10-01 12:21:47 +02:00
Antoine R. Dumont 2593829486 python-packages: importmagic init at 0.1.3 2015-10-01 12:20:13 +02:00
Vladimír Čunát 00935b2554 Merge #10104: picolisp, ccl and sbcl improvements 2015-10-01 11:23:30 +02:00