Commit Graph

97976 Commits

Author SHA1 Message Date
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
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
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
Frederik Rietdijk
1271e5e0d4 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-07 13:05:31 +02:00
Frederik Rietdijk
e7651e4b60 Merge pull request #27940 from bkchr/fix_qt56_ld
QT5.6: Fixes compile error with wrong LD env variable
2017-08-07 13:04:43 +02:00
Bastian Köcher
0053bf6d47 QT5.6: Fixes compile error with wrong LD env variable
QT uses -Wl linker flags and these flags only work with gcc/g++
and not with LD directly.
2017-08-07 10:51:53 +02:00
John Ericson
2493454e13 cc-wrapper: Use set -u throughout
Now is an opportune time to do this, as the infixSalt conversion in
`add-flags.sh` ensures that all the relevant `NIX_*` vars will be
defined even if empty.
2017-08-07 03:05:51 -04:00
John Ericson
a8bd415fa0 unzip: cc-wrapper has been fixed so don't need to be so clever 2017-08-07 03:05:51 -04:00
John Ericson
42f35503b5 cc-wrapper: Make hygienic
See the added comments for what exactly has been done.
2017-08-07 03:05:50 -04:00
John Ericson
9f1e009975 cc-wrapper: Unconditionally use @infixSalt@ accross the board
This is basically a sed job, in preparation of the next commit. The
rules are more or less:

  - s"NIX_(.._WRAPPER_)?([a-zA-Z0-9@]*)"NIX_\1@infixSalt@_\2"g

  - except for non-cc-wrapper-specific vars like `NIX_DEBUG`
2017-08-07 03:05:50 -04:00
John Ericson
5ba3972add cc-wrapper: Stop preWrapping
This is an ugly temp hack for cross compilation, but now we have something better on the way.

Bind `infixSalt` as an environment variable as it will be used in it.
2017-08-07 03:05:50 -04:00
Peter Simons
f152749c99 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.4.1 from Hackage revision
cfa51cac76.
2017-08-07 08:58:48 +02:00
Gabriel Ebner
28ca51c7df Merge pull request #27899 from matthewbauer/emscripten-update
emscripten: 1.37.13 -> 1.37.16
2017-08-07 08:51:58 +02:00
Benjamin Staffin
989514f38b jsonnet: 0.8.9 -> 0.9.4 (#27989) 2017-08-06 23:13:26 -04:00
Tim Steinbach
1ec7242bc2
linux-copperhead: 4.12.4.a -> 4.12.5.a 2017-08-06 22:04:46 -04:00
Tim Steinbach
ff9479cd54
linux: 4.12.4 -> 4.12.5 2017-08-06 19:22:15 -04:00
Joachim F
70d8768af5 Merge pull request #27876 from joachifm/libsodium-1_0_13
libsodium: 1.0.12 -> 1.0.13
2017-08-07 00:18:39 +01:00
Tim Steinbach
0cf0d7186a
linux-common-config: Refactor, clean up 2017-08-06 19:17:30 -04:00
Michael Raskin
638b67146d Merge pull request #27812 from tohl/master
sbcl updated, tested on nixos x86_64
2017-08-07 00:05:18 +02:00
Joachim F
bba56ff461 Merge pull request #27985 from romildo/upd.elementary-icon-theme
elementary-icon-theme: 4.1.0 -> 4.2.0
2017-08-06 23:00:17 +01:00
Joachim Fasting
a40bf20a1d
pigz: enable parallel building 2017-08-06 23:38:15 +02:00
Joachim Fasting
d56361f036
pigz: 2.3.3 -> 2.3.4 2017-08-06 23:38:14 +02:00
Joachim Fasting
4a65f9ef5f
dnscrypt-proxy: enable parallel building 2017-08-06 23:38:13 +02:00
Joachim Fasting
f963014829
linux-hardened-config: various fixups
Note
- the kernel config parser ignores "# foo is unset" comments so they
  have no effect; disabling kernel modules would break *everything* and so
  is ill-suited for a general-purpose kernel anyway --- the hardened nixos
  profile provides a more flexible solution
- removed some overlap with the common config (SECCOMP is *required* by systemd;
  YAMA is enabled by default).
- MODIFY_LDT_SYSCALL is guarded by EXPERT on vanilla so setting it to y breaks
  the build; fix by making it optional
- restored some original comments which I feel are clearer
2017-08-06 23:38:07 +02:00
Vladimír Čunát
b679e148bd
release.nix: resurrect stdenvBootstrapTools
13d6681ce7 crippled it unintentionally.
Also remove the incorrect/non-existing stdenv.i686-linux;
building the bootstrap tools should be a good-enough test anyway.
2017-08-06 21:30:39 +02:00
zimbatm
19c64b57d5 minikube: 0.20.0 -> 0.21.0 2017-08-06 20:24:26 +01:00
Robin Gloster
41492abf4d
qt56.qtbase: fix build 2017-08-06 21:23:38 +02:00
Jörg Thalheim
46e691eefb Merge pull request #27988 from lheckemann/oil
oil: init at 0.0.0
2017-08-06 19:45:09 +01:00
Heitham Omar
5ac00265a8 linux-common-config: add CONFIG_HOTPLUG_PCI_ACPI 2017-08-06 20:41:28 +02:00
georgewhewell
e85a855d2c openssl 1_1_0: fix build on aarch64 2017-08-06 20:38:32 +02:00
Robin Gloster
f14c27d178
cmus: fix build
fixes #27966
2017-08-06 20:34:14 +02:00
Robin Gloster
1ff2c65acf
phantomjs2: don't use bundled qt 2017-08-06 20:30:17 +02:00
Linus Heckemann
434d3700d3 oil: init at 0.0.0 2017-08-06 18:17:00 +01:00
Daiderd Jordan
147cd29fff
rustc: remove gdb dependency for darwin 2017-08-06 19:00:58 +02:00
romildo
dad7b6bb40 elementary-icon-theme: 4.1.0 -> 4.2.0 2017-08-06 13:42:57 -03:00
Michael Weiss
953b232385 gns3-server: init at 2.0.3 2017-08-06 17:40:53 +02:00
Michael Weiss
2bc92695bf pythonPackages.aiohttp: 1.1.6 -> 1.3.5 2017-08-06 17:40:53 +02:00
Michael Weiss
f17cadadd3 pythonPackages.zipstream: init at 1.1.4 2017-08-06 17:40:53 +02:00
Michael Weiss
15bf0f68c3 pythonPackages.aiohttp-cors: init at 0.5.1 2017-08-06 17:40:53 +02:00
Jörg Thalheim
6b9b08eaed Merge pull request #27977 from symphorien/update_par2
par2cmdline: 0.6.13 -> 0.7.3
2017-08-06 15:37:14 +01:00
Jörg Thalheim
f8aa39476a Merge pull request #27973 from edanaher/update-urweb
urweb: 20170105 -> 20170720
2017-08-06 15:33:52 +01:00
Tim Steinbach
83b7a415d5 Merge pull request #27970 from NeQuissimus/expand_hardened_config
linux: Expand hardened config
2017-08-06 10:11:57 -04:00
Tim Steinbach
747cbbad71 Merge pull request #27969 from NeQuissimus/atom_paxmark
atom: Add paxmark
2017-08-06 10:03:32 -04:00
Roman Volosatovs
2700b62168 grml-zsh-config: 0.12.4 -> 0.14.2 (#27961)
* grml-zsh-config: 0.12.4 -> 0.14.2

* grml-zsh-config: fix typo
2017-08-06 14:58:38 +01:00
Tim Steinbach
ff10bafd00
linux: Expand hardened config
Based on latest recommendations at
http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
2017-08-06 09:58:02 -04:00
Gabriel Ebner
357b93e1b1 anki: 2.0.36 -> 2.0.46 2017-08-06 15:33:50 +02:00
Symphorien Gibol
aec9f1b9d8 par2cmdline: 0.6.13 -> 0.7.3 2017-08-06 14:50:15 +02:00
Michael Weiss
b0a2ea01c5 python3Packages.zodb: Fix the build
Side note: Not sure if it makes sense that zodb3 depends on zodb (zodb4)
via ZEO.
2017-08-06 14:45:52 +02:00
Michael Weiss
4b0afc169d zpl*: Fix the attribute name of the license
This was simply a typo since the license was added in 2013.
2017-08-06 13:49:18 +02:00