Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
@@ -145,7 +145,6 @@ let
|
||||
url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff";
|
||||
sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swift-${version_friendly}";
|
||||
@@ -247,6 +246,9 @@ stdenv.mkDerivation rec {
|
||||
# https://bugs.swift.org/browse/SR-5779
|
||||
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
|
||||
|
||||
# https://bugs.swift.org/browse/SR-4838
|
||||
sed -i -e '30i#include <functional>' lldb/include/lldb/Utility/TaskPool.h
|
||||
|
||||
substituteInPlace clang/lib/Driver/ToolChains.cpp \
|
||||
--replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
|
||||
' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
|
||||
@@ -287,7 +289,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# TODO: Use wrappers to get these on the PATH for swift tools, instead
|
||||
ln -s ${clang}/bin/* $out/bin/
|
||||
ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar
|
||||
ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar
|
||||
|
||||
wrapProgram $out/bin/swift \
|
||||
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "joker-${version}";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
|
||||
goPackagePath = "github.com/candid82/joker";
|
||||
|
||||
@@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "1cmvja8qdrrzacdfn944f22mdg8177qkxfrb10ykq59c2yp1xn01";
|
||||
sha256 = "0ph5f3vc6x1qfh3zn3va2xqx3axv1i2ywbhxayk58p55fxblj5c9";
|
||||
};
|
||||
|
||||
preBuild = "go generate ./...";
|
||||
|
||||
30
pkgs/development/libraries/avro-c/default.nix
Normal file
30
pkgs/development/libraries/avro-c/default.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }:
|
||||
|
||||
let
|
||||
version = "1.8.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "avro-c-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
||||
buildInputs = [ jansson zlib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A C library which implements parts of the Avro Specification";
|
||||
homepage = https://avro.apache.org/;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lblasc ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchzip, cmake }:
|
||||
{ stdenv, fetchurl, fetchzip, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.8.5";
|
||||
@@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ];
|
||||
|
||||
# fetch newer version of platform.h which correctly supports gcc 7.3
|
||||
gcc7PlatformPatch = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
|
||||
sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}'
|
||||
cp ${gcc7PlatformPatch} glm/simd/platform.h
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoconf, automake, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libHX-3.21";
|
||||
name = "libHX-3.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz";
|
||||
sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v";
|
||||
url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz";
|
||||
sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c";
|
||||
};
|
||||
|
||||
patches = [];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libabw-${version}";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
|
||||
sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing";
|
||||
sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
|
||||
};
|
||||
|
||||
# Boost 1.59 compatability fix
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libiodbc-3.52.8";
|
||||
name = "libiodbc-3.52.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/iodbc/${name}.tar.gz";
|
||||
sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq";
|
||||
sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libisoburn-${version}";
|
||||
version = "1.4.4";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
|
||||
sha256 = "1mn2dwkwdrdcjnd59czxali7r5nlxdx92clyxnsfpmw20f9s20kv";
|
||||
sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi";
|
||||
};
|
||||
|
||||
buildInputs = [ attr zlib libburn libisofs ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libivykis-${version}";
|
||||
|
||||
version = "0.41";
|
||||
version = "0.42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
|
||||
sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc";
|
||||
sha256 = "0c90cfpxipw2m8i3ajr7vy7lb8gvcz2kh5n8sd542zphr4na8whq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "liblogging-1.0.5";
|
||||
name = "liblogging-1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.rsyslog.com/liblogging/${name}.tar.gz";
|
||||
sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i";
|
||||
sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libltc-1.1.4";
|
||||
name = "libltc-1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz;
|
||||
sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x";
|
||||
url = https://github.com/x42/libltc/releases/download/v1.3.0/libltc-1.3.0.tar.gz;
|
||||
sha256 = "0p7fgp44i9d1lrgbk5zj3sm5yzavx428zn36xb3bl7y65c2xxcda";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmaxminddb-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = meta.homepage + "/releases/download/${version}/${name}.tar.gz";
|
||||
sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z";
|
||||
sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "17.10";
|
||||
version = "17.12";
|
||||
name = "libmediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
sha256 = "00m1b4m37c9lm16yhh63p5pidg2sr3qvsw36672lklmcv3y1ic30";
|
||||
sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libofx-0.9.10";
|
||||
name = "libofx-0.9.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libofx/${name}.tar.gz";
|
||||
sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl";
|
||||
sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpst-0.6.70";
|
||||
name = "libpst-0.6.71";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
|
||||
sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r";
|
||||
sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, zlib, openssl}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
name = "libre-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
|
||||
sha256 = "0sfz5c7b05crahblanrrvwca092qaqzhjkbkva58jbqnmlk9h4d3";
|
||||
sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x";
|
||||
};
|
||||
buildInputs = [ zlib openssl ];
|
||||
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "librelp-1.2.12";
|
||||
name = "librelp-1.2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
|
||||
sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83";
|
||||
sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -7,12 +7,12 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "librep-${version}";
|
||||
version = "0.92.6";
|
||||
version = "0.92.7";
|
||||
sourceName = "librep_${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz";
|
||||
sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy";
|
||||
sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsass-${version}";
|
||||
version = "3.4.8";
|
||||
version = "3.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
|
||||
sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13";
|
||||
sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "0.6.23";
|
||||
rev = "0.6.32";
|
||||
name = "libsolv-${rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg";
|
||||
sha256 = "0gqvnnc1s5n0yj82ia6w2wjhhn8hpl6wm4lki2kzvjqjgla45fnq";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "1.8.1"; in
|
||||
let version = "1.8.5"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libspatialindex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
|
||||
sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j";
|
||||
sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtermkey-${version}";
|
||||
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz";
|
||||
sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56";
|
||||
sha256 = "1i5a2zangq61ba1vdkag34ig5g4gzccldccdbcmqmk93saa6lkbx";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtomcrypt-${version}";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz";
|
||||
sha256 = "0ymqi0zf5gzn8pq4mnylwgg6pskml2v1p9rsjrqspyja65mgb7fs";
|
||||
sha256 = "053z0jzyvf6c9929phlh2p0ybx289s34g7nii5hnjigxzcs3mhap";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libwps-${version}";
|
||||
version = "0.4.3";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libwps/${name}.tar.bz2";
|
||||
sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c";
|
||||
sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxcomp-${version}";
|
||||
version = "3.5.0.32";
|
||||
version = "3.5.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
|
||||
sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74";
|
||||
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "libzmf";
|
||||
version = "0.0.1";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
|
||||
sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga";
|
||||
sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
|
||||
};
|
||||
|
||||
buildInputs = [boost icu libpng librevenge zlib cppunit];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
|
||||
let
|
||||
version = "2016.02.09";
|
||||
version = "2018.02.12";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "live555-${version}";
|
||||
|
||||
src = fetchurl { # the upstream doesn't provide a stable URL
|
||||
url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz";
|
||||
sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak";
|
||||
sha256 = "08860q07hfiln44d6qaasmfalf4hb9na5jsfd4yps6jn4r54xxwx";
|
||||
};
|
||||
|
||||
postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "log4cpp-1.1.1";
|
||||
name = "log4cpp-1.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
|
||||
sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm";
|
||||
sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "herwig-${version}";
|
||||
version = "7.1.1";
|
||||
version = "7.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
|
||||
sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j";
|
||||
sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,31 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib }:
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }:
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
then {
|
||||
version = "0.5.1";
|
||||
sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc";
|
||||
} else {
|
||||
version = "0.4.0";
|
||||
sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2";
|
||||
};
|
||||
in
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "angstrom is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (param) version;
|
||||
name = "ocaml-angstrom-${version}";
|
||||
version = "0.8.1";
|
||||
name = "ocaml${ocaml.version}-angstrom-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = "angstrom";
|
||||
rev = "${version}";
|
||||
inherit (param) sha256;
|
||||
sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc";
|
||||
};
|
||||
|
||||
createFindlibDestdir = true;
|
||||
buildInputs = [ ocaml findlib jbuilder alcotest ];
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
propagatedBuildInputs = [ result cstruct ];
|
||||
buildPhase = "jbuilder build -p angstrom";
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "jbuilder runtest -p angstrom";
|
||||
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/inhabitedtype/angstrom;
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, twisted, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole-transit-relay";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "faac36266c72745102a1a8b93abc5b25feed1be5bca7b29968a156966c312567";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted ];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
|
||||
checkPhase = ''
|
||||
python -m twisted.trial wormhole_transit_relay
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Transit Relay server for Magic-Wormhole";
|
||||
homepage = https://github.com/warner/magic-wormhole-transit-relay;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -2,37 +2,38 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, python
|
||||
, spake2
|
||||
, pynacl
|
||||
, six
|
||||
, attrs
|
||||
, twisted
|
||||
, autobahn
|
||||
, automat
|
||||
, hkdf
|
||||
, tqdm
|
||||
, click
|
||||
, humanize
|
||||
, ipaddress
|
||||
, txtorcon
|
||||
, nettools
|
||||
, glibcLocales
|
||||
, autobahn
|
||||
, cffi
|
||||
, click
|
||||
, hkdf
|
||||
, pynacl
|
||||
, spake2
|
||||
, tqdm
|
||||
, python
|
||||
, mock
|
||||
, ipaddress
|
||||
, humanize
|
||||
, pyopenssl
|
||||
, service-identity
|
||||
, txtorcon
|
||||
, magic-wormhole-transit-relay
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole";
|
||||
version = "0.10.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee";
|
||||
};
|
||||
|
||||
checkInputs = [ mock ];
|
||||
checkInputs = [ mock magic-wormhole-transit-relay ];
|
||||
buildInputs = [ nettools glibcLocales ];
|
||||
propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ];
|
||||
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
|
||||
|
||||
25
pkgs/development/python-modules/spake2/default.nix
Normal file
25
pkgs/development/python-modules/spake2/default.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spake2";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [ hkdf ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "SPAKE2 password-authenticated key exchange library";
|
||||
homepage = "http://github.com/warner/python-spake2";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -3,8 +3,9 @@
|
||||
, which, swig, binutils, glibcLocales
|
||||
, python, jemalloc, openmpi
|
||||
, numpy, six, protobuf, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py
|
||||
, xlaSupport ? true
|
||||
, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null
|
||||
# XLA without CUDA is broken
|
||||
, xlaSupport ? cudaSupport
|
||||
# Default from ./configure script
|
||||
, cudaCapabilities ? [ "3.5" "5.2" ]
|
||||
, sse42Support ? false
|
||||
@@ -145,9 +146,10 @@ in buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Computation using data flow graphs for scalable machine learning";
|
||||
homepage = "http://tensorflow.org";
|
||||
homepage = http://tensorflow.org;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jyp abbradar ];
|
||||
platforms = with platforms; if cudaSupport then linux else linux ++ darwin;
|
||||
broken = !(xlaSupport -> cudaSupport);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,11 +14,11 @@ let
|
||||
package = pythonPackages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "buildbot";
|
||||
version = "0.9.15.post1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni";
|
||||
sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "buildbot-pkg";
|
||||
version = "0.9.15.post1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh";
|
||||
sha256 = "1rs2x0b2v92xfsfk0f2nr9x8lz5baawf768s58brj4jiab6mq312";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x";
|
||||
sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg";
|
||||
sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4";
|
||||
sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj";
|
||||
sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1";
|
||||
sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
pythonPackages.buildPythonApplication (rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "buildbot-worker";
|
||||
version = "0.9.15.post1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65";
|
||||
sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
|
||||
|
||||
@@ -12,11 +12,11 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "liquibase";
|
||||
version = "3.5.3";
|
||||
version = "3.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
|
||||
sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv";
|
||||
sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs";
|
||||
};
|
||||
|
||||
buildInputs = [ jre makeWrapper ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "delve-${version}";
|
||||
version = "0.12.2";
|
||||
version = "1.0.0";
|
||||
|
||||
goPackagePath = "github.com/derekparker/delve";
|
||||
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
|
||||
@@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "derekparker";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30";
|
||||
sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, elfutils }:
|
||||
{ stdenv, fetchurl, elfutils, libunwind }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ltrace-0.7.3";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf";
|
||||
};
|
||||
|
||||
buildInputs = [ elfutils ];
|
||||
buildInputs = [ elfutils libunwind ];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
||||
makeFlagsArray=(INSTALL="install -c")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library call tracer";
|
||||
homepage = http://www.ltrace.org/;
|
||||
homepage = https://www.ltrace.org/;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lttng-tools-${version}";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
|
||||
sha256 = "005axllajfbxh73vh1cacbapdvbxjsi3pkzq40giih4ps9x4pg10";
|
||||
sha256 = "17wsdhkw8c8gb0d1bcgw4dfx2ljrq4rzgpi8sb9y9hs6pbwqy0xk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lttng-ust-${version}";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
|
||||
sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs";
|
||||
sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
@@ -80,7 +80,7 @@ in
|
||||
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
||||
homepage = https://nodejs.org;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ goibhniu havvy gilligan cko ];
|
||||
maintainers = with maintainers; [ goibhniu gilligan cko ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "9.5.0";
|
||||
sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6";
|
||||
version = "9.6.1";
|
||||
sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q";
|
||||
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user