Commit graph

99690 commits

Author SHA1 Message Date
John Ericson
5ad696b067 Merge pull request #22107 from Ericson2314/cross-tepid
Somewhat saner cross-compiling through bootstrapping
2017-01-24 15:09:56 -05:00
Yorick van Pelt
c91aa18070 i3status: 2.10 -> 2.11 2017-01-24 20:35:29 +01:00
Thomas Tuegel
54df142672
nixos/kde5: use kimpanel with IBus by default 2017-01-24 12:55:06 -06:00
Thomas Tuegel
e38970c60b
nixos/ibus: fix custom panel example
The example was missing a `''`, so it did not appear correctly in the
manual. This also caused the manual to retain references inappropriately.
2017-01-24 12:52:39 -06:00
romildo
a0d29cf33e drake: init at 0.9.2.0.3.1 2017-01-24 16:36:22 -02:00
Michael Raskin
1625d8c998 Merge pull request #22097 from lsix/update_gnupg21
gnupg21: 2.1.17 -> 2.1.18
2017-01-24 18:09:45 +00:00
Michael Raskin
2e6fcf8234 Merge pull request #22095 from jpierre03/pr-munin
munin: 2.0.29 -> 2.0.30
2017-01-24 18:09:13 +00:00
Michael Raskin
ae84dc0fdd Merge pull request #22094 from romildo/upd.cbatticon
cbatticon: 1.6.4 -> 1.6.5
2017-01-24 18:08:45 +00:00
Michael Raskin
03ba3edc58 Merge pull request #22091 from romildo/upd.xfce4-whiskermenu-plugin
xfce4-whiskermenu-plugin: 1.6.1 -> 1.6.2
2017-01-24 18:08:24 +00:00
Michael Raskin
ecc42baeca Merge pull request #22090 from romildo/upd.hexchat
hexchat: 2.12.3 -> 2.12.4
2017-01-24 18:06:57 +00:00
Michael Raskin
62b0495614 Merge pull request #22084 from LumiGuide/opencv-3.2.0
opencv: upgrade from 3.1.0 to 3.2.0
2017-01-24 18:05:05 +00:00
Michael Raskin
c058fde440 Merge pull request #22083 from kamilchm/pasystray
pasystray: 0.5.2 -> 0.6.0
2017-01-24 18:03:39 +00:00
Michael Raskin
f72eeae515 Merge pull request #22072 from LnL7/kwm
kwm: init at 4.0.4
2017-01-24 18:00:27 +00:00
Michael Raskin
e08cae373b Merge branch 'master' into kwm 2017-01-24 17:59:56 +00:00
Michael Raskin
2bcc678f5a Merge pull request #22070 from LnL7/khd
khd: init at v1.1.4
2017-01-24 17:58:50 +00:00
Michael Raskin
1a8d12e922 Merge pull request #22069 from kamilchm/vagrant
vagrant: FIX #21365 add libxml2 and libxslt paths
2017-01-24 17:57:37 +00:00
Michael Raskin
ae4f2fd145 Merge pull request #22066 from mbrgm/journalbeat
journalbeat service: init at 5.1.2
2017-01-24 17:56:48 +00:00
Michael Raskin
7516dbe35e Merge pull request #22045 from rnhmjoj/recursor
PowerDNS Recursor: add package and service
2017-01-24 17:54:47 +00:00
Michael Raskin
47661c831e Merge pull request #22028 from MostAwesomeDude/tahoe
Tahoe-LAFS version bump
2017-01-24 17:49:00 +00:00
Michael Raskin
89278345c2 Merge pull request #22023 from vbgl/apron
ocamlPackages.apron: init at 20160125
2017-01-24 17:47:13 +00:00
Michael Raskin
359ad7f6c0 Merge pull request #22012 from thanegill/patch-1
Fix syncthing-gtk hard coded paths
2017-01-24 17:42:40 +00:00
Andreas Herrmann
1a534e0aab diagrams: Fix the 1.4.* versions of the ecosystem
The affected packages now depend on:

   diagrams-core ==1.4.*
   diagrams-lib ==1.4.*
   optparse-applicative ==0.13.*
2017-01-24 18:36:14 +01:00
Dan Peebles
eebee95176 apache-kafka service: change default brokerId to -1
A default of 0 means that if you deploy two NixOS boxes with the default
configuration, the second will fail because the brokerId was already in
use. Using -1 instead tells it to pick one automatically at first start.
2017-01-24 12:32:22 -05:00
zimbatm
c0d60b9dbe hunspellDict.it-it: use sha256 hash 2017-01-24 16:56:25 +00:00
zimbatm
cf4f91f1a2 hunspellDicts: remove spanish dictionaries
Unfortunately the upstream has gone and I didn't find any replacement
sources.
2017-01-24 16:55:35 +00:00
zimbatm
414b1d2128 metaBuildEnv: use sha256 hash 2017-01-24 16:48:43 +00:00
zimbatm
883eb32e64 gtkmozembedsharp: remove package
The package has:

* broken source URL
* uses md5 hash
* no maintainer
* is a library with nobody depending on it
2017-01-24 16:47:13 +00:00
zimbatm
9120a99807 cilaterm: remove package
The package is broken since September, doesn't have a maintainer and
uses md5 for hashing
2017-01-24 16:45:41 +00:00
zimbatm
29be6e1685 jikes: use sha256 hash 2017-01-24 16:42:44 +00:00
zimbatm
0f35029959 aspectj: use sha256 hash 2017-01-24 16:41:21 +00:00
John Ericson
39fb46f538 nixpkgs docs: Cross compilation docs 2017-01-24 11:37:56 -05:00
John Ericson
76ea89aa78 nixpkgs doc: Talk about nativeBuildInputs and propgatedNativeBuildInputs
Do so in the stdenv section where the other two are discussed. This can be
done without brining up cross-compilation by talking about build-time vs
run-time.
2017-01-24 11:37:56 -05:00
John Ericson
7dc4e43837 nixos doc: Mention cross overhaul in 17.03 release notes 2017-01-24 11:37:56 -05:00
John Ericson
bfb147b6a8 top-level: Only splice as needed for performance 2017-01-24 11:37:56 -05:00
John Ericson
4c17cd555f top-level: Document the {local,cross}System, contrasting with *Platform`
This is an implementation detail of how the bootstrapping chain is chosen,
and thus need not be in the manual.
2017-01-24 11:37:56 -05:00
John Ericson
a1a798f017 top-level: crossSystem is no longer exposed to packages. Use *Platform. 2017-01-24 11:37:56 -05:00
John Ericson
1c0365bd88 cross-stdenv: Inline useless bindings and reindent
Semantics should be unchanged
2017-01-24 11:37:56 -05:00
John Ericson
09401d44eb cc-wrapper: Remove unneeded crossAttrs 2017-01-24 11:37:56 -05:00
John Ericson
92edcb7ebb top-level: Lay the groundwork for {build,host,target}Platform
The long term goal is a big replace:
  { inherit system platform; } => buildPlatform
  crossSystem => hostPlatform
  stdenv.cross => targetPlatform
And additionally making sure each is defined even when not cross compiling.

This commit refactors the bootstrapping code along that vision, but leaves
the old identifiers with their null semantics in place so packages can be
modernized incrementally.
2017-01-24 11:37:56 -05:00
David Grayson
5b88f09ec4 coreutils: Fix indentation after removing self in buildPackages commit 2017-01-24 11:37:56 -05:00
John Ericson
d27403b17b libiconv: TEMP force building library improperly for target plat like libc 2017-01-24 11:37:56 -05:00
John Ericson
94df8e7e4d openssl: Output-santizing hack properly uses native perl again 2017-01-24 11:37:56 -05:00
John Ericson
eee7cafaf7 coreutils: Use buildPackages instead of self hack for native version 2017-01-24 11:37:56 -05:00
John Ericson
bf17d6dacf top-level: Introduce buildPackages for resolving build-time deps
[N.B., this package also applies to the commits that follow it in the same
PR.]

In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.

To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.

Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.

--------

Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:

Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.

This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".

Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.

Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.

--------

Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.

 1. GCC when doing a `build = host = target = foreign` build (maximally
    cross), still defines environment variables like `CPATH`[1] with
    packages.  This seems assuredly wrong because whether gcc dynamically
    links those, or the programs built by gcc dynamically link those---I
    have no idea which case is reality---they should be foreign. Therefore,
    in all likelihood, I just made the gcc less broken.

 2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
    a native version of itself. When coreutils was overwritten to be built
    with fewer features, the native version it used would also be
    overwritten because the binding was tight. Now it uses the much looser
    `BuildPackages.coreutils` which is just fine as a richer build dep
    doesn't cause any problems and avoids a rebuild.

So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!

[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html
2017-01-24 11:37:56 -05:00
zimbatm
c3e4c2f179 jjtraveler: remove package
The package is a java library that no other project is using and which
upstream source doesn't work.

See http://www.program-transformation.org/Tools/JJTraveler
2017-01-24 16:34:36 +00:00
zimbatm
31d1a52b0c lucene: 1.4.1 -> 1.4.3 2017-01-24 16:31:39 +00:00
zimbatm
4b284a2bb6 mockobjects: use sha256 hash 2017-01-24 16:28:20 +00:00
zimbatm
7ef36fface jclasslib: use sha256 hash 2017-01-24 16:27:20 +00:00
zimbatm
6f21a99bdd doc/old/cross.txt: md5 -> sha256 2017-01-24 16:26:05 +00:00
zimbatm
1005d786ba libjpeg62: remove
This package has broken upstream url and was only used by warsow
2017-01-24 16:22:25 +00:00