Commit Graph

132 Commits

Author SHA1 Message Date
John Ericson
5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson
130a0cbde6 guile: Remove old crossAttrs
We fixed the linker issue with propagated dependencies.

(cherry picked from commit 515ca1a7c8)
2018-05-13 11:36:30 -04:00
Michael Alan Dorman
d77dab3ecc guile: Fix and clean up libtool propagation fixes
Fixes #37548

(cherry picked from commit 72984210ab)
2018-05-13 11:36:30 -04:00
Michael Alan Dorman
9a4cc93522 guile-1.8: Fix and clean up libtool propagation fixes
Fixes #37548

(cherry picked from commit 2119041dbf)
2018-05-13 11:36:29 -04:00
John Ericson
8415682658 guile: Fix cross more, including 1.8
(cherry picked from commit 76bc1d3fae)
2018-05-13 11:36:29 -04:00
Shea Levy
0fcad047b9 Guile: Fix cross-compilation
(cherry picked from commit f79fa77941)
2018-05-13 11:36:29 -04:00
John Ericson
f40aa17933 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 13:29:04 -04:00
John Ericson
515ca1a7c8 guile: Remove old crossAttrs
We fixed the linker issue with propagated dependencies.
2018-05-10 12:16:29 -04:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Michael Alan Dorman
72984210ab guile: Fix and clean up libtool propagation fixes
Fixes #37548
2018-03-22 14:54:38 -04:00
Michael Alan Dorman
2119041dbf guile-1.8: Fix and clean up libtool propagation fixes
Fixes #37548
2018-03-22 14:54:23 -04:00
John Ericson
76bc1d3fae guile: Fix cross more, including 1.8 2018-03-06 18:39:39 -05:00
Shea Levy
f79fa77941
Guile: Fix cross-compilation 2018-02-25 20:36:43 -05:00
Will Dietz
f661c4a7fc guile: 2.2.0 -> 2.2.3
2.2.3: https://lists.gnu.org/archive/html/guile-devel/2017-12/msg00000.html
2.2.2: https://lists.gnu.org/archive/html/guile-devel/2017-04/msg00035.html
2.2.1: https://lists.gnu.org/archive/html/guile-devel/2017-04/msg00034.html
2018-01-13 13:53:48 -06:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Eelco Dolstra
a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
John Ericson
c3c5793ab2 guile: Don't use stdenv.cross 2017-06-28 18:21:05 -04:00
Robin Gloster
da9adb8fab
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-20 14:55:44 +02:00
Michael Raskin
0cf93fda07 guile_2_0: init at 2.0.13
Reinstate guile 2.0.x. Use it for autogen
2017-03-19 20:05:14 +01:00
Rahul Gopinath
5498dd6364 guile: 2.0 -> 2.2 2017-03-19 10:47:22 -07:00
Lluís Batlle i Rossell
46c9eac980 guile: enable parallel building
civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
2017-03-13 23:38:52 +01:00
Vladimír Čunát
62ca214d4a
guile: fix include path in guile-2.0.pc
I forgot to /cc maintainer @civodul about the output-splitting.
2017-02-14 11:22:29 +01:00
Vladimír Čunát
218713aa3d
guile*: split outputs to fix #22757
The main aim is to decouple propagatedBuildInputs from $out.
2017-02-14 00:14:41 +01:00
Vladimír Čunát
0c524c63c6
guile: refactor expression
No rebuild on non-Solaris.
2017-02-13 23:01:46 +01:00
Eelco Dolstra
3373a55cac
Merge remote-tracking branch 'origin/master' into gcc-6 2016-12-21 15:51:18 +01:00
Vladimír Čunát
61aa9cb9b2
guile: doCheck = false, as it causes problems sometimes
... and I don't feel like digging into the exact cause.
It's made worse by the fact that guile is quite a mass rebuild.
2016-12-04 10:12:13 +01:00
Graham Christensen
eeb15153b9 Merge pull request #20830 from grahamc/guile
guile: apply patch fixing 00-repl-server.test stability (WIP)
2016-11-30 22:45:33 -05:00
Graham Christensen
f1fd88f7f4
guile: apply patch fixing 00-repl-server.test stability 2016-11-30 22:17:04 -05:00
Vladimír Čunát
7a88f314cb
guile: doCheck = false on i686-linux
It fails on Hydra now; I can't reproduce it locally and don't feel like
debugging it. It might be due to the warning below. That appears on
x86_64-linux as well, but we've got no problems in there so far...

warning: call to primitive-fork while multiple threads are running;
         further behavior unspecified.  See "Processes" in the
         manual, for more information.
2016-11-26 11:35:23 +01:00
Eelco Dolstra
820186434a guile: Fix random test failure
Also, let's try parallel building again. Seems to work on several
tries.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24769#12

http://hydra.nixos.org/build/43385084
2016-11-09 14:47:27 +01:00
Lancelot SIX
c959cc3d9c guile: 2.0.12 -> 2.0.13
This is a maintenance release on the stable series, containing
security fixes.

It addresses CVE-2016-8606

See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00009.html
for upstream announcement
2016-10-17 09:44:48 +02:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Lancelot SIX
522533cd36
guile: 2.0.11 -> 2.0.12
2.0.12 is a maintenance release for the 2.0.x stable series.

See http://lists.gnu.org/archive/html/info-gnu/2016-07/msg00007.html
for announcement.
2016-07-21 21:46:17 +02:00
Tuomas Tynkkynen
8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
47c45e2041 treewide: Make explicit that 'dev' output of gmp is used 2016-05-19 10:00:36 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Tobias Geerinckx-Rice
c0a35241f0 mcelog: 133 -> 134
trigger: Avoid warning from earlier merge
2016-03-22 00:59:15 +01:00
Vladimír Čunát
2f7568e092 guile: fixup with multiple-output libtool 2015-10-03 16:34:00 +02:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Michael Raskin
05c8f5c102 Disable parallel building of Guile for now 2014-11-04 14:24:23 +03:00
宋文武
1e4e719ffb guile: 2.0.9 -> 2.0.11 2014-11-01 16:56:09 +08:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Jason "Don" O'Conal
438034483a guile: remove gcc_s dep, skip check on darwin 2013-06-20 09:11:04 +10:00