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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Nikolay Amiantov
2016-08-15 10:34:28 +03:00
parent ea34fe82bc 397a17aef9
commit 5b296a1470
121 changed files with 1115 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/renpy/default.nix
View File

@@ -1,7 +1,9 @@
{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython
, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL
, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
}:
with pythonPackages;
stdenv.mkDerivation {
name = "renpy-6.17.6";

6
pkgs/development/libraries/cppzmq/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cppzmq-${version}";
version = "2016-01-20";
version = "2016-07-18";
src = fetchFromGitHub {
owner = "zeromq";
repo = "cppzmq";
rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848";
sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm";
rev = "92d2af6def80a01b76d5e73f073c439ad00ab757";
sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27";
};
installPhase = ''

12
pkgs/development/libraries/folly/default.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog
, google-gflags, python, libiberty, openssl }:
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent
, double_conversion, glog, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-${version}";
version = "2016-04-29";
version = "2016.08.08.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9";
sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24";
rev = "v${version}";
sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087";
};
nativeBuildInputs = [ autoreconfHook python ];
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
postPatch = "cd folly";

4
pkgs/development/libraries/icu/default.nix
View File

@@ -2,7 +2,7 @@
let
pname = "icu4c";
version = "56.1";
version = "57.1";
in
stdenv.mkDerivation ({
name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+ (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s";
sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
};
outputs = [ "dev" "out" ];

5
pkgs/development/libraries/jemalloc/default.nix
View File

@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8";
};
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
meta = with stdenv.lib; {
homepage = http://www.canonware.com/jemalloc/index.html;
description = "General purpose malloc(3) implementation";

6
pkgs/development/libraries/libbsd/default.nix
View File

@@ -9,12 +9,6 @@ in stdenv.mkDerivation {
sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";
};
patchPhase = ''
substituteInPlace Makefile \
--replace "/usr" "$out" \
--replace "{exec_prefix}" "{prefix}"
'';
meta = {
description = "Common functions found on BSD systems";
homepage = http://libbsd.freedesktop.org/;

28
pkgs/development/libraries/libdynd/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, cmake }:
let version = "0.7.2"; in
stdenv.mkDerivation {
name = "libdynd-${version}";
src = fetchFromGitHub {
owner = "libdynd";
repo = "libdynd";
rev = "v${version}";
sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
};
cmakeFlags = [
"-DDYND_BUILD_BENCHMARKS=OFF"
];
buildInputs = [ cmake ];
outputs = [ "dev" "out" ];
outputDoc = "dev";
meta = with stdenv.lib; {
description = "C++ dynamic ndarray library, with Python exposure.";
homepage = http://libdynd.org;
license = licenses.bsd2;
};
}

4
pkgs/development/libraries/libvdpau-va-gl/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libvdpau-va-gl-${version}";
version = "0.3.6";
version = "0.4.0";
src = fetchFromGitHub {
owner = "i-rinat";
repo = "libvdpau-va-gl";
rev = "v${version}";
sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5";
sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k";
};
nativeBuildInputs = [ cmake pkgconfig ];

8
pkgs/development/libraries/science/math/ipopt/default.nix
View File

@@ -1,17 +1,15 @@
{ stdenv, fetchurl, unzip, openblas, gfortran }:
stdenv.mkDerivation rec {
version = "3.12.4";
version = "3.12.6";
name = "ipopt-${version}";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l";
sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0";
};
preConfigure = ''
export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO"
'';
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
configureFlags = [
"--with-blas-lib=-lopenblas"

8
pkgs/development/libraries/xgboost/default.nix
View File

@@ -2,17 +2,15 @@
stdenv.mkDerivation rec {
name = "xgboost-${version}";
version = "2016-05-14";
version = "0.60";
# needs submodules
src = fetchgit {
url = "https://github.com/dmlc/xgboost";
rev = "9c26566eb09733423f821f139938ff4105c3775d";
sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093";
rev = "refs/tags/v${version}";
sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq";
};
postPatch = "sed '1i#include <cmath>' -i src/tree/param.h";
enableParallelBuilding = true;
installPhase = ''

5
pkgs/development/python-modules/pyqt/4.x.nix
View File

@@ -40,7 +40,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru.pythonPath = [];
passthru = {
pythonPath = [];
qt = qt4;
};
meta = {
description = "Python bindings for Qt";

42
pkgs/development/tools/java/visualvm/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }:
stdenv.mkDerivation rec {
name = "visualvm-1.3.8";
src = fetchzip {
url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip";
sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
rm bin/visualvm.exe
substituteInPlace etc/visualvm.conf \
--replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
--replace "/path/to/jdk" "${jdk.home}" \
--replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '
cp -r . $out
# To get the native LAF, JVM needs to see GTK’s .so-s.
wrapProgram $out/bin/visualvm \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}"
'';
meta = with stdenv.lib; {
description = "A visual interface for viewing information about Java applications";
longDescription = ''
VisualVM is a visual tool integrating several commandline JDK
tools and lightweight profiling capabilities. Designed for both
production and development time use, it further enhances the
capability of monitoring and performance analysis for the Java
SE platform.
'';
homepage = https://visualvm.java.net/;
license = licenses.gpl2ClasspathPlus;
platforms = platforms.all;
maintainers = with maintainers; [ michalrus ];
};
}

22
pkgs/development/tools/pypi2nix/default.nix
View File

@@ -3,21 +3,16 @@
let
deps = import ./deps.nix { inherit fetchurl; };
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8";
sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb";
};
in stdenv.mkDerivation rec {
name = "pypi2nix-${version}";
srcs = with deps; [
src
pip
click
setuptools
zcbuildout
zcrecipeegg
requests
]; # six attrs effect ];
buildInputs = [ python zip makeWrapper ];
@@ -26,17 +21,13 @@ in stdenv.mkDerivation rec {
postUnpack = ''
mkdir -p $out/pkgs
mv pip-*/pip $out/pkgs/pip
mv click-*/click $out/pkgs/click
mv setuptools-*/setuptools $out/pkgs/setuptools
mv zc.buildout-*/src/zc $out/pkgs/zc
mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe
# mv six-*/six.py $out/pkgs/
# mv attrs-*/src/attr $out/pkgs/attrs
# mv effect-*/effect $out/pkgs/effect
mv requests-*/requests $out/pkgs/
if [ -z "$IN_NIX_SHELL" ]; then
if [ "$IN_NIX_SHELL" != "1" ]; then
if [ -e git-export ]; then
mv git-export/src/pypi2nix $out/pkgs/pypi2nix
else
@@ -48,9 +39,9 @@ in stdenv.mkDerivation rec {
commonPhase = ''
mkdir -p $out/bin
echo "#!${python}/bin/python3" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
echo "#!${python.interpreter}" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
chmod +x $out/bin/pypi2nix
@@ -81,6 +72,5 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/garbas/pypi2nix;
description = "A tool that generates nix expressions for your python packages, so you don't have to.";
maintainers = with stdenv.lib.maintainers; [ garbas ];
platforms = with stdenv.lib.platforms; unix;
};
}

8
pkgs/development/tools/pypi2nix/deps.nix
View File

@@ -17,6 +17,9 @@ rec {
zcrecipeeggVersion = "2.0.3";
zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";
buildoutrequirementsVersion = "0.2.2";
buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00";
wheelVersion = "0.29.0";
wheelHash = "555a67e4507cedee23a0deb9651e452f";
@@ -71,6 +74,11 @@ rec {
md5 = zcrecipeeggHash;
};
buildoutrequirements = fetchurl {
url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz";
md5 = buildoutrequirementsHash;
};
wheel = fetchurl {
url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz";
md5 = wheelHash;