Merge branch 'master' into update/grv-0.2.0
This commit is contained in:
Jörg Thalheim
@@ -44,25 +44,30 @@ let
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_6;
|
||||
|
||||
elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
lfe = lfe_1_2;
|
||||
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
|
||||
|
||||
@@ -443,7 +443,7 @@ stdenv.mkDerivation ({
|
||||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ viric peti ];
|
||||
maintainers = with stdenv.lib.maintainers; [ peti ];
|
||||
|
||||
platforms =
|
||||
stdenv.lib.platforms.linux ++
|
||||
|
||||
@@ -462,7 +462,7 @@ stdenv.mkDerivation ({
|
||||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ viric peti ];
|
||||
maintainers = with stdenv.lib.maintainers; [ peti ];
|
||||
|
||||
platforms =
|
||||
stdenv.lib.platforms.linux ++
|
||||
|
||||
@@ -461,7 +461,7 @@ stdenv.mkDerivation ({
|
||||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ viric peti ];
|
||||
maintainers = with stdenv.lib.maintainers; [ peti ];
|
||||
|
||||
platforms =
|
||||
stdenv.lib.platforms.linux ++
|
||||
|
||||
@@ -469,7 +469,7 @@ stdenv.mkDerivation ({
|
||||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ viric peti ];
|
||||
maintainers = with stdenv.lib.maintainers; [ peti ];
|
||||
|
||||
platforms =
|
||||
stdenv.lib.platforms.linux ++
|
||||
|
||||
@@ -38,7 +38,7 @@ assert langGo -> langCC;
|
||||
with stdenv.lib;
|
||||
with builtins;
|
||||
|
||||
let version = "8.1.0";
|
||||
let version = "8.2.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -127,7 +127,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
||||
sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
|
||||
sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
{ stdenv, fetchurl, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, paxctl
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
, llvm
|
||||
# standard library dependencies
|
||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
# linear algebra
|
||||
, openblas, arpack, suitesparse
|
||||
# Darwin frameworks
|
||||
, CoreServices, ApplicationServices
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
# All dependencies must use the same OpenBLAS.
|
||||
let
|
||||
arpack_ = arpack;
|
||||
suitesparse_ = suitesparse;
|
||||
in
|
||||
let
|
||||
arpack = arpack_.override { inherit openblas; };
|
||||
suitesparse = suitesparse_.override { inherit openblas; };
|
||||
in
|
||||
|
||||
let
|
||||
dsfmtVersion = "2.2.3";
|
||||
dsfmt = fetchurl {
|
||||
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
|
||||
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
|
||||
};
|
||||
|
||||
libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
|
||||
libuv = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
|
||||
sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
|
||||
};
|
||||
|
||||
rmathVersion = "0.1";
|
||||
rmath-julia = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
||||
};
|
||||
|
||||
virtualenvVersion = "15.0.0";
|
||||
virtualenv = fetchurl {
|
||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
||||
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "0.5.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h";
|
||||
};
|
||||
prePatch = ''
|
||||
mkdir deps/srccache
|
||||
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
|
||||
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
|
||||
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
|
||||
cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001.1-use-system-utf8proc.patch
|
||||
./0002-use-system-suitesparse.patch
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs . contrib
|
||||
for i in backtrace replutil cmdlineargs compile; do
|
||||
mv test/$i.jl{,.off}
|
||||
touch test/$i.jl
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
||||
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
|
||||
zlib llvm
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia requires Pentium 4 (SSE2) or better
|
||||
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
in [
|
||||
"ARCH=${arch}"
|
||||
"MARCH=${march}"
|
||||
"JULIA_CPU_TARGET=${cpuTarget}"
|
||||
"PREFIX=$(out)"
|
||||
"prefix=$(out)"
|
||||
"SHELL=${stdenv.shell}"
|
||||
|
||||
"USE_SYSTEM_BLAS=1"
|
||||
"USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
|
||||
"LIBBLAS=-lopenblas"
|
||||
"LIBBLASNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_LAPACK=1"
|
||||
"LIBLAPACK=-lopenblas"
|
||||
"LIBLAPACKNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_SUITESPARSE=1"
|
||||
"SUITESPARSE_LIB=-lsuitesparse"
|
||||
"SUITESPARSE_INC=-I${suitesparse}/include"
|
||||
|
||||
"USE_SYSTEM_ARPACK=1"
|
||||
"USE_SYSTEM_FFTW=1"
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"LLVM_VER=3.8.1"
|
||||
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_OPENLIBM=1"
|
||||
"USE_SYSTEM_OPENSPECFUN=1"
|
||||
"USE_SYSTEM_PATCHELF=1"
|
||||
"USE_SYSTEM_PCRE=1"
|
||||
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
|
||||
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
|
||||
"USE_SYSTEM_READLINE=1"
|
||||
"USE_SYSTEM_UTF8PROC=1"
|
||||
"USE_SYSTEM_ZLIB=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
|
||||
|
||||
LD_LIBRARY_PATH = makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
|
||||
openspecfun pcre2 suitesparse llvm
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
|
||||
wrapProgram "$prog" \
|
||||
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "High-level performance-oriented dynamical language for technical computing";
|
||||
homepage = https://julialang.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
broken = stdenv.isi686;
|
||||
};
|
||||
}
|
||||
@@ -1,203 +0,0 @@
|
||||
{ stdenv, fetchurl, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, paxctl
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
, llvm
|
||||
# standard library dependencies
|
||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
# linear algebra
|
||||
, openblas, arpack, suitesparse
|
||||
# Darwin frameworks
|
||||
, CoreServices, ApplicationServices
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
# All dependencies must use the same OpenBLAS.
|
||||
let
|
||||
arpack_ = arpack;
|
||||
suitesparse_ = suitesparse;
|
||||
in
|
||||
let
|
||||
arpack = arpack_.override { inherit openblas; };
|
||||
suitesparse = suitesparse_.override { inherit openblas; };
|
||||
in
|
||||
|
||||
let
|
||||
dsfmtVersion = "2.2.3";
|
||||
dsfmt = fetchurl {
|
||||
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
|
||||
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
|
||||
};
|
||||
|
||||
libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d";
|
||||
libuv = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
|
||||
sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba";
|
||||
};
|
||||
|
||||
rmathVersion = "0.1";
|
||||
rmath-julia = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
||||
};
|
||||
|
||||
virtualenvVersion = "15.0.0";
|
||||
virtualenv = fetchurl {
|
||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
||||
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
|
||||
};
|
||||
|
||||
majorVersion = "0";
|
||||
minorVersion = "6";
|
||||
maintenanceVersion = "4";
|
||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
inherit version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
|
||||
};
|
||||
prePatch = ''
|
||||
mkdir deps/srccache
|
||||
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
|
||||
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
|
||||
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
|
||||
cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001.1-use-system-utf8proc.patch
|
||||
./0002-use-system-suitesparse.patch
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs . contrib
|
||||
for i in backtrace replutil cmdlineargs compile; do
|
||||
mv test/$i.jl{,.off}
|
||||
touch test/$i.jl
|
||||
done
|
||||
|
||||
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
|
||||
sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
||||
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
|
||||
zlib llvm
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia requires Pentium 4 (SSE2) or better
|
||||
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
in [
|
||||
"ARCH=${arch}"
|
||||
"MARCH=${march}"
|
||||
"JULIA_CPU_TARGET=${cpuTarget}"
|
||||
"PREFIX=$(out)"
|
||||
"prefix=$(out)"
|
||||
"SHELL=${stdenv.shell}"
|
||||
|
||||
"USE_SYSTEM_BLAS=1"
|
||||
"USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
|
||||
"LIBBLAS=-lopenblas"
|
||||
"LIBBLASNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_LAPACK=1"
|
||||
"LIBLAPACK=-lopenblas"
|
||||
"LIBLAPACKNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_SUITESPARSE=1"
|
||||
"SUITESPARSE_LIB=-lsuitesparse"
|
||||
"SUITESPARSE_INC=-I${suitesparse}/include"
|
||||
|
||||
"USE_SYSTEM_ARPACK=1"
|
||||
"USE_SYSTEM_FFTW=1"
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"LLVM_VER=3.9.1"
|
||||
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_OPENLIBM=1"
|
||||
"USE_SYSTEM_OPENSPECFUN=1"
|
||||
"USE_SYSTEM_PATCHELF=1"
|
||||
"USE_SYSTEM_PCRE=1"
|
||||
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
|
||||
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
|
||||
"USE_SYSTEM_READLINE=1"
|
||||
"USE_SYSTEM_UTF8PROC=1"
|
||||
"USE_SYSTEM_ZLIB=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
|
||||
|
||||
LD_LIBRARY_PATH = makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
|
||||
openspecfun pcre2 suitesparse llvm
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
|
||||
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
|
||||
# faults when program returns an error:
|
||||
# $ julia -e 'throw(Error())'
|
||||
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
|
||||
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
|
||||
ln -sv $lib $out/lib/julia/$(basename $lib)
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit majorVersion minorVersion maintenanceVersion;
|
||||
site = "share/julia/site/v${majorVersion}.${minorVersion}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "High-level performance-oriented dynamical language for technical computing";
|
||||
homepage = https://julialang.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
broken = stdenv.isi686;
|
||||
};
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 10 Oct 2015 13:09:48 -0500
|
||||
Subject: [PATCH 1/3] use system utf8proc
|
||||
|
||||
---
|
||||
src/flisp/Makefile | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
|
||||
index bec8624..5437b5c 100644
|
||||
--- a/src/flisp/Makefile
|
||||
+++ b/src/flisp/Makefile
|
||||
@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
|
||||
LLTDIR = ../support
|
||||
LLT_release = $(BUILDDIR)/$(LLTDIR)/libsupport.a
|
||||
LLT_debug = $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a
|
||||
-LIBFILES_release = $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
|
||||
-LIBFILES_debug = $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
|
||||
-LIBS =
|
||||
+LIBFILES_release = $(LLT_release) $(LIBUV)
|
||||
+LIBFILES_debug = $(LLT_debug) $(LIBUV)
|
||||
+LIBS = $(LIBUTF8PROC)
|
||||
ifneq ($(OS),WINNT)
|
||||
LIBS += -lpthread
|
||||
endif
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 8802fe583eda93a928739cb3bc3517e19d1a6fa1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sun, 11 Oct 2015 07:19:42 -0500
|
||||
Subject: [PATCH 3/3] no ldconfig
|
||||
|
||||
---
|
||||
src/ccall.cpp | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/ccall.cpp b/src/ccall.cpp
|
||||
index 22015ff..2821192 100644
|
||||
--- a/src/ccall.cpp
|
||||
+++ b/src/ccall.cpp
|
||||
@@ -13,11 +13,7 @@ extern "C" DLLEXPORT void jl_read_sonames(void)
|
||||
{
|
||||
char *line=NULL;
|
||||
size_t sz=0;
|
||||
-#if defined(__linux__)
|
||||
- FILE *ldc = popen("/sbin/ldconfig -p", "r");
|
||||
-#else
|
||||
- FILE *ldc = popen("/sbin/ldconfig -r", "r");
|
||||
-#endif
|
||||
+ FILE *ldc = popen("true", "r");
|
||||
if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr)
|
||||
|
||||
while (!feof(ldc)) {
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001
|
||||
From: Will Dietz <w@wdtz.org>
|
||||
Date: Wed, 1 Feb 2017 06:09:49 -0600
|
||||
Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
|
||||
|
||||
---
|
||||
Makefile | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8d45a1baa..91ea33b21 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps
|
||||
|
||||
julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
|
||||
@$(MAKE) $(QUIET_MAKE) -C ui julia-$*
|
||||
+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
|
||||
+ @paxctl -czexm $(JULIA_EXECUTABLE_$*)
|
||||
|
||||
julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
|
||||
@$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{ stdenv, fetchurl
|
||||
{ stdenv, fetchurl, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
|
||||
# libjulia dependencies
|
||||
, libunwind, llvm, readline, utf8proc, zlib
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
, llvm
|
||||
# standard library dependencies
|
||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
# linear algebra
|
||||
@@ -21,9 +22,6 @@ in
|
||||
let
|
||||
arpack = arpack_.override { inherit openblas; };
|
||||
suitesparse = suitesparse_.override { inherit openblas; };
|
||||
llvmShared = if stdenv.isDarwin
|
||||
then llvm.override { enableSharedLibraries = true; }
|
||||
else llvm;
|
||||
in
|
||||
|
||||
let
|
||||
@@ -33,10 +31,10 @@ let
|
||||
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
|
||||
};
|
||||
|
||||
libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e";
|
||||
libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d";
|
||||
libuv = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
|
||||
sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7";
|
||||
sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba";
|
||||
};
|
||||
|
||||
rmathVersion = "0.1";
|
||||
@@ -44,40 +42,59 @@ let
|
||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
||||
};
|
||||
|
||||
virtualenvVersion = "15.0.0";
|
||||
virtualenv = fetchurl {
|
||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
||||
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
|
||||
};
|
||||
|
||||
majorVersion = "0";
|
||||
minorVersion = "6";
|
||||
maintenanceVersion = "4";
|
||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "0.4.7";
|
||||
inherit version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf";
|
||||
sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
cp "${dsfmt}" "./deps/dsfmt-${dsfmtVersion}.tar.gz"
|
||||
cp "${rmath-julia}" "./deps/Rmath-julia-${rmathVersion}.tar.gz"
|
||||
cp "${libuv}" "./deps/libuv-${libuvVersion}.tar.gz"
|
||||
mkdir deps/srccache
|
||||
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
|
||||
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
|
||||
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
|
||||
cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001-use-system-utf8proc.patch
|
||||
./0001.1-use-system-utf8proc.patch
|
||||
./0002-use-system-suitesparse.patch
|
||||
./0003-no-ldconfig.patch
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch;
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs . contrib
|
||||
for i in backtrace replutil cmdlineargs compile; do
|
||||
mv test/$i.jl{,.off}
|
||||
touch test/$i.jl
|
||||
done
|
||||
|
||||
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
|
||||
sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
||||
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
|
||||
zlib
|
||||
] ++
|
||||
stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
|
||||
zlib llvm
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||
@@ -85,7 +102,7 @@ stdenv.mkDerivation rec {
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
|
||||
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia requires Pentium 4 (SSE2) or better
|
||||
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
@@ -116,7 +133,10 @@ stdenv.mkDerivation rec {
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"LLVM_VER=3.9.1"
|
||||
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_OPENLIBM=1"
|
||||
"USE_SYSTEM_OPENSPECFUN=1"
|
||||
@@ -133,38 +153,50 @@ stdenv.mkDerivation rec {
|
||||
|
||||
LD_LIBRARY_PATH = makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
|
||||
openspecfun pcre2 suitesparse
|
||||
openspecfun pcre2 suitesparse llvm
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
||||
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
|
||||
wrapProgram "$prog" \
|
||||
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
|
||||
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
|
||||
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
|
||||
# faults when program returns an error:
|
||||
# $ julia -e 'throw(Error())'
|
||||
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
|
||||
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
|
||||
ln -sv $lib $out/lib/julia/$(basename $lib)
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit majorVersion minorVersion maintenanceVersion;
|
||||
site = "share/julia/site/v${majorVersion}.${minorVersion}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "High-level performance-oriented dynamical language for technical computing";
|
||||
homepage = https://julialang.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
#broken = stdenv.isi686;
|
||||
broken = true; # 2018-04-10
|
||||
broken = stdenv.isi686;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
{ stdenv, fetchgit, fetchurl
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
, llvm
|
||||
# standard library dependencies
|
||||
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
|
||||
# linear algebra
|
||||
, openblas, arpack, suitesparse
|
||||
# Darwin frameworks
|
||||
, CoreServices, ApplicationServices
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
# All dependencies must use the same OpenBLAS.
|
||||
let
|
||||
arpack_ = arpack;
|
||||
suitesparse_ = suitesparse;
|
||||
in
|
||||
let
|
||||
arpack = arpack_.override { inherit openblas; };
|
||||
suitesparse = suitesparse_.override { inherit openblas; };
|
||||
in
|
||||
|
||||
let
|
||||
dsfmtVersion = "2.2.3";
|
||||
dsfmt = fetchurl {
|
||||
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
|
||||
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
|
||||
};
|
||||
|
||||
libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
|
||||
libuv = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
|
||||
sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
|
||||
};
|
||||
|
||||
rmathVersion = "0.1";
|
||||
rmath-julia = fetchurl {
|
||||
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
|
||||
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
|
||||
};
|
||||
|
||||
virtualenvVersion = "15.0.0";
|
||||
virtualenv = fetchurl {
|
||||
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
|
||||
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "0.6.0-dev-2016-11-25";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/JuliaLang/${pname}";
|
||||
rev = "03c24644815ba5320d038bb60c08565375fea1d9";
|
||||
sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
mkdir deps/srccache
|
||||
cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
|
||||
cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
|
||||
cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
|
||||
cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001.1-use-system-utf8proc.patch
|
||||
./0002-use-system-suitesparse.patch
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs . contrib
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
|
||||
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
|
||||
zlib llvm
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
|
||||
++ stdenv.lib.optional stdenv.needsPax paxctl;
|
||||
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia requires Pentium 4 (SSE2) or better
|
||||
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
in [
|
||||
"ARCH=${arch}"
|
||||
"MARCH=${march}"
|
||||
"JULIA_CPU_TARGET=${cpuTarget}"
|
||||
"PREFIX=$(out)"
|
||||
"prefix=$(out)"
|
||||
"SHELL=${stdenv.shell}"
|
||||
|
||||
"USE_SYSTEM_BLAS=1"
|
||||
"USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
|
||||
"LIBBLAS=-lopenblas"
|
||||
"LIBBLASNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_LAPACK=1"
|
||||
"LIBLAPACK=-lopenblas"
|
||||
"LIBLAPACKNAME=libopenblas"
|
||||
|
||||
"USE_SYSTEM_SUITESPARSE=1"
|
||||
"SUITESPARSE_LIB=-lsuitesparse"
|
||||
"SUITESPARSE_INC=-I${suitesparse}/include"
|
||||
|
||||
"USE_SYSTEM_ARPACK=1"
|
||||
"USE_SYSTEM_FFTW=1"
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_LIBGIT2=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
# 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_OPENLIBM=1"
|
||||
"USE_SYSTEM_OPENSPECFUN=1"
|
||||
"USE_SYSTEM_PATCHELF=1"
|
||||
"USE_SYSTEM_PCRE=1"
|
||||
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
|
||||
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
|
||||
"USE_SYSTEM_READLINE=1"
|
||||
"USE_SYSTEM_UTF8PROC=1"
|
||||
"USE_SYSTEM_ZLIB=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
|
||||
|
||||
LD_LIBRARY_PATH = makeLibraryPath [
|
||||
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
|
||||
openspecfun pcre2 suitesparse llvm
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
|
||||
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
|
||||
wrapProgram "$prog" \
|
||||
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "High-level performance-oriented dynamical language for technical computing";
|
||||
homepage = https://julialang.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
broken = true; # since 2017-04-08.
|
||||
};
|
||||
}
|
||||
@@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
|
||||
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
}:
|
||||
@@ -16,25 +16,28 @@ let
|
||||
compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53";
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
|
||||
|
||||
# Add man output without introducing extra dependencies.
|
||||
overrideManOutput = drv:
|
||||
let drv-manpages = drv.override { enableManpages = true; }; in
|
||||
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
|
||||
tools = stdenv.lib.makeExtensible (tools: let
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
in {
|
||||
|
||||
llvm = overrideManOutput (callPackage ./llvm.nix {
|
||||
llvm = callPackage ./llvm.nix {
|
||||
inherit compiler-rt_src;
|
||||
});
|
||||
clang-unwrapped = overrideManOutput (callPackage ./clang {
|
||||
};
|
||||
clang-unwrapped = callPackage ./clang {
|
||||
inherit clang-tools-extra_src;
|
||||
};
|
||||
|
||||
llvm-manpages = lowPrio (tools.llvm.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
clang-manpages = lowPrio (tools.clang-unwrapped.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
libclang = tools.clang-unwrapped.lib;
|
||||
llvm-manpages = lowPrio tools.llvm.man;
|
||||
clang-manpages = lowPrio tools.clang-unwrapped.man;
|
||||
|
||||
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
|
||||
|
||||
@@ -54,7 +57,7 @@ let
|
||||
});
|
||||
|
||||
libraries = stdenv.lib.makeExtensible (libraries: let
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
in {
|
||||
|
||||
stdenv = overrideCC stdenv buildLlvmTools.clang;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
, compiler-rt_src
|
||||
, debugVersion ? false
|
||||
, enableManpages ? false
|
||||
, enableSharedLibraries ? true
|
||||
, enableSharedLibraries ? !enableManpages
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -158,7 +158,7 @@ in stdenv.mkDerivation (rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
|
||||
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
}:
|
||||
@@ -15,13 +15,8 @@ let
|
||||
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
|
||||
|
||||
# Add man output without introducing extra dependencies.
|
||||
overrideManOutput = drv:
|
||||
let drv-manpages = drv.override { enableManpages = true; }; in
|
||||
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
|
||||
tools = stdenv.lib.makeExtensible (tools: let
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
mkExtraBuildCommands = cc: ''
|
||||
rsrc="$out/resource-root"
|
||||
mkdir "$rsrc"
|
||||
@@ -33,15 +28,23 @@ let
|
||||
'';
|
||||
in {
|
||||
|
||||
llvm = overrideManOutput (callPackage ./llvm.nix { });
|
||||
llvm = callPackage ./llvm.nix { };
|
||||
|
||||
clang-unwrapped = overrideManOutput (callPackage ./clang {
|
||||
clang-unwrapped = callPackage ./clang {
|
||||
inherit clang-tools-extra_src;
|
||||
};
|
||||
|
||||
llvm-manpages = lowPrio (tools.llvm.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
clang-manpages = lowPrio (tools.clang-unwrapped.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
libclang = tools.clang-unwrapped.lib;
|
||||
llvm-manpages = lowPrio tools.llvm.man;
|
||||
clang-manpages = lowPrio tools.clang-unwrapped.man;
|
||||
|
||||
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
|
||||
|
||||
@@ -70,7 +73,7 @@ let
|
||||
});
|
||||
|
||||
libraries = stdenv.lib.makeExtensible (libraries: let
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
in {
|
||||
|
||||
compiler-rt = callPackage ./compiler-rt.nix {};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
, libcxxabi
|
||||
, debugVersion ? false
|
||||
, enableManpages ? false
|
||||
, enableSharedLibraries ? true
|
||||
, enableSharedLibraries ? !enableManpages
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -141,7 +141,7 @@ in stdenv.mkDerivation (rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
|
||||
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
|
||||
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
}:
|
||||
@@ -15,13 +15,8 @@ let
|
||||
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
|
||||
|
||||
# Add man output without introducing extra dependencies.
|
||||
overrideManOutput = drv:
|
||||
let drv-manpages = drv.override { enableManpages = true; }; in
|
||||
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
|
||||
tools = stdenv.lib.makeExtensible (tools: let
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
mkExtraBuildCommands = cc: ''
|
||||
rsrc="$out/resource-root"
|
||||
mkdir "$rsrc"
|
||||
@@ -33,15 +28,23 @@ let
|
||||
'';
|
||||
in {
|
||||
|
||||
llvm = overrideManOutput (callPackage ./llvm.nix { });
|
||||
llvm = callPackage ./llvm.nix { };
|
||||
|
||||
clang-unwrapped = overrideManOutput (callPackage ./clang {
|
||||
clang-unwrapped = callPackage ./clang {
|
||||
inherit clang-tools-extra_src;
|
||||
};
|
||||
|
||||
llvm-manpages = lowPrio (tools.llvm.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
clang-manpages = lowPrio (tools.clang-unwrapped.override {
|
||||
enableManpages = true;
|
||||
python = pkgs.python; # don't use python-boot
|
||||
});
|
||||
|
||||
libclang = tools.clang-unwrapped.lib;
|
||||
llvm-manpages = lowPrio tools.llvm.man;
|
||||
clang-manpages = lowPrio tools.clang-unwrapped.man;
|
||||
|
||||
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
|
||||
|
||||
@@ -70,7 +73,7 @@ let
|
||||
});
|
||||
|
||||
libraries = stdenv.lib.makeExtensible (libraries: let
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
|
||||
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
|
||||
in {
|
||||
|
||||
compiler-rt = callPackage ./compiler-rt.nix {};
|
||||
|
||||
@@ -142,7 +142,7 @@ in stdenv.mkDerivation (rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
|
||||
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://mono-project.com/;
|
||||
description = "Cross platform, open source .NET development framework";
|
||||
platforms = with stdenv.lib.platforms; darwin ++ linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
|
||||
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
};
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://mono-project.com/;
|
||||
description = "Cross platform, open source .NET development framework";
|
||||
platforms = stdenv.lib.platforms.x86;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
|
||||
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
} // meta;
|
||||
}
|
||||
|
||||
@@ -4,23 +4,24 @@ with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "psc-package";
|
||||
version = "0.3.2";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "purescript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm";
|
||||
sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5";
|
||||
};
|
||||
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
|
||||
executableHaskellDepends = with haskellPackages; [
|
||||
aeson aeson-pretty optparse-applicative system-filepath turtle
|
||||
aeson aeson-pretty either errors optparse-applicative
|
||||
system-filepath turtle
|
||||
];
|
||||
|
||||
description = "An experimental package manager for PureScript";
|
||||
description = "A package manager for PureScript based on package sets";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ Profpatsch ];
|
||||
}
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
let param =
|
||||
{
|
||||
"8.6" = {
|
||||
version = "20171214";
|
||||
rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
|
||||
sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
|
||||
version = "20180709";
|
||||
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
|
||||
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20171214";
|
||||
rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
|
||||
sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
|
||||
version = "20180709";
|
||||
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
|
||||
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
|
||||
};
|
||||
|
||||
}."${coq.coq-version}"
|
||||
|
||||
@@ -152,6 +152,10 @@ go.stdenv.mkDerivation (
|
||||
fi
|
||||
}
|
||||
|
||||
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
|
||||
buildFlagsArray+=(-x)
|
||||
fi
|
||||
|
||||
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
|
||||
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
|
||||
else
|
||||
|
||||
@@ -249,14 +249,6 @@ self: super: {
|
||||
# doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
|
||||
# This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
|
||||
hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
|
||||
patches = old.patches or [] ++ [
|
||||
# should land in hnix-5.2
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
|
||||
sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
|
||||
name = "disable-hpack-test-by-default.patch";
|
||||
})
|
||||
];
|
||||
testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
|
||||
})));
|
||||
|
||||
|
||||
7
pkgs/development/interpreters/elixir/1.7.nix
Normal file
7
pkgs/development/interpreters/elixir/1.7.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.7.0";
|
||||
sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm";
|
||||
minimumOTPVersion = "18";
|
||||
}
|
||||
@@ -37,7 +37,7 @@ in
|
||||
|
||||
preBuild = ''
|
||||
# The build process uses ./rebar. Link it to the nixpkgs rebar
|
||||
rm -v rebar
|
||||
rm -vf rebar
|
||||
ln -s ${rebar}/bin/rebar rebar
|
||||
|
||||
substituteInPlace Makefile \
|
||||
|
||||
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://octave.org/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric raskin];
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
platforms = if overridePlatforms == null then
|
||||
(with stdenv.lib.platforms; linux ++ darwin)
|
||||
else overridePlatforms;
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
, ldapSupport ? config.php.ldap or true
|
||||
, mhashSupport ? config.php.mhash or true
|
||||
, mysqlSupport ? (config.php.mysql or true) && (!php7)
|
||||
, mysqlndSupport ? config.php.mysqlnd or false
|
||||
, mysqlndSupport ? config.php.mysqlnd or true
|
||||
, mysqliSupport ? config.php.mysqli or true
|
||||
, pdo_mysqlSupport ? config.php.pdo_mysql or true
|
||||
, libxml2Support ? config.php.libxml2 or true
|
||||
|
||||
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {};
|
||||
|
||||
meta = {
|
||||
homepage = http://python.org;
|
||||
description = "A high-level dynamically-typed programming language";
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight audio filtering library made from webrtc code";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ viric jgeerds ];
|
||||
maintainers = with maintainers; [ jgeerds ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://nongnu.org/libchop/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A modern and easy-to-use crypto library";
|
||||
homepage = http://doc.libsodium.org/;
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ raskin viric wkennington ];
|
||||
maintainers = with maintainers; [ raskin wkennington ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ viric jgeerds ];
|
||||
maintainers = with maintainers; [ jgeerds ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/OpenSC/openct/;
|
||||
license = licenses.lgpl21;
|
||||
description = "Drivers for several smart card readers";
|
||||
maintainers = with maintainers; [ viric wkennington ];
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,20 +35,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h";
|
||||
sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3";
|
||||
sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
@@ -59,16 +59,16 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_3rdparty";
|
||||
rev = "dfe3162c237af211e98b8960018b564bc209261d";
|
||||
sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif";
|
||||
rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a";
|
||||
sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8";
|
||||
} + "/ippicv";
|
||||
files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in
|
||||
files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
{ ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; }
|
||||
{ ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; }
|
||||
else if stdenv.system == "i686-linux" then
|
||||
{ ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; }
|
||||
{ ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; }
|
||||
else if stdenv.system == "x86_64-darwin" then
|
||||
{ ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; }
|
||||
{ ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; }
|
||||
else
|
||||
throw "ICV is not available for this platform (or not yet supported by this package)";
|
||||
dst = ".cache/ippicv";
|
||||
@@ -132,17 +132,6 @@ let
|
||||
ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
|
||||
'') extra.files);
|
||||
|
||||
# See opencv_contrib/modules/dnn_modern/CMakeLists.txt
|
||||
tinyDnn = rec {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}";
|
||||
sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2";
|
||||
};
|
||||
name = "v1.0.0a3.tar.gz";
|
||||
md5 = "adb1c512e09ca2c7a6faef36f9c53e59";
|
||||
dst = ".cache/tiny_dnn";
|
||||
};
|
||||
|
||||
opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
|
||||
|
||||
printEnabled = enabled : if enabled then "ON" else "OFF";
|
||||
@@ -156,6 +145,11 @@ stdenv.mkDerivation rec {
|
||||
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
|
||||
'';
|
||||
|
||||
# TODO: remove the following patch once commit
|
||||
# https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
|
||||
# is released.
|
||||
patches = [ ./fix-dnn.patch ];
|
||||
|
||||
# This prevents cmake from using libraries in impure paths (which
|
||||
# causes build failure on non NixOS)
|
||||
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
|
||||
@@ -174,9 +168,6 @@ stdenv.mkDerivation rec {
|
||||
${installExtraFiles vgg}
|
||||
${installExtraFiles boostdesc}
|
||||
${installExtraFiles face}
|
||||
|
||||
mkdir -p "${tinyDnn.dst}"
|
||||
ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}"
|
||||
'');
|
||||
|
||||
buildInputs =
|
||||
@@ -243,9 +234,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DWITH_OPENCL=OFF"
|
||||
"-DWITH_LAPACK=OFF"
|
||||
|
||||
# On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build.
|
||||
"-DBUILD_opencv_dnn_modern=OFF"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -273,11 +261,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = https://opencv.org/;
|
||||
license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
license = with licenses; if enableUnfree then unfree else bsd3;
|
||||
maintainers = with maintainers; [mdaiter basvandijk];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = https://opencv.org/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
13
pkgs/development/libraries/opencv/fix-dnn.patch
Normal file
13
pkgs/development/libraries/opencv/fix-dnn.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
|
||||
index 730c752ce..abbce0453 100644
|
||||
--- a/modules/dnn/src/caffe/caffe_io.cpp
|
||||
+++ b/modules/dnn/src/caffe/caffe_io.cpp
|
||||
@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
|
||||
std::ifstream fs(filename, std::ifstream::in);
|
||||
CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
|
||||
IstreamInputStream input(&fs);
|
||||
- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
|
||||
+ return google::protobuf::TextFormat::Parser().Parse(&input, proto);
|
||||
}
|
||||
|
||||
bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.6.0.1";
|
||||
version = "2.6.4.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/skalibs";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws";
|
||||
sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
|
||||
};
|
||||
|
||||
outputs = [ "lib" "dev" "doc" "out" ];
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.gnu.org/software/commoncpp/;
|
||||
license = stdenv.lib.licenses.lgpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Open source libraries for 3D computer graphics, image processing and visualization";
|
||||
homepage = http://www.vtk.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,22 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }:
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result
|
||||
, bigstringaf
|
||||
}:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "angstrom is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.1";
|
||||
version = "0.10.0";
|
||||
name = "ocaml${ocaml.version}-angstrom-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = "angstrom";
|
||||
rev = "${version}";
|
||||
sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc";
|
||||
sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib jbuilder alcotest ];
|
||||
propagatedBuildInputs = [ result ];
|
||||
propagatedBuildInputs = [ bigstringaf result ];
|
||||
|
||||
buildPhase = "jbuilder build -p angstrom";
|
||||
|
||||
|
||||
32
pkgs/development/ocaml-modules/bigstringaf/default.nix
Normal file
32
pkgs/development/ocaml-modules/bigstringaf/default.nix
Normal file
@@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "bigstringaf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.0";
|
||||
name = "ocaml${ocaml.version}-bigstringaf-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = "bigstringaf";
|
||||
rev = version;
|
||||
sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib jbuilder alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "dune runtest";
|
||||
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = {
|
||||
description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
{ stdenv, buildOcaml, fetchurl }:
|
||||
{ stdenv, buildOcaml, ocaml, fetchurl }:
|
||||
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "estring is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
buildOcaml rec {
|
||||
name = "estring";
|
||||
|
||||
33
pkgs/development/ocaml-modules/httpaf/default.nix
Normal file
33
pkgs/development/ocaml-modules/httpaf/default.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
|
||||
, angstrom, faraday, alcotest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.1";
|
||||
name = "ocaml${ocaml.version}-httpaf-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
repo = "httpaf";
|
||||
rev = version;
|
||||
sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib jbuilder alcotest ];
|
||||
propagatedBuildInputs = [ angstrom faraday ];
|
||||
|
||||
buildPhase = "dune build -p httpaf";
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "dune runtest -p httpaf";
|
||||
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = {
|
||||
description = "A high-performance, memory-efficient, and scalable web server for OCaml";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -33,8 +33,9 @@ rec {
|
||||
};
|
||||
|
||||
base = janePackage {
|
||||
version = "0.11.1";
|
||||
name = "base";
|
||||
hash = "0ad5xcyds2lwy9dk7gqwygxk5y769ckrgrjcykdalwdh8qfbi6nf";
|
||||
hash = "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir";
|
||||
propagatedBuildInputs = [ sexplib0 ];
|
||||
meta.description = "Full standard library replacement for OCaml";
|
||||
};
|
||||
|
||||
57
pkgs/development/ocaml-modules/labltk/default.nix
Normal file
57
pkgs/development/ocaml-modules/labltk/default.nix
Normal file
@@ -0,0 +1,57 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, tcl, tk }:
|
||||
|
||||
let param = {
|
||||
"4.04" = {
|
||||
version = "8.06.2";
|
||||
key = "1628";
|
||||
sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk";
|
||||
};
|
||||
"4.05" = {
|
||||
version = "8.06.3";
|
||||
key = "1701";
|
||||
sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn";
|
||||
};
|
||||
"4.06" = {
|
||||
version = "8.06.4";
|
||||
key = "1727";
|
||||
sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii";
|
||||
};
|
||||
"4.07" = {
|
||||
version = "8.06.5";
|
||||
key = "1764";
|
||||
sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
|
||||
};
|
||||
}."${builtins.substring 0 4 ocaml.version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (param) version;
|
||||
name = "ocaml${ocaml.version}-labltk-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz";
|
||||
inherit (param) sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib tcl tk ];
|
||||
|
||||
configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
|
||||
dontAddPrefix = true;
|
||||
|
||||
buildFlags = [ "all" "opt" ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser";
|
||||
homepage = "http://labltk.forge.ocamlcore.org/";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@@ -1,19 +1,32 @@
|
||||
{ stdenv, buildOcaml, fetchurl, batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }:
|
||||
{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt
|
||||
, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
|
||||
}:
|
||||
|
||||
buildOcaml rec {
|
||||
name = "sqlexpr";
|
||||
version = "0.5.5";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.0";
|
||||
name = "ocaml${ocaml.version}-sqlexpr-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/1203/ocaml-sqlexpr-${version}.tar.gz";
|
||||
sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr";
|
||||
url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz";
|
||||
sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ batteries csv ocaml_lwt ocaml_sqlite3 estring ];
|
||||
buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/mfp/ocaml-sqlexpr;
|
||||
propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
|
||||
|
||||
buildPhase = "dune build -p sqlexpr";
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "dune runtest -p sqlexpr";
|
||||
|
||||
inherit (jbuilder) installPhase;
|
||||
|
||||
meta = {
|
||||
description = "Type-safe, convenient SQLite database access";
|
||||
license = licenses.lgpl21;
|
||||
homepage = "https://github.com/mfp/ocaml-sqlexpr";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
15
pkgs/development/ocaml-modules/sqlexpr/ppx.nix
Normal file
15
pkgs/development/ocaml-modules/sqlexpr/ppx.nix
Normal file
@@ -0,0 +1,15 @@
|
||||
{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit
|
||||
, ppx_core, ppx_tools_versioned, re, lwt_ppx
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}";
|
||||
inherit (sqlexpr) version src installPhase meta;
|
||||
|
||||
buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
|
||||
|
||||
buildPhase = "dune build -p ppx_sqlexpr";
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "dune runtest -p ppx_sqlexpr";
|
||||
}
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-PyMongo";
|
||||
version = "0.5.2";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5";
|
||||
sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.1.9";
|
||||
version = "2.1.11";
|
||||
pname = "GitPython";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64";
|
||||
sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8";
|
||||
};
|
||||
|
||||
checkInputs = [ mock nose ddt ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ buildPythonPackage, fetchPypi, isPy3k }:
|
||||
{ buildPythonPackage, fetchPypi, isPy3k, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "JPype1";
|
||||
@@ -11,8 +11,10 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [ ./set-compiler-language.patch ];
|
||||
|
||||
# Test loader complains about non-test module on python3.
|
||||
doCheck = !isPy3k;
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
# ImportError: Failed to import test module: test.testlucene
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/originell/jpype/";
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "WSME";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976";
|
||||
sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adal";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393";
|
||||
sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests pyjwt dateutil ];
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
# wrapped to be able to find aioconsole and any other packages.
|
||||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.1.8";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50";
|
||||
sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a";
|
||||
};
|
||||
|
||||
# hardcodes a test dependency on an old version of pytest-asyncio
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alembic";
|
||||
version = "0.9.10";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7";
|
||||
sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest pytestcov mock coverage ];
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest }:
|
||||
, pytest, setuptools_scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apipkg";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
|
||||
sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
buildInputs = [ setuptools_scm ];
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
|
||||
21
pkgs/development/python-modules/appnope/default.nix
Normal file
21
pkgs/development/python-modules/appnope/default.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appnope";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Disable App Nap on macOS";
|
||||
homepage = https://pypi.python.org/pypi/appnope;
|
||||
platforms = lib.platforms.darwin;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/arpeggio/default.nix
Normal file
24
pkgs/development/python-modules/arpeggio/default.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Arpeggio";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732";
|
||||
};
|
||||
|
||||
# Shall not be needed for next release
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
buildInputs = [ glibcLocales ];
|
||||
|
||||
meta = {
|
||||
description = "Packrat parser interpreter";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astor";
|
||||
version = "0.6.2";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d";
|
||||
sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d";
|
||||
};
|
||||
|
||||
# disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
|
||||
|
||||
@@ -1,32 +1,25 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six
|
||||
, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
|
||||
, backports_functools_lru_cache
|
||||
{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy
|
||||
, lazy-object-proxy, six, wrapt, typing, typed-ast
|
||||
, pytestrunner, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astroid";
|
||||
version = "1.6.5";
|
||||
version = "2.0.1";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
|
||||
sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
|
||||
++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch]
|
||||
++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ];
|
||||
# From astroid/__pkginfo__.py
|
||||
propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
|
||||
++ lib.optional (pythonOlder "3.5") typing
|
||||
++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast;
|
||||
|
||||
postPatch = ''
|
||||
cd astroid/tests
|
||||
for i in $(ls unittest*); do mv -v $i test_$i; done
|
||||
cd ../..
|
||||
rm -vf astroid/tests/test_unittest_inference.py
|
||||
rm -vf astroid/tests/test_unittest_manager.py
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
checkInputs = [ pytestrunner pytest ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A abstract syntax tree for Python with inference support";
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncssh";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb";
|
||||
sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
28
pkgs/development/python-modules/audiotools/default.nix
Normal file
28
pkgs/development/python-modules/audiotools/default.nix
Normal file
@@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "audiotools";
|
||||
version = "3.1.1";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
AudioToolbox
|
||||
AudioUnit
|
||||
CoreServices
|
||||
]);
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz";
|
||||
sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Utilities and Python modules for handling audio";
|
||||
homepage = "http://audiotools.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/av/default.nix
Normal file
32
pkgs/development/python-modules/av/default.nix
Normal file
@@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, pillow
|
||||
, numpy
|
||||
, ffmpeg_2
|
||||
, git
|
||||
, libav
|
||||
, pkgconfig
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "av";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f";
|
||||
};
|
||||
|
||||
buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
|
||||
|
||||
# Because of https://github.com/mikeboers/PyAV/issues/152
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Pythonic bindings for FFmpeg/Libav";
|
||||
homepage = https://github.com/mikeboers/PyAV/;
|
||||
license = lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-sam-translator";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb";
|
||||
sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10";
|
||||
};
|
||||
|
||||
# Tests are not included in the PyPI package
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-xray-sdk";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d";
|
||||
sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
if !(pythonOlder "3.3") then null else buildPythonPackage rec {
|
||||
pname = "backports.lzma";
|
||||
version = "0.0.9";
|
||||
version = "0.0.13";
|
||||
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539";
|
||||
sha256 = "50829db66f0445442f6c796bba0ca62d1f87f54760c4682b6d1489e729a43744";
|
||||
};
|
||||
|
||||
buildInputs = [ lzma ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "backports.unittest_mock";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6";
|
||||
sha256 = "73df9093bc7a2cc8e7018d08d6983dc5bcb2a47d7e7e107b9e8d0711f1702ef8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mock ];
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "billiard";
|
||||
version = "3.5.0.3";
|
||||
version = "3.5.0.4";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6";
|
||||
sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest case ];
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "biopython";
|
||||
version = "1.71";
|
||||
version = "1.72";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033";
|
||||
sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@@ -9,20 +9,20 @@ let
|
||||
};
|
||||
setuptools_source = fetchPypi {
|
||||
pname = "setuptools";
|
||||
version = "39.2.0";
|
||||
version = "40.0.0";
|
||||
format = "wheel";
|
||||
sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926";
|
||||
sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pip";
|
||||
version = "10.0.1";
|
||||
version = "18.0";
|
||||
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7";
|
||||
sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.10.57";
|
||||
version = "1.10.65";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi";
|
||||
sha256 = "35f626029a6b17bfd503ce3379b121606e3f965edcab2612bc75ce8603fdf08c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zc.buildout";
|
||||
version = "2.11.5";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122";
|
||||
sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d";
|
||||
};
|
||||
|
||||
patches = [ ./nix.patch ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "0.7.8";
|
||||
version = "0.7.10";
|
||||
|
||||
propagatedBuildInputs = [six];
|
||||
|
||||
@@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2";
|
||||
sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "buttersink";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3";
|
||||
sha256 = "c9c05982c44fbb85f17b7ef0e8bee11f375c03d89bcba50cbc2520013512107a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boto crcmod psutil ];
|
||||
|
||||
@@ -1,21 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, wrapt
|
||||
, pyserial
|
||||
, nose
|
||||
, mock }:
|
||||
, mock
|
||||
, pytest
|
||||
, pytest-timeout }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-can";
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc";
|
||||
sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
checkInputs = [ nose mock ];
|
||||
propagatedBuildInputs = [ wrapt pyserial ];
|
||||
checkInputs = [ nose mock pytest pytest-timeout ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest -k "not test_writer_and_reader \
|
||||
and not test_reader \
|
||||
and not test_socketcan_on_ci_server"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/hardbyte/python-can;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cement";
|
||||
version = "2.10.2";
|
||||
version = "2.10.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55";
|
||||
sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70";
|
||||
};
|
||||
|
||||
# Disable test tests since they depend on a memcached server running on
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chainer";
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329";
|
||||
sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cheroot";
|
||||
version = "6.3.2";
|
||||
version = "6.3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f";
|
||||
sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ more-itertools six ];
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "CherryPy";
|
||||
version = "16.0.2";
|
||||
version = "17.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3";
|
||||
sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cheroot portend routes six ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-log";
|
||||
version = "0.2.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9";
|
||||
sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
version = "0.9.1";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49";
|
||||
sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417";
|
||||
};
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.11.4";
|
||||
version = "0.11.5";
|
||||
pname = "confluent-kafka";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1";
|
||||
sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f";
|
||||
};
|
||||
|
||||
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-consul";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4";
|
||||
sha256 = "168f1fa53948047effe4f14d53fc1dab50192e2a2cf7855703f126f469ea11f4";
|
||||
};
|
||||
|
||||
buildInputs = [ requests six pytest ];
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.2.2";
|
||||
version = "2.3";
|
||||
in assert version == cryptography_vectors.version; buildPythonPackage rec {
|
||||
# also bump cryptography_vectors
|
||||
pname = "cryptography";
|
||||
@@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63";
|
||||
sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
buildPythonPackage rec {
|
||||
# also bump cryptography
|
||||
pname = "cryptography_vectors";
|
||||
version = "2.2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688";
|
||||
sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15";
|
||||
};
|
||||
|
||||
# No tests included
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cupy";
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0";
|
||||
sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx_Oracle";
|
||||
version = "6.3.1";
|
||||
version = "6.4.1";
|
||||
|
||||
buildInputs = [ odpic ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
|
||||
sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "0.18.0";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0";
|
||||
sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbf";
|
||||
version = "0.97.7";
|
||||
version = "0.97.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0";
|
||||
sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deprecation";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96";
|
||||
sha256 = "cbe7d15006bc339709be5e02b14884ecc479639c1a3714a908de3a8ca13b5ca9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging ];
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dill";
|
||||
version = "0.2.8.1";
|
||||
version = "0.2.8.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822";
|
||||
sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3";
|
||||
};
|
||||
|
||||
# Messy test suite. Even when running the tests like tox does, it fails
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-sites";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
@@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05nrydk4a5a99qrxjrcnacs8nbbq5pfjikdpj4w9yn5yfayp057s";
|
||||
sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8";
|
||||
sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals withGdal [
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
, ipaddress, backports_ssl_match_hostname, docker_pycreds
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
pname = "docker";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7";
|
||||
sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user