3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

120264 commits

Author SHA1 Message Date
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
John Ericson 652c2beda9 cctools: Don't always bring in headers
- Give cctools a dev output for the headers

 - Update Libsystem to grab the headers from that dev output

 - Don't include the headers in Darwin binutils, just as GNU Binutils no
   longer does.
2017-11-16 17:45:41 -05:00
John Ericson 32a6838bc6 darwin-bintuils: Don't try to bring in missing bits of GNU Binutils
libbfd and libopcdes are separate derivations which now provide all
headers and libraries. Binutils should just provide executables.
2017-11-16 17:40:38 -05:00
John Ericson 6a5cda5131 stdenv setup: Run setup hooks and other processing after accumulating deps
I find the separation of concerns, accumulating, then processing, easier
to follow. Also, with my yet-to-be-merged cross work, the accumulation
part will become more complex.
2017-11-15 18:51:06 -05:00
John Ericson 9a24437411 libbfd, libopcodes: Fix eval on Darwin
Not sure how I missed this...
2017-11-15 11:59:54 -05:00
John Ericson ab77a6bb1e gcc: Misc indentation and whitespace-in-string fixes 2017-11-14 18:32:50 -05:00
Ben Gamari 1c1207220f gcc: Refactor treatment of configure flags
Previously configureFlags was defined as one giant interpolated string.
Here we refactor this definition to instead use the usual stdenv string
combinators. This seems more in-line with the average nixpkgs expression
and it seems a bit more natural to things of these as lists of flags
rather than monolithic strings.
2017-11-14 16:23:46 -05:00
John Ericson eaacf47ff4 binutils: Make myself a maintainer 2017-11-14 10:51:01 -05:00
John Ericson ff023c9bc6 treewide: Remove references to removed binutils outputs 2017-11-13 08:46:15 -05:00
John Ericson f8741c38cd binutils, gdb: Do not expose libbfd or libopcodes, and be multitarget
There are separate derivations for these libraries and we don't want
conflict. Multitarget is generally more useful, and will eventually
speed up cross builds, so why not?!
2017-11-13 08:46:15 -05:00
John Ericson e65259f00c LLVM: Get binutils plugin header from libbfd 2017-11-13 08:46:13 -05:00
John Ericson d7bddc27b2 treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
2017-11-13 00:47:48 -05:00
John Ericson f72bffb4c4 eztrace: Misc cleanups
- Use nativeBuildInputs
  - Use libraries opcodes and bfd, rather than all of binutils
2017-11-13 00:47:48 -05:00
John Ericson de28bd4832 bfd, opcodes: Init separate derivations for binutils libraries
On most distros, these are just built and distributed as part of
binutils. We don't use binutils across the board, however, but rather
switch between binutils and a cctools-binutils mashup, and change the
outputs on binutils too. This creates a combinatorial conditional soup
which is hard to maintain.

My hope is to lower the the state space. While my patch isn't the most
maintainable, they make downstream packages become more maintainable to
compensate. The additional derivations themselves are completely
platform-agnostic, always they always supports all possible target
platforms, and always yield "out" and "dev" outputs. That, in turn,
allows downstream packages to not worry about a dependency
shape-shifting under them.

In fact, the actual binutils package can avoid needing multiple outputs
now that these serve the requisite libraries, so that also can become
simpler on all platforms, too, removing the original wart this PR
circumnavigates for now. Actually changing the binutils package to
leverage is a mass rebuild, however, so I'll leave that for a separate
PR.

I do hope to upstream something like my patch too, but until then I'll
make myself maintainer of these derivations
2017-11-13 00:47:37 -05:00
John Ericson c0a04ec2f5 libiberty: Add dev output 2017-11-13 00:30:53 -05:00
John Wiegley 9ea242c617
coqPackages.interval: Add bignums, now a required dependency 2017-11-12 10:21:56 -08:00
Orivej Desh f7bb8d2dfa
Merge pull request #31537 from orivej/lkl
lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
2017-11-12 18:09:34 +00:00
Vladimír Čunát ab1859e027
Merge branch 'staging'
Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.
2017-11-12 19:08:05 +01:00
John Wiegley a41478cebb
coqPackages.CoLoR: 1.3.0 -> 1.4.0, which now supports Coq 8.7 2017-11-12 10:03:32 -08:00
Renaud 90ffccffdc
Merge pull request #16683 from rardiol/cataclysm-dda-git2
cataclysm-dda-git: init at 2017-07-12
2017-11-12 18:56:26 +01:00
Vincent Laporte 16eef54eee
ocamlPackages.fileutils: 0.5.2 -> 0.5.3 2017-11-12 17:48:33 +00:00
John Wiegley bb038283c4
coqPackages.metalib: New expression 2017-11-12 09:34:06 -08:00
John Wiegley 7d6d4af1d1
Add missing default.nix for coqPackages.equations 2017-11-12 09:33:40 -08:00
John Wiegley dcab51c6f4
coqPackages.QuickChick: Update build for Coq 8.6 and 8.7 2017-11-12 09:17:48 -08:00
John Wiegley f1fc74359f
coqPackages.ssreflect: Build version 0.6.4 for Coq 8.6 and 8.7 2017-11-12 08:50:37 -08:00
John Wiegley b2418ca598
coqPackages.dpdgraph: Build version 0.6.2 for Coq 8.7 2017-11-12 08:50:36 -08:00
Orivej Desh 228dd9defb
Merge pull request #31550 from orivej/dbus-1
make-dbus-conf: prefer local build
2017-11-12 16:44:14 +00:00
Orivej Desh 5e698100b7
Merge pull request #31562 from dotlambda/braincurses
braincurses: init at 1.1.0
2017-11-12 14:31:20 +00:00
Robert Schütz ebd064b761 braincurses: init at 1.1.0 2017-11-12 15:27:01 +01:00
Vincent Laporte dd1a9fa915
ocamlPackages.nocrypto: remove spurious dependency on oasis 2017-11-12 10:19:56 +00:00
Vincent Laporte d9dd5425b0
ocamlPackages.angstrom: remove spurious dependency on oasis 2017-11-12 10:14:51 +00:00
Vincent Laporte 45431bed57
ocamlPackages.ocaml_gettext: 0.3.5 -> 0.3.7 2017-11-12 10:14:50 +00:00
Frederik Rietdijk 74c92a341d
Merge pull request #31554 from xvapx/libnacl
pythonPackages.libnacl: 1.6.0 -> 1.6.1
2017-11-12 10:43:29 +01:00
Vincent Laporte 27d2eef21a
ocamlPackages.gen: 0.4.0.1 -> 0.5 2017-11-12 09:10:01 +00:00
Vincent Laporte 88389f43f7
ocamlPackages.containers: remove spurious dependency on oasis 2017-11-12 09:09:53 +00:00
Marti Serra 86ffe92e96 pythonPackages.libnacl: 1.6.0 -> 1.6.1 2017-11-12 09:49:14 +01:00
Gabriel Ebner b7490c9702 racket: fix build by using gcc7
See #31017.
2017-11-12 09:30:58 +01:00
Samuel Leathers 65424eac66
Merge pull request #31542 from c0bw3b/pkg/lftp
lftp: 4.8.2 -> 4.8.3
2017-11-11 23:21:57 -05:00
Orivej Desh fb8d552026 make-dbus-conf: prefer local build 2017-11-12 03:52:21 +00:00
Renaud d2724f1635
lftp: 4.8.2 -> 4.8.3 2017-11-11 23:37:41 +01:00
Renaud f575062f97
Merge pull request #30516 from rnhmjoj/wireless
nixos/wireless: add manual network configuration
2017-11-11 23:25:49 +01:00
rnhmjoj 2918f6a3f0
nixos/wireless: add manual network configuration 2017-11-11 23:11:46 +01:00
Renaud 1503409aac
Merge pull request #30943 from csingley/nzbget
nzbget.service override nzbget.conf broken paths with current derivation
2017-11-11 22:04:29 +01:00
Orivej Desh a84ce72fdc make-disk-image: do not use faketime
Since https://github.com/lkl/linux/pull/394 cptofs preserves the source time,
which is 1970-01-01T00:00:01Z for /nix/store and recent for other files.

This reverts commit f5b3f2c5a7.
2017-11-11 20:57:14 +00:00
Vladimír Čunát f6655ba128
bootstrap tools test: fixup after d71833ee36 2017-11-11 21:41:42 +01:00
Orivej Desh b8cc69b31e lkl: 2017-10-18 -> 2017-11-10 2017-11-11 20:25:18 +00:00
Orivej Desh f218ef647c make-disk-image: clean up 2017-11-11 20:24:26 +00:00
John Wiegley 462b5e0d21
coqPackages.mathcomp: 1.6.1 -> 1.6.4, for Coq versions 8.6 and 8.7 2017-11-11 09:44:55 -08:00
Robert Helgesson f1caf10ec9
perl-Config-Grammar: 1.11 -> 1.12
Also expand meta section.
2017-11-11 18:15:30 +01:00
Robert Helgesson 5e98876100
perl-Encode: 2.78 -> 2.93 2017-11-11 18:15:30 +01:00