zimbatm
6ae57b1b63
bundler: fix usage on nested call
...
The combination of bundler 1.12.5 and rubygems 1.6.2 doesn't play well
at all when trying to run gems such as foreman where bundler is used to
run bundler.
Just upgrading to the latest bundler rc doesn't fix it and changing rubygems causes a massive rebuild.
Issues:
- https://github.com/bundler/bundler/issues/4402
- https://github.com/bundler/bundler/issues/4576
- https://github.com/bundler/bundler/issues/4602
- https://github.com/docker-library/ruby/issues/73
This PR patches bundler to work around the issue as highlighted here and
unbreaks everything for me:
https://github.com/bundler/bundler/issues/4602#issuecomment-233619696
2016-08-29 17:03:12 +01:00
Eelco Dolstra
2755bcfa7c
In $NIX_PATH, use nixpkgs=...
...
This is required by the "nix" command to find Nixpkgs.
2016-08-29 17:50:25 +02:00
Eelco Dolstra
822e1ddd89
Use builtins.partition if available
2016-08-29 17:50:06 +02:00
obadz
1ba32c5403
Merge branch 'master' into staging
2016-08-29 16:22:36 +01:00
obadz
6389f9b349
Revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"
...
This reverts commit bddf4e21801d0629b608a8a0a46830c795e35ba4.
Trying to fix stdenvBootstrapTools.x86_64-darwin.stdenv
cc @copumpkin @domenkozar
2016-08-29 16:19:36 +01:00
Alexander Ried
8d26e56608
communi: 2016-01-03 -> 2016-08-19
2016-08-29 17:04:27 +02:00
Peter Simons
67c57a9ce5
Merge pull request #18016 from Profpatsch/spy-patch
...
haskellPackages.spy: fix for new fsnotify version
2016-08-29 16:55:06 +02:00
Peter Simons
486c204859
Merge pull request #18087 from YPares/stack-getlib
...
Haskell stack nix shell: using lib.getLib/Dev now
2016-08-29 16:54:36 +02:00
Peter Simons
8eaa645eca
Merge pull request #18086 from vbgl/maxima-5.38.1
...
maxima: 5.36.1 -> 5.38.1
2016-08-29 16:53:55 +02:00
YPares
9ddcd5d456
Haskell stack nix shell: using lib.getLib/Dev now
2016-08-29 16:15:09 +02:00
Vincent Laporte
17af87323d
maxima: 5.36.1 -> 5.38.1
2016-08-29 15:52:05 +02:00
Alexander Ried
07ed06f8da
libcommuni: 2016-03-23 -> 2016-08-17
...
add missing build input (fixes build)
2016-08-29 15:37:41 +02:00
Robin Gloster
6f21201f93
rtags: git-2016-04-29 -> 2.3
...
should fix the darwin build
2016-08-29 13:33:36 +00:00
Robin Gloster
005a147f92
sage: fix build
...
closes #17842
2016-08-29 12:46:51 +00:00
Vladimír Čunát
b981fe2095
vim-indent-guides: init at 2016-04-17
2016-08-29 14:40:12 +02:00
Vladimír Čunát
f688ea37d8
bear: init at 2.2.0
2016-08-29 14:13:01 +02:00
obadz
c527ece0b1
Merge pull request #18083 from NixOS/staging
...
Merge Staging
Contains compiler hardening by default as well as binutils version bump.
2016-08-29 13:07:29 +01:00
obadz
0e9d355397
musl: disable stackprotector hardening
...
Prevents busybox segfault
2016-08-29 13:04:29 +01:00
Tuomas Tynkkynen
69e51ebf55
kde-frameworks: Use chooseDevOutputs
2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
89833c0c72
binutils: Shuffle outputs
2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
dcf0e8ac48
kde5.plasma: Use 'dev' output of xf86inputsynaptics
2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
2f50cfe25f
qt5: Shuffle outputs
...
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
040fadf345
glibc_multi: Fix unnoticed output shuffle
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
55fa3b52a3
php: Fix mysql reference
...
TODO: Fix the mysql expression so this isn't needed.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
7c1607ae65
webkitgtk: Few last missing 'dev' references
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
fd4b3dcccb
gmp{4,5}: Split into multiple outputs
...
Keep all versions consistent so that e.g. 'gmp.dev' is always available,
regardless of version.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
8ed3d6a7e5
cmake 2.8: Fix build with shuffled outputs
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
ba6d94e6a5
ruby: dev -> devEnv
...
Otherwise conflicts with the convention of `dev` output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
0e26cf84fc
kernel: Remove propagatedBuildOutputs
...
Not needed after the shuffle.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
e065baafba
glibc: Make one exception for output order
...
Usages like '${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2' are much more
common than the bin output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen
5d55ae5d50
stdenv/multiple-outputs.sh: Change output propagation logic
...
Because 'dev' will most often not be the default output after my changes.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen
5326e85f3d
stdenv.mkDerivation: Use chooseDevOutputs
2016-08-29 14:49:51 +03:00
obadz
b74793bd1c
Merge branch 'master' into staging
...
Conflicts:
pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Frederik Rietdijk
aebabb9871
qarte: create python env
2016-08-29 13:36:50 +02:00
Vincent Laporte
58738e4bc7
qarte: 2.4.0 -> 3.2.0
2016-08-29 13:36:50 +02:00
Joachim Fasting
898edb0fbc
lttng-modules: 2.6.3 -> 2.8.0
...
Full changelog at
https://git.lttng.org/?p=lttng-modules.git;a=blob_plain;f=ChangeLog;hb=4d484e547c486f902a60216dc421cb891b772431
Built against linux and linux_latest
cc @bjornfor
2016-08-29 11:39:44 +02:00
Robin Gloster
6808de76e6
nixos doc: module meta attribute section cleanup
2016-08-29 09:34:24 +00:00
Robin Gloster
f3c994ca11
rhino: disable format/fortify hardening
2016-08-29 09:08:03 +00:00
Robin Gloster
b0b2a94751
pdftk: disable format/fortify hardening
2016-08-29 09:02:03 +00:00
Frederik Rietdijk
aca4801f53
mendeley: add missing liborc
2016-08-29 10:35:30 +02:00
Frederik Rietdijk
5da0b34591
liborc: init at 0.4.16
2016-08-29 10:35:21 +02:00
Robin Gloster
0865e22567
xorg.xf86videoxgi: add patch to fix build
2016-08-29 08:25:12 +00:00
Frederik Rietdijk
d87b415dec
mendeley: 1.16.1 -> 1.16.2
2016-08-29 10:02:05 +02:00
Eric Sagnes
aa8e663b6e
nixos doc: add modules meta-attributes ( #18078 )
2016-08-29 07:54:25 +00:00
Peter Hoeg
da6e81ff6b
dropbox: 8.4.19 -> 8.4.21 ( #18079 )
...
Additionally, we set proper permissions on the files in the output.
2016-08-29 07:42:49 +00:00
Gabriel Ebner
6a11b11a7d
handbrake: 0.9.9 -> 0.10.5
2016-08-29 08:05:26 +02:00
Graham Christensen
7a073c1c6d
Merge pull request #18057 from peterhoeg/kindlegen
...
kindlegen: init at 2.9
2016-08-28 22:24:21 -04:00
Joachim Fasting
e5c3a52afc
grsecurity: fix features.grsecurity
...
Previously, features.grsecurity wasn't actually set due to a bug in the
grsec builder. We now rely on the generic kernel builder to set features
from kernelPatches.
2016-08-29 04:09:40 +02:00
Joachim Fasting
b56f7acc78
batman-adv: mark as broken on -grsec
...
Looks to be incompatible with the PaX constification plugin:
> /tmp/nix-build-batman-adv-2016.2-4.7.2.drv-0/batman-adv-2016.2/net/batman-adv/soft-interface.c:1065:22:
error: constified variable 'batadv_link_ops' placed into writable
section ".data..read_mostly"
struct rtnl_link_ops batadv_link_ops __read_mostly = {
https://hydra.nixos.org/build/39312033/log/raw
2016-08-29 04:09:40 +02:00