JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,075 Commits 2 Branches 0 Tags 13 GiB
7049172d72
Commit Graph

770 Commits

Author SHA1 Message Date
Artyom Shalkhakov
d39e5372dc gnustep: cleanup 
Cleaning up. Adding GNUstep package builder for abstracting out GNUstep
compilation specifics (with thanks to GitHub user lethalman).

The rules for using build_gnustep_package are as simple: any
GNUstep-based package that the package being compiled depends upon are
to be put in [deps] (this is used for setting up a buildEnv), while
other dependencies are put into [buildInputs] as usual.
 2016-08-16 20:59:30 +00:00
Artyom Shalkhakov
52d17a5f41 gnustep: packageg libs separately 
Packing gnustep libs separately, with no use of gnustep-startup. Also,
fixed a bug in WindowMaker package (some imaging dependencies were not supplied).
 2016-08-16 20:59:08 +00:00
Tim Steinbach
6654b8274e
gradle: 2.14.1 -> 3.0, keep 2.14.1 2016-08-16 00:03:18 +00:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00: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
fcc3a1b41d bazel: Broken on i686 
http://hydra.nixos.org/build/38314298
 2016-08-06 17:06:45 +03:00
Tobias Geerinckx-Rice
06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02:00
Robin Gloster
c95ab0a2d1 gnumake380: disable format hardening 2016-08-03 20:03:04 +00: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
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Alexey Shmalko
176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos
5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02:00
Alexey Shmalko
a18abd2aa3 meson: 0.26.0 -> 0.32.0 2016-07-24 00:34:19 +02:00
Gabriel Ebner
3016eb1c4b sbt: 0.13.11 -> 0.13.12 2016-07-21 12:29:14 +02:00
Tim Steinbach
3563be8dd6 gradle: 2.14 -> 2.14.1 2016-07-19 15:10:54 +00:00
Vladimír Čunát
40785f0dac Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1282763
 2016-07-12 22:00:10 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5 
These cause an unnecessary rebuild of gcc.
 2016-07-11 10:46:34 +02:00
Vladimír Čunát
9d3228f99d gnumake42: bugfix 4.2 -> 4.2.1 2016-07-09 16:50:12 +02:00
Vladimír Čunát
3b2627586d Merge #16448: gnumake: optionally build with guile 
Fixed up nested lists within the merge.
 2016-07-09 16:36:49 +02:00
Tim Steinbach
e00c572698 gradle: 2.13 -> 2.14 2016-07-01 02:23:28 +00:00
Rahul Gopinath
021dd6a5f6 waf: 1.8.19 -> 1.9.0 2016-06-26 21:59:23 -07:00
Rahul Gopinath
586a9c0d9c gnumake: Allow guile extension language as an optional feature 2016-06-23 09:55:54 -07:00
Tobias Geerinckx-Rice
ffd2afd89d
dub: 0.9.25 -> 1.0.0 2016-06-20 19:34:19 +02:00
Moritz Ulrich
e72282be84 Merge pull request #16052 from dvc94ch/rust-cross 
Rust and cargo improvements
 2016-06-16 09:42:23 +02:00
Eric Merritt
864a0816c4 rebar3: remove no longer needed registrySnapshot.nix 2016-06-15 07:20:17 -07:00
Eric Merritt
b1cd08246f beamPackages: turn on debug_info for beam packages 
This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
 2016-06-15 07:20:01 -07:00
David Craven
54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
David Craven
0720373dfc cargo: Use stable releases instead of snapshots 2016-06-14 23:09:21 +02:00
Moritz Ulrich
b05f991f5f Rust infrastructure refactoring 
Rust infrastructure updates & refactoring
 2016-06-03 00:11:13 +02:00
David Craven
895db6daf3 Update cargo head 2016-06-02 17:15:52 +02:00
Thomas Tuegel
d5d4606190 Revert "cmake: use supplied RPATH instead of guessing" 
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
 2016-05-31 16:30:15 -05:00
Thomas Tuegel
8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Moritz Ulrich
303aac8381 cargo: 0.9.0 -> 0.10.0, rustRegistry: 2016-05-12 -> 2016-05-28. 2016-05-28 15:05:11 +02:00
Joachim Fasting
4da35b7c56 Merge pull request #15705 from vrthra/redo 
redo: Init at 1.2
 2016-05-26 10:14:34 +02:00
Bjørn Forsman
25960389da ninja: 1.6.0 -> 1.7.1 
Release notes:
https://groups.google.com/forum/#!topic/ninja-build/bkDE7auQwiI/discussion

The current github src URL redirects to the "ninja-build" github user,
so use that directly.
 2016-05-26 09:51:10 +02:00
Rahul Gopinath
df40533f11 redo: Init at 1.2 
Redo is an alternative for Make. This package is a C++ implementation
of redo.
 2016-05-25 13:49:21 -07:00
Bjørn Forsman
2fb4b797a1 meson: add meta.platforms 2016-05-25 21:18:48 +02:00
Bjørn Forsman
a35874b41a meson: fix chroot build 
/usr/bin/env is not available in chroot builds. Invoke the python3
interpreter directly instead of trying to let env do it (which fails).

Fixes this build error:

  $ nix-build -A meson
  ...
  /nix/store/HASH-stdenv/setup: ./install_meson.py: /usr/bin/env: bad interpreter: No such file or directory
  builder for ‘/nix/store/HASH-meson-0.26.0.drv’ failed with exit code 126
 2016-05-25 21:18:48 +02:00
Nick Novitski
93b99cd361 gnumake: add version 4.2 2016-05-23 15:30:41 +00:00
Tobias Geerinckx-Rice
2964212b45
dub: 0.9.24 -> 0.9.25 2016-05-23 01:31:58 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Thomas Tuegel
b70d728ed7 cmake: use single output 
Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
 2016-05-06 16:26:40 -05:00
Tim Steinbach
a17c90dcd1
gradle: 2.12 -> 2.13 2016-05-06 10:52:25 -04:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Joachim Fasting
e1197f6896 Merge pull request #15082 from namore/init_rake 
rake: init at 11.1.1
 2016-05-02 03:20:51 +02:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Roman Naumann
61c8af996f rake: init at 11.1.1 2016-04-29 15:45:11 +02:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001) 
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
 2016-04-26 13:38:03 +01:00
Joachim Fasting
2dbfe512db Merge pull request #14858 from ericbmerritt/elixir-support 
Elixir support
 2016-04-25 23:04:14 +02:00
Eric Merritt
cd27abe751 rebar3: refactor 
cleanup up the code quite a bit in the bootstrapper
 2016-04-25 08:34:55 -07:00
Nikolay Amiantov
96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Eric Merritt
658a49b81d rebar3: 3.0.0-beta.4 -> 3.1.0 2016-04-23 19:03:30 -07:00
Eric Merritt
383626b9d7 move rebar3-nix-bootstrap to rebar3 
This moves rebar3-nix-bootstrap from its own repository to rebar3. Its a
single file and this vastly reduces the complexity of making changes.
 2016-04-23 19:03:29 -07:00
Eric Merritt
8dbcb4e35e beamPackages: Add support for Mix and Erlang.mk 2016-04-23 19:03:24 -07:00
Tadas Barzdzius
a49ffbb196 cargo: add libiconv to buildInputs to fix darwin build 2016-04-23 23:08:02 +03:00
Vladimír Čunát
e9379f7416 Merge branch 'staging' 
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
 2016-04-22 16:49:09 +02:00
Thomas Tuegel
491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Tadas Barzdzius
7d661a4ab4 cargo: 0.8.0 -> 0.9.0. Enable Darwin 2016-04-20 12:42:37 +03:00
Mathieu Boespflug
6c9c59067b gradle: fix attribute name for gcc libs path. 
PR #14326 fixed gradle so that its native code library could find
libstdc++.so.6, but this fix is inoperative now, because this library
is in `"${stdenv.cc.cc.lib}/lib"` now, rather than
`"${stdenv.cc.cc}/lib"`.
 2016-04-17 01:09:24 +02:00
Nikolay Amiantov
52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov
d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Michael Raskin
238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tobias Geerinckx-Rice
57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
Tobias Geerinckx-Rice
613cef6240
gup: 0.5.4 -> 0.5.5; use fetchFromGitHub 2016-04-11 16:21:12 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Aaron Son
bbfad5111a gradle: Fix gradle-2.12 on Linux to find libstdc++.so reference in native library. 2016-04-01 14:33:23 -07: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
Jakob Gillich
a9326f6f34 cargoMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00
Tim Steinbach
aa4af87501 gradle: 2.11 -> 2.12 2016-03-16 18:55:11 +00:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Frederik Rietdijk
36506df7fe Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default 
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
 2016-03-05 11:07:50 -05:00
Gabriel Ebner
de24ea40f8 sbt: 0.13.9 -> 0.13.11 2016-03-03 16:09:00 +01:00
Tim Cuthbertson
70df5bf9ea gup: 0.5.3 -> 0.5.4 2016-02-29 20:15:19 +11:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Lancelot SIX
0467a17858 pythonPackages.sqlalchemy: follows upstream, sqlalchemy7 for lecagy 
This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
 2016-02-27 12:11:12 +01:00
Nikolay Amiantov
a4902ff1fa rustUnstable.cargo: 2016-01-10 -> 2016-02-25 2016-02-25 14:21:46 +03:00
Jude Taylor
45ea4956d8 fix library dependencies for cargo on darwin 2016-02-23 16:42:51 -08:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication 
buildPythonApplication: use new function for Python applications
 2016-02-23 16:02:10 +01:00
Pascal Wittmann
50f45db51c icmake: 8.00.05 -> 8.01.00 2016-02-20 20:28:26 +01:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Eelco Dolstra
8af685d089 Merge pull request #13097 from jerith666/antrun 
ant: preserve antRun script
 2016-02-18 19:48:12 +01:00
Matt McHenry
e5e633ca11 ant: preserve antRun script 2016-02-18 10:13:39 -05:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Herwig Hochleitner
b7b696e534 leiningen: 2.5.3 -> 2.6.1 2016-02-16 22:39:34 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tim Steinbach
e81fd09b85 gradle: 2.10 -> 2.11 2016-02-10 21:48:45 +00:00
tg(x)
310a20eda8 waf 2016-02-10 20:34:05 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Nikolay Amiantov
d9c4fc4de9 Merge pull request #12682 from zohl/nant 
NAnt
 2016-02-03 22:56:12 +03:00
Al Zohali
9679042278 nant: init at 20151115 2016-02-03 22:00:41 +03:00
Vladimír Čunát
d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát
80270e2019 cmake: maintenance updates 3.4.0 -> 3.4.3 2016-02-03 16:59:38 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Ricardo M. Correia
52475afe77 cargo: 0.7.0 -> 0.8.0 2016-02-02 17:25:44 +01:00
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
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tim Cuthbertson
b82d5ef857 gup: 0.5.1 -> 0.5.3 2016-01-24 16:34:07 +11:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches 
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
 2016-01-24 02:02:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Eric Merritt
8021b5241c rebar3: refactor to make hermetic 
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
 2016-01-18 08:19:15 -08:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01: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
Eric Merritt
24a9dcd12f rebar3: refactor 
Move registrySnapshot to the erlang-nix github organization
 2016-01-15 09:07:06 -08:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01: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
Nikolay Amiantov
d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Pascal Wittmann
1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Jude Taylor
08c081309b Revert "gnustep-make: fix installation path" 
This reverts commit 4f1559a751.
 2016-01-07 21:52:11 -08: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
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
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
Michael Raskin
1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03: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
Robin Gloster
2faea53f8e cargo: 0.6.0 -> 0.7.0 2015-12-24 13:20:24 +01:00
Tim Steinbach
d509f8a30a gradle: 2.9 -> 2.10 2015-12-23 08:44:49 -05:00
Tim Steinbach
895875bdac maven: 3.3.3 -> 3.3.9, fixes #11867 2015-12-22 02:11:00 +01:00
Tim Steinbach
9121277144 gradle: 2.8 -> 2.9 2015-12-21 11:37:21 -05:00
Herwig Hochleitner
b3b7f9f37f fix lib path for gradle, fixes #11191 2015-12-18 23:12:43 +03:00
Gleb Peregud
bb1b5c7194 Update hex.pm registry 2015-12-15 15:06:47 +01:00
Gleb Peregud
474da3bf24 Add sources of specific rebar bootstrap deps via new fetchHex 
derivation.
 2015-12-15 15:06:44 +01:00
Gleb Peregud
108f3cf67f Add patch which makes rebar compilation hermetic 2015-12-15 14:05:51 +01:00
Gleb Peregud
4ba1a51b7f Move registry to rebar3, since it needs it itself to be bootstrapped. 
This makes rebar3 build a bit more hermetic. Next stage is to pull in
rebar3 plugins dependencies for bootstrap to pick up.
 2015-12-15 14:05:19 +01:00
Gleb Peregud
033902d269 Refactor fetchHex out of buildHex. 
This will allow to reuse this code to fetch rebar3's dependencies to
ensure it's hermetic build.
 2015-12-15 14:01:38 +01:00
Gleb Peregud
bcc4ca029a Add rebar3 package 2015-12-15 01:02:52 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Herwig Hochleitner
58ba1d5bd3 leiningen: 2.5.2 -> 2.5.3, fixes #11537 2015-12-08 02:58:33 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies 
Close #11290. The patch will no longer apply on *any* platform.
 2015-11-29 08:58:39 +01:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency 
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
 2015-11-18 02:41:45 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Desmond O. Chang
b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Edward Tjörnhammar
38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Aristid Breitkreuz
c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Pascal Wittmann
fcb4627695 Merge pull request #9980 from wavewave/gradle25 
add gradle 2.5.
 2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b gradle: reinit at 2.5. 
For some projects (especially using android ndk), we still need to keep 2.5.
 2015-11-06 07:31:58 -08:00
Ricardo M. Correia
84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Pascal Wittmann
36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Vladimír Čunát
1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Cillian de Róiste
e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
Brandon Edens
6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00
Edward Tjörnhammar
c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package 
sbt: use sbt-launcher-package.
 2015-10-12 23:02:58 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Gabriel Ebner
98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
William A. Kennington III
d5395b0506 Merge pull request #10024 from mayflower/update-rust 
Update rust and dependants
 2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream 
This is a partial commit from staging in an attempt to make merges
smaller.
 2015-09-23 14:35:36 -07:00
Robin Gloster
feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Tobias Geerinckx-Rice
ee7df6a566 dub: 0.9.23 -> 0.9.24 
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
 2015-09-21 19:22:14 +02:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
goibhniu
529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms 
Update argyllcms
 2015-09-14 10:01:36 +02:00
Tim Cuthbertson
9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Samuel Rivas
4ef2d19981 jam: add yacc as build input 
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
 2015-09-07 11:37:18 +02:00
Peter Simons
fcb0bdbaa0 Merge pull request #9639 from k0ral/scons 
scons: 2.3.5 -> 2.3.6
 2015-09-03 21:08:32 +02:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub 
Also add myself as a maintainer.

CC@ pSub
 2015-09-01 05:28:53 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Moritz Ulrich
2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
William A. Kennington III
6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Rickard Nilsson
cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9 
sbt: 0.13.8 -> 0.13.9
 2015-08-12 11:02:42 +02:00
j-keck
5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Profpatsch
062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
William A. Kennington III
793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
lethalman
dad54b36fb Merge pull request #9008 from philandstuff/fix-bazel 
Fix bazel package
 2015-08-06 11:47:54 +02:00
Ragnar Dahlén
25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
Nikolay Amiantov
4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov
52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
Philip Potter
76dd430cd8 bazel: fix build, make compatible with openjdk 
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
 2015-07-28 20:38:44 +01:00
Ricardo M. Correia
205a6b894d cargo: workaround frequent hash mismatches due to #8567 
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
 2015-07-21 21:26:02 +02:00
Austin Seipp
f07d5a244f nixpkgs: ninja 1.5.3 -> 1.6.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:34 -05:00
Vladimír Čunát
9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Stewart Mackenzie
f46bbbce49 boot: correct sha256 2015-07-19 02:33:43 +08:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Jude Taylor
43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Robert Irelan
51972d427e cargo: 2015-05-13 -> 0.3.0 
Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
 2015-07-09 22:56:51 -07:00
Robert Irelan
e6ee86b941 cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env 
Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
 2015-07-09 21:14:55 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
b280d6cbc7 scons: update 2.3.4 -> 2.3.5 2015-07-05 00:32:53 +03:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Rok Garbas
0860826795 cygwin: cmake expression should not change for linux 2015-06-12 12:17:12 +02:00
Rok Garbas
277c263c1e cygwin: update patch for cmake 3.2.2 2015-06-12 12:17:12 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging 
Conflicts:
	pkgs/development/libraries/wayland/default.nix
 2015-06-11 00:23:03 +02:00
Eelco Dolstra
3ede0a64a2 make: Don't segfault if we can't get a tty name 
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
 2015-06-04 19:47:34 +02:00
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
Pascal Wittmann
f675c4d90d icmake: update from 7.22.00 to 7.22.01 2015-05-28 18:57:32 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Florian Friesdorf
f33f2a7e82 cygwin: disable gnumake check because of hanging test 2015-05-28 10:53:35 +02:00
Arseniy Seroka
6c9ac3f967 Merge pull request #8024 from ragnard/update-boot-version 
boot: Update version from 2.0.0-rc14 to 2.0.0.
 2015-05-27 22:43:15 +03:00
Ragnar Dahlén
9cb63367dc boot: Update version from 2.0.0-rc14 to 2.0.0. 2015-05-27 20:39:17 +01:00
Ricardo M. Correia
2817e74d37 cargo: Add myself to maintainers 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
9b752fd0e1 buildRustPackage: Don't hardcode registry index hash 
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
de322b48b7 cargo: Fix src hash 
It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
 2015-05-19 19:02:38 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8" 
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
 2015-05-15 23:02:41 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency 
Also, don't install static libraries in jsoncpp.
 2015-05-13 18:17:26 +02:00
Ricardo M. Correia
981ea747b5 cargo: 2015-05-11 -> 2015-05-13 2015-05-13 17:23:18 +02:00
Ricardo M. Correia
755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust 
Add support for Rust / Cargo packaging
 2015-05-12 17:30:11 +02:00
Ricardo M. Correia
cbdedca255 cargo: 2015-04-14 -> 2015-05-11 2015-05-12 17:28:50 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
William A. Kennington III
64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
6b4aec742d Merge pull request #7628 from ragnard/bump-boot 
boot: bump from rc8 to rc14
 2015-04-29 10:55:16 +02:00
Ragnar Dahlén
543ec3cf46 boot: bump from rc8 to rc14 2015-04-29 08:50:48 +01:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Ricardo M. Correia
d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack 
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
 2015-04-23 20:22:19 +02:00
Ricardo M. Correia
0cde1dc524 cargo: Remove setupHook 
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
 2015-04-23 15:26:23 +02:00
Ricardo M. Correia
e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored 
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
 2015-04-23 02:58:07 +02:00
Ricardo M. Correia
d648be6724 buildRustPackage: Add check phase and enable it by default 
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
 2015-04-21 20:45:05 +02:00
Ricardo M. Correia
5e8a447739 cargo: Build optimized binary 2015-04-21 20:44:41 +02:00
Georges Dubus
7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Vladimír Čunát
a8813a3db0 cmake: fix with multiple outputs, split help, refactor 
The removed configureFlags seemed to have no effect.
 2015-04-18 22:30:26 +02:00
Vladimír Čunát
65ac24c903 gnumake-4.1: split docs 2015-04-18 19:48:00 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Arseniy Seroka
d56e9b4f05 Merge pull request #7330 from RumataEstor/rust-beta 
Provide rustc-1.0.0-beta as the default rust package
 2015-04-16 13:05:40 +03:00
Charles Cooper
ba206b550a dub update to v0.9.23 2015-04-14 10:46:16 -07:00
Dmitry Belyaev
871d11c176 Update cargoSnapshot to rustc-1.0.0-beta release 2015-04-13 15:55:39 +10:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
John Wiegley
d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging 
Make cmake install shared libraries with full install names by default
 2015-03-30 21:47:27 -05:00
Luis G. Torres
ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III
22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
goodwillcoding
62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m 
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-26 11:42:02 +01:00
Rob Vermaas
46eedd9de5 Dohh 2015-03-26 09:48:27 +00:00
Rob Vermaas
ac35d15bcc bazel: Upstream pushed patch, removing patch. 2015-03-26 09:46:31 +00:00
Rob Vermaas
7721ff4ccb bazel: add patch suggested by upstream 2015-03-26 06:30:21 +00:00
Rob Vermaas
f5eed7e14e Add initial version for bazel.io build manager. 2015-03-25 15:12:02 +00:00