Commit Graph

112397 Commits

Author SHA1 Message Date
Robin Gloster
c00a95be63
nix-prefetch-git: fix wrapProgram call 2017-08-08 21:45:46 +02:00
Peter Simons
67f37b70e8 Merge pull request #24944 from ahmedtd/make-makewrapper-picky
makeWrapper: Fail loudly when misused
2017-08-08 17:26:38 +02:00
Orivej Desh
a6e7dffd1f cc-wrapper: Fix standalone ld 2017-08-08 11:03:51 +02:00
Orivej Desh
c8e9dcc8a4 cc-wrapper: Fix standalone gcc
This ensures that all salted variables are defined even if the wrapped program
is invoked outside nix-build environment.
2017-08-08 11:03:51 +02:00
Orivej Desh
c8f7f18e69 cc-wrapper: Fix adding directories to rpath
This fixes a bug introduced in #27831: `for path in "$dir"/lib*.so` assumed that
all libs match `lib*.so`, but 07674788d6 started
adding libs that match `*.so` and `*.so.*`.
2017-08-08 11:03:51 +02:00
Taahir Ahmed
e1d46c0c4d makeWrapper: Only wrap normal executable files
`makeWrapper` and `wrapProgram` are being invoked on all kinds of
wacky things (usually with the help of bash globs or other machine
assistance).

So far, I have come across `wrapProgram` being invoked on a directory,
as well as on the empty string.

As far as I can tell, it's only valid to invoke these utilities on a
normal (non-directory, non-device) executable file.  This commit
enforces that precondition.
2017-08-08 03:46:47 -05:00
Robin Gloster
3e981b9e33
Revert "cc-wrapper: fix set -u errors"
This reverts commit 67a41eafe9.

see #28021 for discussion
2017-08-08 10:20:00 +02:00
Robin Gloster
67a41eafe9
cc-wrapper: fix set -u errors
cc @Ericson2314
2017-08-08 10:15:34 +02:00
Frederik Rietdijk
89af5d93e6 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-08 09:01:54 +02:00
Frederik Rietdijk
0734fb26c5 Merge pull request #28032 from casey/feedgen
python.pkgs.feedgen: init at 0.5.1
2017-08-08 09:01:27 +02:00
Casey Rodarmor
2141086af8 python.pkgs.feedgen: init at 0.5.1 2017-08-07 23:58:39 -07:00
Jörg Thalheim
035e0198c5 Merge pull request #27978 from makefu/module/influxdb/bind-fix
influxdb module: collectd.port is now called bind-address
2017-08-08 07:51:03 +01:00
Frederik Rietdijk
739b4b42e6 searx: fix typo, fixes #28015 2017-08-08 08:40:26 +02:00
Peter Simons
b196230e71 Merge pull request #25185 from ahmedtd/fix-makewrapper-unsupported-args
Fix makewrapper unsupported args
2017-08-08 08:33:56 +02:00
Wout Mertens
18fa60db30 Merge pull request #28008 from alexandergall/add-cloud-image
nixos/cloud-image: add module
2017-08-08 07:29:08 +02:00
Taahir Ahmed
ece5387b09 makeWrapper: Die on unsupported arguments
Previously, makeWrapper would accept arguments it didn't recognize,
potentially allowing argument misspellings or broken callers.

Now, makeWrapper dies with a backtrace if it is called incorrectly.

Also changes `wrapProgram` so that it doesn't pass through the first
argument twice --- this was tripping up the argument checking.
2017-08-08 00:18:12 -05:00
Taahir Ahmed
12354b8eb5 dieHook: Add die utility function
Calling `die "Error message"` causes the current script to exit with
an error, printing a backtrace
2017-08-08 00:17:56 -05:00
volth
b32a1199f8 orackejdk: untie from gnome2
Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
2017-08-08 02:16:26 +02:00
Franz Pletz
bfc78abf2b Merge pull request #28019 from Infinisil/fix-default-text-xmonad
xmonad service: add defaultText to extraPackages to fix rendering in docs
2017-08-08 02:15:45 +02:00
Franz Pletz
9d29bed078 Merge pull request #28020 from michalrus/geekbench
geekbench: init at 4.1.1
2017-08-08 02:14:03 +02:00
Michal Rus
a809cf409a
geekbench: init at 4.1.1 2017-08-08 01:28:12 +02:00
Silvan Mosberger
7bc42a8971
xmonad service: add defaultText to extraPackages to fix rendering in docs 2017-08-08 01:14:58 +02:00
Tim Steinbach
f46f98ad31
Revert 0cf0d7186a
Order common kernel config by functionality
See #27949
2017-08-07 17:34:10 -04:00
Daniel Peebles
de1110b52a Merge pull request #27960 from LnL7/clang-libgcrypt
libgcrypt: fix clang build
2017-08-07 16:52:59 -04:00
Daiderd Jordan
44c354317d Merge pull request #27911 from LnL7/erlang-no-gcc
erlang: remove explicit gcc dependency
2017-08-07 22:23:58 +02:00
Cray Elliott
2f9724e804 ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3 2017-08-07 12:53:48 -07:00
Wout Mertens
b6f19f79aa Merge pull request #28004 from moesasji/master
xfce4-session: fix lock screen not working with light-locker
2017-08-07 18:40:48 +02:00
Wout Mertens
67ed1599bc Merge pull request #28003 from kamilchm/ponyc
ponyc: 0.16.1 -> 0.17.0
2017-08-07 18:37:56 +02:00
Wout Mertens
ba203e40a6 Merge pull request #28010 from womfoo/bump/facter-3.7.1
facter: 3.6.6 -> 3.7.1 and related deps
2017-08-07 18:32:03 +02:00
Wout Mertens
5df2798221 Merge pull request #28011 from womfoo/bump/zabbix-cli-1.7.0
zabbix-cli: 1.6.1 -> 1.7.0
2017-08-07 18:31:11 +02:00
Wout Mertens
5ac09bc484 Merge pull request #28013 from womfoo/bump/pick-1.7.0
pick: 1.6.1 -> 1.7.0
2017-08-07 18:29:07 +02:00
Tim Steinbach
fa10497834 Merge pull request #27684 from gnidorah/bfq
linux: BFQ Group Scheduling support
2017-08-07 11:58:45 -04:00
Tim Steinbach
4edcfa3eb7
gradle: 4.0.2 -> 4.1 2017-08-07 11:44:35 -04:00
Tim Steinbach
06af1df857
linux: 4.13-rc3 -> 4.13-rc4 2017-08-07 11:40:01 -04:00
Tim Steinbach
ea2a10e143
linux: 4.4.79 -> 4.4.80 2017-08-07 11:35:42 -04:00
Tim Steinbach
4825e4818b
linux: 4.9.40 -> 4.9.41 2017-08-07 11:32:26 -04:00
Kranium Gikos Mendoza
bcc2858485 pick: 1.6.1 -> 1.7.0 2017-08-08 01:22:44 +10:00
Gabriel Ebner
795c003359 isabelle: use polyml 5.6
Isabelle 2016 does not work with newer PolyML versions.
2017-08-07 17:21:08 +02:00
John Ericson
810fb0c968 cc-wrapper: Don't slurp NIX_DONT_SET_RPATH twice
Otherwise we end with a definition like `1 1`, which doesn't trigger the right
conditional.
2017-08-07 11:09:25 -04:00
Kranium Gikos Mendoza
a852d39dda zabbix-cli: 1.6.1 -> 1.7.0 2017-08-08 01:02:38 +10:00
Wout Mertens
339330b322 Merge pull request #27426 from rnhmjoj/nginx
nginx: make enabling SSL port-specific
2017-08-07 16:46:28 +02:00
Kranium Gikos Mendoza
b99f162e40 facter: 3.6.6 -> 3.7.1 2017-08-08 00:37:43 +10:00
Kranium Gikos Mendoza
b416579af4 leatherman: 0.11.2 -> 1.0.0 2017-08-08 00:37:43 +10:00
Domen Kožar
4f80406fdd Merge pull request #27615 from NickHu/cuda
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-08-07 16:13:49 +02:00
nonsequitur
f37972588d ruby docs: fix text and example (#28006)
1. 'wrapper' has been renamed to 'wrappedRuby', so use this instead.
2. mkDerivation isn't called with a 'src' attribute, so skip the 'unpackPhase' to avoid an error.
3. Simplify the build command. 'mkdir' and 'patchShebangs' don't need to be called explicitly.
2017-08-07 14:42:16 +01:00
Frederik Rietdijk
2203908e5f Merge commit 'b679e14' into HEAD 2017-08-07 13:19:09 +02:00
Frederik Rietdijk
e6808e30ae Merge pull request #27931 from gnidorah/kde
Fix some KDE applications
2017-08-07 13:15:36 +02:00
Frederik Rietdijk
7aaad6cd8c Merge pull request #27980 from romildo/upd.mate
Update some mate packages
2017-08-07 13:13:23 +02:00
Frederik Rietdijk
3b9b0485fe Merge pull request #28005 from romildo/upd.adapta
adapta-gtk-theme: 3.90.0.125 -> 3.91.1.47
2017-08-07 13:12:51 +02:00
Frederik Rietdijk
1271e5e0d4 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-07 13:05:31 +02:00