mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity
121731 commits 228 branches 124 tags 7.2 GiB
Commit graph

2531 commits

Author SHA1 Message Date
John Ericson b8a21aa918 misc setup-hooks: Use env vars to refer to binutils programs 
This is more robust for cross-compilation
 2017-12-13 16:08:18 -05:00
John Ericson 2bba929062 bintools-wrapper: Import separately from cc-wrapper 2017-12-13 16:08:18 -05:00
John Ericson 8e557ed2c5 bintools-wrapper: Init 
Factor a bintools (i.e. binutils / cctools) wrapper out of cc-wrapper. While
only LD is wrapped, the setup hook defines environment variables on behalf of
other utilites.
 2017-12-13 16:08:18 -05:00
John Ericson 4f869bccc1 cc-wrapper: Don't treat "-" alone as a flag 
It means stdin, and is morally equivalent to passing a file. e.g.

  $ echo 'int main(void) { return 0; }' | gcc -x c -

will compile and link a binary.
 2017-12-13 16:08:17 -05:00
John Ericson bdd6c037c0 cc-wrapper: Use separate mangler for "bool" variables 
This avoids any `NIX_FOOBAR=1 1` not triggering conditions.
 2017-12-13 16:08:17 -05:00
John Ericson fc7ed86915 cc-wrapper: Pull variable mangler into utils.sh 
In preparation for splitting out bintools-wrapper
 2017-12-13 16:08:13 -05:00
John Ericson 45d4b27d02 cc-wrapper: GNAT wrapper stop caring about -m32 
It need not concern itself with 32-bit dynamic linking; ld-wrapper handles that now.
 2017-12-11 19:12:28 -05:00
John Ericson 5efca65f24
Merge pull request #28448 from obsidiansystems/cc-wrapper-setup-var 
cc-wrapper: Newstyle setup vars
 2017-11-28 16:11:36 -05:00
John Ericson 43e1137397 cc-wrapper: Define new- and old-style cross env vars 
For example, `BUILD_CC` and `CC_FOR_BUILD`
 2017-11-28 15:57:05 -05:00
John Ericson f4cb1e2ffc cc-wrapper: Export env vars for objdump and readelf in setup-hook 
Also fix alphabetical order
 2017-11-28 15:56:21 -05:00
John Ericson 994cb76850 cc-wrapper: Don't leave CMD defined after setup hook 
Rename to `cmd` too, as uppercase typically means the variable is
exported.
 2017-11-28 15:56:17 -05:00
Vladimír Čunát 6705f30e2c
Merge branch 'master' into staging 2017-11-27 15:09:53 +01:00
John Ericson c634647271 Merge branch 'ericson2314-cross-base' into staging 
I forgot to sed some files in #32098.
 2017-11-27 03:33:47 -05:00
John Ericson 43e00f7d18 cc-wrapper: Fix stray binPrefix -> targetPrefix 
I thought my sed in e755a8a27d was
exhaustive, but it was not.
 2017-11-27 03:30:15 -05:00
John Ericson caa3599599 binutils-wrapper: Remove stray file left over from old revert 
binutils-wrapper was removed in ec8d41f08c. I
hope to reintroduce it, but under a different name, so this can go.
 2017-11-27 03:29:09 -05:00
John Ericson 1c44d5efc6
Merge pull request #32098 from obsidiansystems/binPrefix 
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
 2017-11-27 03:20:53 -05:00
John Ericson e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes 
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
 2017-11-27 03:15:50 -05:00
Thomas Tuegel 471dc983cd
Merge pull request #31912 from ttuegel/rust/rw-source 
buildRustPackage: make dependencies' source writable
 2017-11-26 09:20:47 -06:00
Tuomas Tynkkynen f3794bb8cb nixos/qemu-guest: Ensure virtio_mmio is available in initrd 
ARM and AArch64 might use virtio_mmio in some cases.
 2017-11-26 11:22:39 +02:00
Orivej Desh 29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc 
stdenv: Move devhelp books to outputDevdoc
 2017-11-25 23:14:47 +00:00
Jan Tojnar 70a0580e38
stdenv: Move devhelp books to outputDevdoc 2017-11-24 02:09:44 +01:00
Frederik Rietdijk 6ad79678d4 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-23 16:38:31 +01:00
Graham Christensen 1f0a09fd59
Merge pull request #31801 from bhipple/centos-7.3-vmtools-image 
Init Centos 7.3 vmTools diskImage
 2017-11-22 20:19:51 -05:00
John Ericson 405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files 
stdenv setup: Always use both propagated files
 2017-11-22 15:23:37 -05:00
Orivej Desh b8e1e7191e Merge branch 'master' into staging 
* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...
 2017-11-21 22:48:36 +00:00
Eelco Dolstra 3d5828ebed
releaseTools.sourceTarball: Clean up temporary files 2017-11-21 19:45:20 +01:00
Eelco Dolstra 9f74cf3e12
vm: Create /dev/full 
https://hydra.nixos.org/build/64519371
 2017-11-21 18:25:50 +01:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files 
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
 2017-11-21 10:44:44 -05:00
Thomas Tuegel 7ede960a27
buildRustPackage: make dependencies' source writable 
Some packages, such as the xcb crate, do code generation at build-time;
therefore, the dependencies' source tree must be writable.
 2017-11-20 11:02:01 -06:00
Benjamin Hipple 368432e17f Init Centos 7.3 vmTools diskImage 
This commit adds the CentOS 7.3 base image from the CentOS vault, for use with
building RPMs or evaluating Nix expressions.
 2017-11-18 16:05:49 -05:00
Orivej Desh fbdc74c761 makeWrapper: delete --set-eval 
because --run is good enough.
 2017-11-17 12:53:54 +00:00
Orivej Desh 4199892768 makeWrapper: add --set-default and --set-eval 
After #31497 starter quoting all values, there arouse the need to left some
values evaluated.

`--set-default var value` expands to `export var=${var-value}`, where value is
not evaluated and literally assigned to var unless it is already set.

`--set-eval var value` expands to `export var=$(eval echo value)`, where value
is evaluated by `eval`.
 2017-11-17 10:11:01 +00:00
Orivej Desh cd0e2f5d36
Merge pull request #31497 from abbradar/quote-makewrapper 
makeWrapper: quote variables
 2017-11-14 00:10:19 +00:00
Nikolay Amiantov 29c0591dc1 makeWrapper: quote values properly 
This uses Bash ${foo@Q} feature to quote values properly, which allows us to
handle values containing spaces, dollars etc.

Thanks orivej for the idea!
 2017-11-11 16:08:52 +03:00
Frederik Rietdijk 4508a17da7
Merge pull request #31356 from FRidh/fetchgitPrivate 
fetchgitPrivate: put our custom ssh on PATH
 2017-11-10 10:57:50 +01:00
John Ericson 4c6a1db756 Merge base commit of #30484 into staging 2017-11-08 14:26:33 -05:00
John Ericson 0101856765
Merge pull request #30549 from obsidiansystems/bintools 
treewide: Introduce stdenv.cc.bintools
 2017-11-08 14:20:48 -05:00
Frederik Rietdijk f8eed5f7a5 fetchgitPrivate: put our custom ssh on PATH 
Currently we wrap ssh so it can find the config file passed in by
<ssh-config-file>. If one however uses ProxyCommand ssh, then ssh that
is on PATH is taken (which is also unavailable when using nix-shell
--pure), which is the plain ${openssh}/bin/ssh.

This commit makes sure our wrapped ssh is available on PATH.
 2017-11-07 14:07:52 +01:00
Vladimír Čunát 9aa37b159b
Merge branch 'master' into staging 2017-11-07 06:41:23 +01:00
Frederik Rietdijk 13cc4f513e
Merge pull request #31271 from FRidh/fetchurl 
fetchurl: add passthru
 2017-11-06 20:41:22 +01:00
Vladimír Čunát 1d9a8e2289
Merge branch 'master' into staging 2017-11-06 13:24:06 +01:00
Vladimír Čunát c8c6a1edb5
Merge #31209: cc-wrapper: Fix if dynamicLinker not found 2017-11-06 13:07:43 +01:00
Bojan Nikolic 3a63fc1258 Remove trailing line 2017-11-05 23:00:24 +00:00
Bojan Nikolic 2ed054885b Remove the unnecessary second conditional 2017-11-05 22:57:44 +00:00
John Ericson 70d91badf5 treewide: Depend on stdenv.cc.bintools instead of binutils directly 
One should do this when needed executables at build time. It is more
honest and cross-friendly than refering to binutils directly.
 2017-11-05 17:10:53 -05:00
Tuomas Tynkkynen 0d9f2f0bb4 platforms.nix: Clean up more 'uboot' legacy 
For a while now, the only thing the 'uboot' attribute does is to tell
whether to add ubootTools to kernel/initrd builds. That can be
determined with platform.kernelTarget == "uImage" just as well.
 2017-11-05 17:06:59 +02:00
Tuomas Tynkkynen b50693d16c kernel, initrd: Remove legacy ubootChooser 2017-11-05 15:11:12 +02:00
Nikolay Amiantov 5f3b84e979 cc-wrapper: disable POSIX compatibility 2017-11-05 12:19:37 +02:00
Frederik Rietdijk ef21b240c8 fetchurl: add passthru 
so that we could add e.g. the `version` attribute.
 2017-11-05 10:12:19 +01:00
knupfer d71833ee36 fetchipfs: init 
Fixes #18296
 2017-11-04 23:01:27 +01:00