3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

578 commits

Author SHA1 Message Date
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