Commit Graph

3236 Commits

Author SHA1 Message Date
Thomas Tuegel
a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel
1087020a46 cmake: invoke configure hooks correctly
Otherwise, the multiple-outputs hooks will not fire correctly.
2016-01-31 21:15:03 -06:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
5d52f55426 treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
vbgl
c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42
Eliom42
2016-01-18 09:32:48 +01:00
Robin Gloster
ba4b4752f2 racerRust: 1.0.0 -> 1.1.0 2016-01-17 22:05:25 +00:00
Gleb Peregud
ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap.
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
2016-01-17 21:59:27 +01:00
Peter Simons
fc32bc1963 Merge pull request #12429 from erlang-nix/fix-rebar3-nix-bootstrap-shebang
Make rebar3-nix-bootstrap depend on erlang.
2016-01-16 19:47:40 +01:00
Gleb Peregud
0692c6a96d Make rebar3-nix-bootstrap depend on erlang.
This fixes patchShebangs ability to properly fix up path to escript
binary.
2016-01-16 18:53:48 +01:00
Peter Simons
7824b8c330 Merge pull request #12409 from erlang-nix/master
Improvements for Erlang support in Nix
2016-01-16 15:25:06 +01:00
aszlig
8f793ce6bb
elfutils: Fix header compatibility with glibc 2.21
Regression introduced by df2b9b48cb.

This breaks the build for ltrace and other programs using libelf,
because the header file relies on features from glibc >= 2.22.

Here is an excerpt from the log output of the configure script from
ltrace:

In file included from ...elfutils-0.165/include/gelf.h:32:0,
                 from conftest.c:57:
...elfutils-0.165/include/libelf.h:280:8: error: unknown type name 'Elf32_Chdr'
 extern Elf32_Chdr *elf32_getchdr (Elf_Scn *__scn);
        ^
...elfutils-0.165/include/libelf.h:281:8: error: unknown type name 'Elf64_Chdr'
 extern Elf64_Chdr *elf64_getchdr (Elf_Scn *__scn);
        ^
In file included from conftest.c:57:0:
...elfutils-0.165/include/gelf.h:89:9: error: unknown type name 'Elf64_Chdr'
 typedef Elf64_Chdr GElf_Chdr;
         ^

The issue has been reported in the Debian bug tracker at
https://bugs.debian.org/810885 and I'm using the patch from Mark
Wielaard that has been posted there which adds compatibility for older
glibc versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-16 01:37:37 +01:00
Eric Merritt
24a9dcd12f rebar3: refactor
Move registrySnapshot to the erlang-nix github organization
2016-01-15 09:07:06 -08:00
Eelco Dolstra
df2b9b48cb elfutils: 163 -> 165
Also, install programs with the "eu-" prefix to prevent collisions
with binutils (as recommended by upstream), enable xz support, and
enable deterministic archives.
2016-01-15 15:01:13 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
34fe0833c8 iozone: commit some forgotten fixups (/cc #12387) 2016-01-15 10:26:18 +01:00
Svein Ove Aas
a28032ed58 iozone: init at 3.434 (close #12387)
vcunat amended some $out/share/ install paths.
2016-01-15 09:47:57 +01:00
Eric Merritt
4ed5836dd3 hex2nix: init at 0.0.2 2016-01-14 14:38:10 -08:00
Eric Merritt
474e417891 erlang support: allow nix-shell to work correctly
This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
2016-01-14 14:36:47 -08:00
Eric Merritt
99bf9bf07a rebar3-nix-boostrap: init at 0.0.1 2016-01-14 14:34:47 -08:00
Nikolay Amiantov
d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Vladimír Čunát
cea8ee50c7 phantomjs2: fix evaluation and refactor
The error was due to the fact that with-introduced bindings have lower
priority and we do have `darwin` in scope already.

Fixes #12350. Closes #12351. (A slightly different fix.
I chose this to lower the risk of people re-introducing the mistake.)
2016-01-13 08:34:35 +01:00
Jude Taylor
e6a892bb55 phantomjs2: build on darwin 2016-01-12 21:52:49 -08:00
Vladimír Čunát
19d22184d3 stdenv/multiple-outputs.sh: small tweaks
- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
  (note: some paths are auto-removed by default, e.g. gtk-doc and man3)
2016-01-12 23:57:47 +01:00
Tobias Geerinckx-Rice
fcb913b3a7 systemtap: remove dead package
Broken since 2013. Depends on equally broken latex2html.
Our version 1.2 is almost six years old; latest is 2.9.
And it's (still) no dtrace.
2016-01-11 01:41:54 +01:00
Pascal Wittmann
26a6b4b58d yodl: 3.05.01 -> 3.06.00 2016-01-09 20:07:43 +01:00
Pascal Wittmann
1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Florent Becker
a14c867d62 js_of_ocaml: Allow caml >= 4.02 to find camlp4 2016-01-08 16:06:00 +01:00
Jude Taylor
08c081309b Revert "gnustep-make: fix installation path"
This reverts commit 4f1559a751.
2016-01-07 21:52:11 -08:00
Gabriel Ebner
b12cabd223 electron: 0.28.2 -> 0.36.2 2016-01-06 19:05:00 +01:00
Peter Simons
1355e928cf Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
2016-01-05 12:22:23 +01:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát
7c879d342d Merge #10816: improve FreeBSD support 2016-01-05 09:50:10 +01:00
Eric Seidel
222f4b9e2b gnustep-make: dont write to /Library/GNUstep 2016-01-04 14:07:17 -08:00
Ragnar Dahlén
a25bfab690 boot: Update shell script version and remove makeWrapper usage 2016-01-04 17:23:45 +00:00
Tobias Geerinckx-Rice
8f6ae032c0 ccache: cherry-pick a (backported upstream) bug-fix 2016-01-04 15:11:51 +01:00
Pascal Wittmann
340c8acfaf global: 6.5.1 -> 6.5.2 2016-01-03 19:47:17 +01:00
Pascal Wittmann
642065e8d4 checkstyle: 6.13 -> 6.14.1 2016-01-03 19:42:59 +01:00
Tobias Geerinckx-Rice
ddd48258e8 gnustep-make: 2.6.6 -> 2.6.7 2016-01-03 00:24:28 +01:00
Tobias Geerinckx-Rice
4f1559a751 gnustep-make: fix installation path
Get rid of the nested /nix/store/.../nix/store/... directories.
2016-01-03 00:24:28 +01:00
Benjamin Staffin
4a69e5ae85 omake: Fix broken download URL
All the download links on http://omake.metaprl.org/ seem to be dead.
2016-01-02 18:21:48 +01:00
Florent Becker
44931d4293 js_of_ocaml: 2.5 -> 2.6 2016-01-01 19:04:40 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
janus
c01dbc4932 FreeBSD patches for GNU m4, stdenv, miniupnpc 2016-01-01 17:01:13 +00:00
Michael Raskin
1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03:00
Michael Raskin
761340140c luarocks: 2.2.2 -> 2.3.0 2016-01-01 12:30:17 +03:00
Michael Raskin
f50aca5157 cl-launch: 4.1.4 -> 4.1.4.1 2015-12-31 16:52:05 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Shell Turner
c1ec39d47b icestorm: init at 2015.12.29 2015-12-30 16:52:41 +00:00