public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/staging' into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/asn2quickder/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper }:
stdenv.mkDerivation rec {
pname = "asn2quickder";
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
repo = "${pname}";
};
propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ];
propagatedBuildInputs = with python2Packages; [ pyparsing makeWrapper ];
patchPhase = with pythonPackages; ''
patchPhase = with python2Packages; ''
substituteInPlace Makefile \
--replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \
--replace '..' '..:$(DESTDIR)/${python.sitePackages}:${python2Packages.pyparsing}/${python.sitePackages}' \
'';
installPhase = ''
mkdir -p $out/${pythonPackages.python.sitePackages}/
mkdir -p $out/${python2Packages.python.sitePackages}/
mkdir -p $out/bin $out/lib $out/sbin $out/man
make DESTDIR=$out PREFIX=/ all
make DESTDIR=$out PREFIX=/ install

6
pkgs/development/tools/build-managers/gn/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchurl, python, ninja, libevent, xdg-user-dirs }:
{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }:
let
date = "20161008";
@@ -61,11 +61,11 @@ in stdenv.mkDerivation rec {
NIX_LDFLAGS = "-levent";
nativeBuildInputs = [ python ninja ];
nativeBuildInputs = [ python2 ninja ];
buildInputs = [ libevent ];
buildPhase = ''
python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean
'';
installPhase = ''

10
pkgs/development/tools/misc/ycmd/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages
{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages
}:
let
inherit (pythonPackages) python;
in pythonPackages.mkPythonDerivation rec {
inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle;
in mkPythonDerivation rec {
name = "ycmd-2016-01-12";
namePrefix = "";
@@ -15,7 +15,7 @@ in pythonPackages.mkPythonDerivation rec {
buildInputs = [ cmake boost ];
propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
propagatedBuildInputs = [ waitress frozendict bottle ];
buildPhase = ''
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -24,7 +24,7 @@ in pythonPackages.mkPythonDerivation rec {
configurePhase = ":";
installPhase = with pythonPackages; ''
installPhase = ''
mkdir -p $out/lib/ycmd/third_party $out/bin
cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd