Commit graph

78938 commits

Author SHA1 Message Date
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 d6b46ecb30 Merge branch 'closure-size' into p/default-outputs 2016-03-14 11:27:15 +01:00
Thomas Tuegel 55b6c17926 Merge pull request #13840 from ttuegel/closure-size-darwin
Fix evaluation errors on Darwin
2016-03-11 13:17:16 -06:00
Thomas Tuegel 42b1e8ee58 ghc-6.10.2-binary: fix evaluation error on Darwin 2016-03-11 10:30:45 -06:00
Thomas Tuegel 2667e4f5d7 make-bootstrap-tools: fix evaluation error on Darwin 2016-03-11 10:30:28 -06:00
Thomas Tuegel 1f56abef8e recoll: fix evaluation error on Darwin 2016-03-11 09:53:20 -06:00
Thomas Tuegel 5ec07e4bf3 module-init-tools: disable on Darwin to fix evaluation error 2016-03-11 09:53:04 -06:00
Thomas Tuegel 1fae9a36aa ppp: fix evaluation error on Darwin 2016-03-11 09:12:39 -06:00
Thomas Tuegel 9e5b2d5e3d qt48: fix evaluation error on Darwin 2016-03-11 09:10:10 -06:00
Thomas Tuegel cd5e923f55 luajit: fix evaluation on Darwin 2016-03-11 08:57:39 -06:00
Thomas Tuegel c0c2be83a3 kde5.plasma-workspace: move kbuildsycoca5 earlier in startkde 2016-03-11 08:48:10 -06:00
Vladimír Čunát 4c0125bc8f chromium: fixup plugins with multiple outputs
Chromium+flash seem to work fine now.
2016-03-11 15:10:51 +01:00
Vladimír Čunát c801cd1a04 php: fixup build when configured with httpd via nixos 2016-03-11 11:54:53 +01:00
Thomas Tuegel cb1b4e803d kde5.kcalc: add gmp dependency 2016-03-09 06:49:44 -06:00
Thomas Tuegel 1d5a9c0fab kde5: fix merge conflicts from master
The last merge from master into closure-size obliterated all my
closure-size fixes for KDE 5! Luckily, I had them backed-up in another
branch.
2016-03-09 06:49:44 -06:00
Thomas Tuegel 394ffcb3e5 staruml: fix evaluation on closure-size 2016-03-08 11:34:52 -06:00
Vladimír Čunát 2cbe6bb3f0 nix: split man output from doc 2016-03-08 09:59:31 +01:00
Vladimír Čunát 61ebdc192d bash-interactive: better split doc stuff
... while avoiding mass rebuild ATM.
2016-03-08 09:59:24 +01:00
Vladimír Čunát b291f1682f perl merge fixup 2016-03-08 09:59:12 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Vladimír Čunát f306e67e15 kde5: move files around to simplify merge
It is analogous to 98d8e1a160.
2016-03-08 09:42:41 +01:00
John Wiegley 0ee75214f3 proofgeneral_HEAD: New expr: Proof General from GitHub 2016-03-07 07:16:04 -08:00
joachifm 046e5011b4 Merge pull request #13691 from AndersonTorres/cutegram
Cutegram: add qtimageformats (for sticker support)
2016-03-07 14:10:08 +00:00
Peter Simons 48a9555bc0 Merge pull request #13695 from forked-upstream-packages-for-ghcjs/more-bootpkgs
ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's…
2016-03-07 14:15:42 +01:00
Peter Simons e338d6a0fc splix: revert "2.0.0 -> svn-r315" version update
This reverts commit 6ea526462b and a9f8613dae to fix
https://github.com/NixOS/nixpkgs/issues/13734.
2016-03-07 13:37:54 +01:00
joachifm f0e5bf02e2 Merge pull request #13726 from NeQuissimus/upower0994
upower: 0.99.3 -> 0.99.4
2016-03-07 12:27:16 +00:00
joachifm 453686a24a Merge pull request #13705 from aneeshusa/use-bin-instead-of-sbin-for-openssh
openssh: use bin instead of sbin folder
2016-03-07 12:03:37 +00:00
joachifm 884627a6ef Merge pull request #13720 from aneeshusa/allow-compiling-openssh-without-linking-openssl
openssh: allow building without linking openssl
2016-03-07 11:55:36 +00:00
Franz Pletz 2b5867f250 Merge pull request #13730 from nico202/non-update
non: 2016-02-07 -> 2016-03-06
2016-03-07 12:43:20 +01:00
Franz Pletz 661079abb7 Merge pull request #13728 from andrewrk/libsoundio
libsoundio: 1.0.3 -> 1.1.0
2016-03-07 12:42:42 +01:00
Franz Pletz 51b55c0bff Merge pull request #13724 from kragniz/linux-testing-4.5-rc7
linux-testing: 4.5-rc6 -> 4.5-rc7
2016-03-07 12:37:36 +01:00
joachifm 8cff02206b Merge pull request #13725 from nathan7/bird-user
bird module: run as user/group `bird`, not `ircd`
2016-03-07 11:34:06 +00:00
Matthias C. M. Troffaes 495985ace3 wolfssl: 3.7.0 -> 3.8.0
changes by @globin: use autoreconfHook

closes #13731

Signed-off-by: Robin Gloster <mail@glob.in>
2016-03-07 10:39:14 +00:00
= a6479aa580 non: 2016-02-07 -> 2016-03-06 2016-03-07 11:01:29 +01:00
Peter Simons 350b5193c0 Merge pull request #13709 from mboes/stack-env-support
buildStackPackage: Fix path to generic-stack-builder.nix.
2016-03-07 11:01:24 +01:00
Christoph Hrdinka 67e93e984c Merge pull request #13723 from Profpatsch/wheter
wheter -> whether
2016-03-07 10:51:43 +01:00
Emery Hemingway af39abcb9f Merge pull request #13533 from valeriangalliat/allow-go-reference
buildGoPackage: do not remove Go references if allowGoReferences is true
2016-03-07 09:05:27 +01:00
Andrew Kelley 4f013e9159 libsoundio: 1.0.3 -> 1.1.0 2016-03-07 00:44:36 -07:00
Christoph Hrdinka d3e3b135ea pidgin: fix gstreamer plugin path
Closes #13722, fixes #13719 and maybe #10556.
2016-03-07 07:03:49 +01:00
Franz Pletz c686f03305 tomcat: 6.0.44 -> 6.0.45, 7.0.62 -> 7.0.68, 8.0.23 -> 8.0.32
Fixes at least CVE-2015-5174, CVE-2015-5345, CVE-2015-5351, CVE-2016-0706,
CVE-2016-0714, CVE-2016-0763.
2016-03-07 03:34:44 +01:00
Profpatsch 7f44b58609 wheter → whether
Nice weather today, isn’t it?
2016-03-07 03:06:54 +01:00
Tim Steinbach 3f3e8ed82b upower: 0.99.3 -> 0.99.4 2016-03-07 02:04:20 +00:00
Nikolay Amiantov 0da9c6b358 octoprint-plugins.m3d-fio: 0.29 -> 0.28.2 2016-03-07 04:56:23 +03:00
Franz Pletz 5e20409229 libmatroska: 1.4.1 -> 1.4.4 (security)
This fixes CVE-2015-8790 & CVE-2015-8791.
2016-03-07 02:54:40 +01:00
Franz Pletz 68702d24bf libebml: 1.3.1 -> 1.3.3 (security)
This release fixes CVE-2015-8790 & CVE-2015-8791.
2016-03-07 02:54:07 +01:00
Nathan Zadoks 0360e410b7 bird module: run as user/group bird, not ircd 2016-03-07 02:02:58 +01:00
Louis Taylor cdb0267efe linux-testing: 4.5-rc6 -> 4.5-rc7 2016-03-07 01:00:33 +00:00
Aneesh Agrawal 14201da332 openssh: allow building without linking openssl
http://undeadly.org/cgi?action=article&sid=20140430045723 has the
original announcement of this option. Note, openssl headers are still
required at build time, see this comment:
http://www.gossamer-threads.com/lists/openssh/dev/61125#61125
2016-03-06 16:36:55 -05:00