Commit Graph

151607 Commits

Author SHA1 Message Date
John Ericson
115bc86e6c paxctl: Fix cross and Darwin builds 2018-09-26 11:26:14 -04:00
Matthew Bauer
607063f61b stdenv: partial revert of f2bb59e
/cc @Ericson2314

PR was https://github.com/NixOS/nixpkgs/pull/46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).

(cherry picked from commit f9c4075873cb56464126f993d22a1a72f7cfac45)
2018-09-26 11:13:22 -04:00
John Ericson
21c2437cc6 ghc: Sphinx is a build-time dependency 2018-09-25 16:29:03 -04:00
John Ericson
715e0a4e59 python-*: Format pythonPackages bindings 2018-09-25 15:27:09 -04:00
John Ericson
e6a476c862 ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
2018-09-24 20:00:39 -04:00
John Ericson
5779fdb3d0 haskellPackages: Avoid outer rec { .. }
This is much nicer for overlays. For example, if someone binds a new
compiler / package set, its integer-simple variation will automatically
appear.
2018-09-24 18:42:04 -04:00
John Ericson
b9dce11712 lib: Make overrideScope' which takes arguments in the conventional order
The `overrideScope` bound by `makeScope` (via special `callPackage`)
took an override in the form `super: self { … }`. But this is
dangerously close to the `self: super { … }` form used by *everything*
else, even other definitions of `overrideScope`! Since that
implementation did not even share any code either until I changed it
recently in 3cf43547f4be03d1d6eb0bbfc557e2dbc13b4095, this inconsistency
is almost certainly an oversight and not intentional.

Unfortunately, just as the inconstency is hard to debug if one just
assumes the conventional order, any sudden fix would break existing
overrides in the same hard-to-debug way. So instead of changing the
definition a new `overrideScope'` with the conventional order is added,
and old `overrideScope` deprecated with a warning saying to use
`overrideScope'` instead. That will hopefully get people to stop using
`overrideScope`, freeing our hand to change or remove it in the future.
2018-09-24 17:50:11 -04:00
John Ericson
84c8e397d2 release-notes/18.09: Copy release notes from the upcomming release
This ensures that any further changes needing notes that belong in 18.09
off this common-ancestor commit can be easily merged to both
`release-18.0`9 and `master`.
2018-09-23 13:03:14 -04:00
John Ericson
45f40f5fe0 Merge commit 'b97242238d7efb029c76eb8d4fe4b1228a5b49a8'
Both parent commits were previously tied as the most recent ancestor to
'master' and 'release-18.09'.
2018-09-23 10:59:27 -04:00
John Ericson
b97242238d fetchzip: Use unzip from buildPackages
Additionally, the manual path manipulation becomes no longer needed.
2018-09-21 12:55:32 -04:00
John Ericson
452a81c991 libusb1: Build everywhere, since MinGW works 2018-09-21 12:32:38 -04:00
John Ericson
45c637d8a0 haskellPackages.x509-system: Override based on the host, not target platform
There were many reverts back and forth, but it ultimately appears that I
am the source of this mistake. I clarified the comment so as not to
confuse myself or anyone else.
2018-09-20 21:48:06 -04:00
John Ericson
cc83d59333 zlib: Fix iOS cross build
1. CHOST is how one specifies the cross host platform with this
  non-standard configure script. We were just getting lucky with Linux
  cross.

  2. install_name_tool needs the the binutils prefix.
2018-09-19 12:10:09 -04:00
John Ericson
750933a17c haskell infra: Also pass --with-ar in cross builds 2018-09-18 18:49:58 -04:00
John Ericson
2091133e78 gcc: Clarify Disabling libmpx in cross stage static
This isn't a MUSL thing, but just needed for cross compilation to x86.
No one had tried this when all cross compilation was to linux + glibc,
hence why no one noticed this until recently.
2018-09-18 16:27:04 -04:00
John Ericson
28a323e331 gccCrossStageStatic: Don't use MUSL, or any libc when targetting linux
Only the regular GCC is built with a libc dependency.
2018-09-18 16:27:04 -04:00
John Ericson
f2bb59e710 stdenv linux, stdenv cross: Harmonize extraNativeBuildInputs
Want to make sure these are the same per host platform, without duplication.
2018-09-18 16:27:04 -04:00
John Ericson
2111e7b742 mkDerivation: Make separateDebugInfo assertion lazier to match other assertions
This is needed to access attributes of derivations on platforms where
they cannot be built.
2018-09-18 16:25:19 -04:00
John Ericson
6769437186 androidndk: Add Darwin support
Also switch Linux to using the official sha1 hashes for consistency.
They are gotten from https://developer.android.com/ndk/downloads/.
2018-09-17 22:34:37 -04:00
John Ericson
8da28de0e8 haskell infra: "late bind" buildHaskellPackages
This way it can be overridden.
2018-09-17 16:01:26 -04:00
John Ericson
1ad73bb3ca ios-depoy: Add missing rsync dep 2018-09-15 14:48:03 -04:00
John Ericson
b8ce6a31f5 elf-header: Init at <libc version>
A little shim derivation to get this header for Darwin, where it is
needed for cross compilation.

There's no real reason to do glibc and musl like that, but as I'm
maintaining it I suppose I can go overboard like that.
2018-09-15 01:14:31 -04:00
John Ericson
2205beaa8c glibc: Expose the version 2018-09-15 01:14:31 -04:00
John Ericson
846b44b2e9 glibc, kernel-headers: Fix some eval errors on Darwin
Need to get the source to get elf.h
2018-09-15 01:07:06 -04:00
John Ericson
d7e3dbef66 glibc: Use lib.enableFeature and friends 2018-09-11 17:14:55 -04:00
John Ericson
9f9723b179 nixpkgs module: Fix defaulting of localSystem and system
Take two of #40708 (4fe289860888668956b7e79e24efeb101c2f51d1).

That PR attempted to bidirectionally default `config.nixpkgs.system` and
`config.nixpkgs.localSystem.system` to each be updated by the other. But
this is not possible with the way the module system works. Divergence in
certain cases in inevitable.

This PR is more conservative and just has `system` default `localSystem`
and `localSystem` make the final call as-is. This solves a number of
issues.

 - `localSystem` completely overrides `system`, just like with nixpkgs
 proper. There is no need to specify `localSystem.system` to clobber the
 old system.

 - `config.nixpkgs.localSystem` is exactly what is passed to nixpkgs. No
 spooky steps.

 - `config.nixpkgs.localSystem` is elaborated just as nixpkgs would so
 that all attributes are available, not just the ones the user
 specified.

The remaining issue is just that `config.nixpkgs.system` doesn't update
based on `config.nixpkgs.localSystem.system`. It should never be
referred to lest it is a bogus stale value because
`config.nixpkgs.localSystem` overwrites it.

Fixes #46320
2018-09-07 16:43:56 -04:00
John Ericson
8ae27030aa doc: Add changelog entry for new definition of system and stdenv.system
See the previous commit for details.
2018-09-06 09:24:08 -04:00
John Ericson
773233ca77 top-level, stdenv: Make system and stdenv.system describe the hostPlatform.
Intuitively, one cares mainly about the host platform: Platforms differ
in meaningful ways but compilation is morally a pure process and
probably doesn't care, or those difference are already abstracted away.
@Dezgeg also empirically confirmed that > 95% of checks are indeed of
the host platform.

Yet these attributes in the old cross infrastructure were defined to be
the build platform, for expediency. And this was never before changed.
(For native builds build and host coincide, so it isn't clear what the
intention was.)

Fixing this doesn't affect native builds, since again they coincide. It
also doesn't affect cross builds of anything in Nixpkgs, as these are no
longer used. It could affect external cross builds, but I deem that
unlikely as anyone thinking about cross would use more explicit
attributes for clarity, all the more so because the rarity of inspecting
the build platform.
2018-09-06 08:33:51 -04:00
John Ericson
e51f736076 top-level: Deprecate top-level {build,host,target}Platform
I don't know when we can/should remove them, but this at least gets
people to stop using them. The preferred alternatives also date back to
17.09 so writing forward-compatable code without extra conditions is
easy.

Beginning with these as they are the least controversial.
2018-09-05 11:53:51 -04:00
John Ericson
51907d257c stdenv, neovim: Use lib.warn for deprecation warnings 2018-09-05 11:40:29 -04:00
John Ericson
06cd7c15a3 mkDerivation: Fix cross compilation
Derivations where drawing their `system` attribute from `hostPlatform`
instead of `buildPlatform`. Fix that, and add an explanatory commment.

Fixes #45993
2018-09-03 23:18:24 -04:00
Graham Christensen
61deecdc34
nixos docs: more IDs 18.09-beta 2018-09-02 15:56:24 -04:00
Mario Rodas
a3872f66b7 racket-minimal: fix hash (#45952) 2018-09-02 21:51:49 +02:00
Graham Christensen
ff23dd110b
nixos docs: more IDs 2018-09-02 15:47:59 -04:00
Jan Malakhovski
a402c8f295 fbreader: 0.99.4 -> 0.99.6, switch to fetchFromGitHub, add more build options (#45840)
This, apparently, is not an official release (it's tagged, but the tarball is not
available on the official site), but this repo is the official repo mentioned on
the official site.

This fixes a bunch of very annoying bugs present in 0.99.4, e.g.

```
$ FBReader filename
```

does not crash anymore. Yay!
2018-09-02 21:47:06 +02:00
Milan Svoboda
ae76e51f86 FreeOrion 0.4.7.1 -> 0.4.8 (#45943) 2018-09-02 21:42:47 +02:00
Samuel Dionne-Riel
a92cfb5725
Merge pull request #45912 from xeji/p/dhcpcd
dhcpcd: 6.11.5 -> 7.0.8
2018-09-02 15:28:15 -04:00
Christopher Birkbeck
0dd7a0f266 Added an example for environment.variable. (#45956) 2018-09-02 21:21:14 +02:00
Roman Volosatovs
720c163a55 kitty: Add terminfo attr (#45953) 2018-09-02 21:07:31 +02:00
Kenny Shen
1c95066639 gnu-pw-mgr: 2.3.3 -> 2.4.2 (#45951) 2018-09-02 21:05:05 +02:00
xeji
f3794f3069
Merge pull request #45955 from romildo/upd.dtkwidget
dtkwidget: init at 2.0.9.3
2018-09-02 21:04:28 +02:00
xeji
87ba30b5c7
Merge pull request #45939 from rnhmjoj/scc
sc-controller: 0.4.3 -> 0.4.4
2018-09-02 20:58:13 +02:00
Graham Christensen
146f8bac7e
Merge pull request #45911 from samueldr/fix/nixos-help-browser
nixos/manual: nixos-help knows about colon-separated BROWSER
2018-09-02 14:30:22 -04:00
Graham Christensen
f14b6cb6ec
Merge pull request #44526 from samueldr/feature/actiavation-failure-identification
nixos/activation: Identifies the snippet that failed
2018-09-02 14:28:10 -04:00
José Romildo Malaquias
de7a1c8e46 dtkwidget: init at 2.0.9.3 2018-09-02 15:21:18 -03:00
José Romildo Malaquias
c48a234ab1 dtkcore: only define QT_HOST_DATA if it is empty, enable parallel building 2018-09-02 15:20:55 -03:00
rnhmjoj
8670ee4689
sc-controller: fix missing libbluetooth.so 2018-09-02 20:05:54 +02:00
Jan Tojnar
e2a731fc5c
Merge pull request #45949 from jtojnar/gcolor3
gcolor3: 2.2 → 2.3
2018-09-02 18:24:23 +01:00
Jan Tojnar
87f3a2a406
gcolor3: 2.2 → 2.3 2018-09-02 18:53:04 +02:00
Michael Weiss
85e46d12b3 android-studio: Refactor the code & minor improvements 2018-09-02 18:45:40 +02:00