Merge master into staging
This commit is contained in:
Frederik Rietdijk
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.2.60";
|
||||
version = "1.2.61";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0gb29a8ayj12g4g10dcasw3d3csphq5rv9jn9c6m02myr6azcygz";
|
||||
sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp
|
||||
--- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500
|
||||
+++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500
|
||||
@@ -6477,15 +6477,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if (ToolChain.getArch() == llvm::Triple::arm ||
|
||||
- ToolChain.getArch() == llvm::Triple::thumb ||
|
||||
- (!Args.hasArg(options::OPT_static) &&
|
||||
- !Args.hasArg(options::OPT_shared))) {
|
||||
- CmdArgs.push_back("-dynamic-linker");
|
||||
- CmdArgs.push_back(Args.MakeArgString(
|
||||
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
|
||||
- }
|
||||
-
|
||||
CmdArgs.push_back("-o");
|
||||
CmdArgs.push_back(Output.getFilename());
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt
|
||||
--- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500
|
||||
+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500
|
||||
@@ -1,3 +1,4 @@
|
||||
+include(CheckLibraryExists)
|
||||
check_library_exists(edit el_init "" HAVE_LIBEDIT)
|
||||
|
||||
add_subdirectory(clang-apply-replacements)
|
||||
@@ -1,56 +0,0 @@
|
||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "clang-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"}
|
||||
mv cfe-${version}.src clang
|
||||
sourceRoot=$PWD/clang
|
||||
unpackFile ${clang-tools-extra_src}
|
||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||
# !!! Hopefully won't be needed for 3.5
|
||||
unpackFile ${llvm.src}
|
||||
export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
||||
(cd llvm-* && patch -Np1 -i ${./llvm-separate-build.patch})
|
||||
'';
|
||||
|
||||
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
||||
|
||||
buildInputs = [ cmake libedit libxml2 zlib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
] ++
|
||||
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++
|
||||
(stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}");
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
# Clang expects to find sanitizer libraries in its own prefix
|
||||
postInstall = ''
|
||||
if [ -e ${llvm}/lib/LLVMgold.so ]; then
|
||||
ln -sv ${llvm}/lib/LLVMgold.so $out/lib
|
||||
fi
|
||||
|
||||
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
isClang = true;
|
||||
cc = stdenv.cc.cc;
|
||||
# GCC_INSTALL_PREFIX points here, so just use it even though it may not
|
||||
# actually be a gcc
|
||||
gcc = stdenv.cc.cc;
|
||||
hardeningUnsupportedFlags = [ "stackprotector" ];
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
{ newScope, stdenv, isl, fetchurl }:
|
||||
let
|
||||
callPackage = newScope (self // { inherit stdenv isl version fetch; });
|
||||
|
||||
version = "3.4";
|
||||
|
||||
fetch = fetch_v version;
|
||||
fetch_v = ver: name: sha256: fetchurl {
|
||||
url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
compiler-rt_src = fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k";
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds";
|
||||
|
||||
self = {
|
||||
llvm = callPackage ./llvm.nix rec {
|
||||
version = "3.4.2";
|
||||
fetch = fetch_v version;
|
||||
inherit compiler-rt_src;
|
||||
};
|
||||
|
||||
clang = callPackage ./clang.nix rec {
|
||||
version = "3.4.2";
|
||||
fetch = fetch_v version;
|
||||
inherit clang-tools-extra_src;
|
||||
};
|
||||
|
||||
lld = callPackage ./lld.nix {};
|
||||
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
|
||||
polly = callPackage ./polly.nix {};
|
||||
|
||||
dragonegg = callPackage ./dragonegg.nix {};
|
||||
};
|
||||
in self
|
||||
@@ -1,35 +0,0 @@
|
||||
{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dragonegg-${version}";
|
||||
|
||||
src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
|
||||
|
||||
patches = [(fetchpatch {
|
||||
url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
|
||||
+ "?r1=208730&r2=208729&view=patch";
|
||||
sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
|
||||
name = "bug-18548.patch";
|
||||
})];
|
||||
patchFlags = "-p2";
|
||||
|
||||
# The gcc the plugin will be built for (the same used building dragonegg)
|
||||
GCC = "gcc";
|
||||
|
||||
buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib $out/share/doc/${name}
|
||||
cp -d dragonegg.so $out/lib
|
||||
cp README COPYING $out/share/doc/${name}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://dragonegg.llvm.org/;
|
||||
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lld-${version}";
|
||||
|
||||
src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz";
|
||||
|
||||
preUnpack = ''
|
||||
# !!! Hopefully won't be needed for 3.5
|
||||
unpackFile ${llvm.src}
|
||||
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake ncurses zlib python2 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A set of modular code for creating linker tools";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, cmake
|
||||
, zlib
|
||||
, ncurses
|
||||
, swig
|
||||
, which
|
||||
, libedit
|
||||
, llvm
|
||||
, clang
|
||||
, python2
|
||||
, version
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lldb-${version}";
|
||||
|
||||
src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g";
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|/usr/bin/env||' \
|
||||
scripts/Python/finish-swig-Python-LLDB.sh \
|
||||
scripts/Python/build-swig-Python.sh
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
|
||||
"-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A next-generation high-performance debugger";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake
|
||||
--- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400
|
||||
+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500
|
||||
@@ -78,8 +78,6 @@
|
||||
endif()
|
||||
|
||||
macro(add_tablegen target project)
|
||||
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
|
||||
-
|
||||
set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
|
||||
set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
|
||||
add_llvm_utility(${target} ${ARGN})
|
||||
@@ -1,94 +0,0 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, perl
|
||||
, groff
|
||||
, cmake
|
||||
, python2
|
||||
, libffi
|
||||
, libbfd
|
||||
, libxml2
|
||||
, ncurses
|
||||
, version
|
||||
, zlib
|
||||
, compiler-rt_src
|
||||
, debugVersion ? false
|
||||
}:
|
||||
|
||||
let
|
||||
src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "llvm-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile ${src}
|
||||
mv llvm-${version}.src llvm
|
||||
sourceRoot=$PWD/llvm
|
||||
unpackFile ${compiler-rt_src}
|
||||
mv compiler-rt-* $sourceRoot/projects/compiler-rt
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ perl groff cmake libxml2 libffi python2 ] /*
|
||||
++ stdenv.lib.optional stdenv.isLinux valgrind */;
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
|
||||
# llvm-config --libfiles returns (non-existing) static libs
|
||||
../fix-llvm-config.patch
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 -F3 < ${
|
||||
fetchpatch {
|
||||
name = "sigaltstack.patch"; # for glibc-2.26
|
||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
||||
}
|
||||
}
|
||||
|
||||
sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
|
||||
lib/asan/asan_linux.cc
|
||||
)
|
||||
'';
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
mkdir -p $out/
|
||||
ln -sv $PWD/lib $out
|
||||
'';
|
||||
|
||||
cmakeFlags = with stdenv; [
|
||||
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
||||
"-DLLVM_BUILD_TESTS=ON"
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_REQUIRES_RTTI=1"
|
||||
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
postBuild = ''
|
||||
rm -fR $out
|
||||
|
||||
paxmark m bin/{lli,llvm-rtdyld}
|
||||
|
||||
paxmark m unittests/ExecutionEngine/JIT/JITTests
|
||||
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
|
||||
paxmark m unittests/Support/SupportTests
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.src = src;
|
||||
|
||||
meta = {
|
||||
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 ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
|
||||
};
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt
|
||||
--- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500
|
||||
+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500
|
||||
@@ -53,7 +53,7 @@
|
||||
execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags
|
||||
OUTPUT_VARIABLE LLVM_CXX_FLAGS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS})
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}")
|
||||
endif(NOT DEFINED LLVM_MAIN_SRC_DIR)
|
||||
|
||||
set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
@@ -1,25 +0,0 @@
|
||||
{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "polly-${version}";
|
||||
|
||||
src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz";
|
||||
|
||||
patches = [ ./polly-separate-build.patch ];
|
||||
|
||||
buildInputs = [ cmake isl python2 gmp ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLVM_INSTALL_ROOT=${llvm}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A polyhedral optimizer for llvm";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -80,11 +80,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
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; [ thoughtpolice obadz vrthra ];
|
||||
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
platforms = with platforms; darwin ++ linux;
|
||||
maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
|
||||
license = licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
# 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06
|
||||
broken = stdenv.isAarch64 && (versionAtLeast version "5");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bats-${version}";
|
||||
version = "0.4.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz";
|
||||
sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
|
||||
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
|
||||
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
|
||||
};
|
||||
|
||||
patchPhase = "patchShebangs ./install.sh";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = "./install.sh $out";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/sstephenson/bats;
|
||||
homepage = https://github.com/bats-core/bats-core;
|
||||
description = "Bash Automated Testing System";
|
||||
maintainers = [ maintainers.lnl7 ];
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.6.5";
|
||||
sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb";
|
||||
minimumOTPVersion = "18";
|
||||
version = "1.6.6";
|
||||
sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl";
|
||||
minimumOTPVersion = "19";
|
||||
}
|
||||
|
||||
@@ -3,5 +3,5 @@
|
||||
mkDerivation rec {
|
||||
version = "1.7.2";
|
||||
sha256 = "0wnrx6wlpmr23ypm8za0c4dl952nj4rjylcsdzz0xrma92ylrqfq";
|
||||
minimumOTPVersion = "18";
|
||||
minimumOTPVersion = "19";
|
||||
}
|
||||
|
||||
@@ -57,6 +57,8 @@ in stdenv.mkDerivation ({
|
||||
|
||||
debugInfo = enableDebugInfo;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
prePatch = ''
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
|
||||
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.libsdl.org/projects/SDL_image/";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.libsdl.org/projects/SDL_mixer/;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
|
||||
{ stdenv, fetchurl
|
||||
, imake, gccmakedep, bison, flex, pkgconfig
|
||||
, xlibsWrapper, libXmu, libXpm, libXp }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.3";
|
||||
@@ -6,12 +8,13 @@ stdenv.mkDerivation {
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [imake gccmakedep libXpm libXp bison flex];
|
||||
propagatedBuildInputs = [xlibsWrapper libXmu];
|
||||
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
|
||||
buildInputs = [ libXpm libXp ];
|
||||
propagatedBuildInputs = [ xlibsWrapper libXmu ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "3D widget set based on the Athena Widget set";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,9 +38,10 @@ stdenv.mkDerivation {
|
||||
install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://forum.doom9.org/showthread.php?t=123311;
|
||||
description = "A library and program to retrieve decryption keys for HD discs";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.publicDomain;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
else throw "Unsupported system!";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "aws-sdk-cpp-${version}";
|
||||
version = "1.4.82";
|
||||
version = "1.5.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69";
|
||||
sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
||||
11
pkgs/development/libraries/boost/1.68.nix
Normal file
11
pkgs/development/libraries/boost/1.68.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.68_0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
|
||||
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
|
||||
};
|
||||
})
|
||||
@@ -1,5 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl
|
||||
, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||
, ApplicationServices, CoreText
|
||||
, withCoreText ? false
|
||||
, withIcu ? false # recommended by upstream as default, but most don't needed and it's big
|
||||
, withGraphite2 ? true # it is small and major distros do include it
|
||||
, python
|
||||
@@ -27,12 +29,17 @@ stdenv.mkDerivation {
|
||||
outputBin = "dev";
|
||||
|
||||
configureFlags = [
|
||||
( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
|
||||
( "--with-icu=" + (if withIcu then "yes" else "no") )
|
||||
];
|
||||
# not auto-detected by default
|
||||
"--with-graphite2=${if withGraphite2 then "yes" else "no"}"
|
||||
"--with-icu=${if withIcu then "yes" else "no"}"
|
||||
]
|
||||
++ stdenv.lib.optional withCoreText "--with-coretext=yes";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libintl ];
|
||||
buildInputs = [ glib freetype cairo ]; # recommended by upstream
|
||||
|
||||
buildInputs = [ glib freetype cairo ] # recommended by upstream
|
||||
++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ];
|
||||
|
||||
propagatedBuildInputs = []
|
||||
++ optional withGraphite2 graphite2
|
||||
++ optionals withIcu [ icu harfbuzz ];
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
{ stdenv, fetchurl, automake, autoconf, libtool, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ilmbase-2.2.1";
|
||||
name = "ilmbase-${version}";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
|
||||
sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna";
|
||||
url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./bootstrap
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.8";
|
||||
version = "3.1.0";
|
||||
name = "libsearpc-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "libsearpc";
|
||||
# Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9
|
||||
rev = "12a01268825e9c7e17794c58c367e3b4db912ad9";
|
||||
sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp";
|
||||
};
|
||||
|
||||
patches = [ ./libsearpc.pc.patch ];
|
||||
@@ -22,13 +21,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
buildPhase = "make -j1";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/haiwen/libsearpc;
|
||||
description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nlohmann_json-${version}";
|
||||
version = "3.1.2";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi";
|
||||
sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencolorio-${version}";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip";
|
||||
sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr";
|
||||
sha256 = "1vi5pcgj7gv8fp6cdnhszwfh7lh38rl2rk4c5yzsvmgcb7xf48bx";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openexr-${lib.getVersion ilmbase}";
|
||||
name = "openexr-${version}";
|
||||
version = lib.getVersion ilmbase;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
|
||||
sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg";
|
||||
url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./bootstrap
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib
|
||||
, numactl
|
||||
|
||||
# Enable the Sun Grid Engine bindings
|
||||
, enableSGE ? false
|
||||
@@ -24,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = with stdenv; [ gfortran zlib ]
|
||||
++ lib.optional isLinux libnl
|
||||
++ lib.optionals isLinux [ libnl numactl ]
|
||||
++ lib.optional (isLinux || isFreeBSD) rdma-core;
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opensubdiv-${version}";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PixarAnimationStudios";
|
||||
repo = "OpenSubdiv";
|
||||
rev = "v${lib.replaceChars ["."] ["_"] version}";
|
||||
sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh";
|
||||
sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "pcre2-${version}";
|
||||
version = "10.31";
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
|
||||
url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
|
||||
sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pkcs11-helper-${version}";
|
||||
version = "1.25";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSC";
|
||||
repo = "pkcs11-helper";
|
||||
rev = "${name}";
|
||||
sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy";
|
||||
sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
|
||||
version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
|
||||
version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frankosterfeld";
|
||||
repo = "qtkeychain";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0
|
||||
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
|
||||
|
||||
44
pkgs/development/libraries/science/math/scs/default.nix
Normal file
44
pkgs/development/libraries/science/math/scs/default.nix
Normal file
@@ -0,0 +1,44 @@
|
||||
{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scs-${version}";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvxgrp";
|
||||
repo = "scs";
|
||||
rev = "v${version}";
|
||||
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
|
||||
};
|
||||
|
||||
buildInputs = [ blas liblapack gfortran.cc.lib ];
|
||||
|
||||
# Actually link and add libgfortran to the rpath
|
||||
patchPhase = ''
|
||||
sed -i 's/#-lgfortran/-lgfortran/' scs.mk
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Test demo requires passing any int as $1; 42 chosen arbitrarily
|
||||
checkPhase = ''
|
||||
./out/demo_socp_indirect 42
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r include $out/
|
||||
cp out/*.a out/*.so $out/lib/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Splitting Conic Solver";
|
||||
longDescription = ''
|
||||
Numerical optimization package for solving large-scale convex cone problems
|
||||
'';
|
||||
homepage = https://github.com/cvxgrp/scs;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.bhipple ];
|
||||
};
|
||||
}
|
||||
@@ -2,5 +2,8 @@
|
||||
"bower"
|
||||
, "coffee-script"
|
||||
, "grunt-cli"
|
||||
, "node-gyp"
|
||||
, "node-gyp-build"
|
||||
, "node-pre-gyp"
|
||||
, "pnpm"
|
||||
]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }:
|
||||
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.5";
|
||||
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch;
|
||||
sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la";
|
||||
})];
|
||||
|
||||
buildInputs = [ ocaml findlib piqi camlp4 ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, ocaml, findlib, camlp4, which, ulex, easy-format, ocaml_optcomp, xmlm, base64}:
|
||||
{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.13";
|
||||
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml findlib camlp4 which ocaml_optcomp];
|
||||
buildInputs = [ ocaml findlib which ocaml_optcomp ];
|
||||
propagatedBuildInputs = [ulex xmlm easy-format base64];
|
||||
|
||||
patches = [ ./no-ocamlpath-override.patch ];
|
||||
patches = [ ./no-ocamlpath-override.patch ./safe-string.patch ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
|
||||
13
pkgs/development/ocaml-modules/piqi/safe-string.patch
Normal file
13
pkgs/development/ocaml-modules/piqi/safe-string.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- a/piqilib/piqi_json_parser.mll
|
||||
+++ b/piqilib/piqi_json_parser.mll
|
||||
@@ -189,8 +189,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
|
||||
let s = lexbuf.lex_buffer in
|
||||
let start = lexbuf.lex_start_pos in
|
||||
- check_adjust_utf8 v lexbuf s start len;
|
||||
- Buffer.add_substring v.buf s start len
|
||||
+ check_adjust_utf8 v lexbuf (Bytes.unsafe_to_string s) start len;
|
||||
+ Buffer.add_subbytes v.buf s start len
|
||||
|
||||
let map_lexeme f lexbuf =
|
||||
let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "1.11.13";
|
||||
version = "1.11.15";
|
||||
|
||||
disabled = pythonOlder "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
|
||||
sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6";
|
||||
sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals withGdal [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613";
|
||||
sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals withGdal [
|
||||
|
||||
43
pkgs/development/python-modules/django/2_1.nix
Normal file
43
pkgs/development/python-modules/django/2_1.nix
Normal file
@@ -0,0 +1,43 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, substituteAll,
|
||||
isPy3k,
|
||||
geos, gdal, pytz,
|
||||
withGdal ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "2.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals withGdal [
|
||||
(substituteAll {
|
||||
src = ./1.10-gis-libs.template.patch;
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
})
|
||||
];
|
||||
|
||||
# patch only $out/bin to avoid problems with starter templates (see #3134)
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pytz ];
|
||||
|
||||
# too complicated to setup
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A high-level Python Web framework";
|
||||
homepage = https://www.djangoproject.com/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ georgewhewell ];
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/libkeepass/default.nix
Normal file
24
pkgs/development/python-modules/libkeepass/default.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, lxml, pycryptodome, colorama }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libkeepass";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3ed79ea786f7020b14b83c082612ed8fbcc6f8edf65e1697705837ab9e40e9d7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml pycryptodome colorama ];
|
||||
|
||||
# No tests on PyPI
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/libkeepass/libkeepass;
|
||||
description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jqueiroz ];
|
||||
};
|
||||
}
|
||||
20
pkgs/development/python-modules/mypy-protobuf/default.nix
Normal file
20
pkgs/development/python-modules/mypy-protobuf/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchPypi, buildPythonApplication, protobuf }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mypy-protobuf";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bmpd82qm7rjnzc4i275lm18mmz8anhrjhwq2ci179l64hrfr0nb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generate mypy stub files from protobuf specs";
|
||||
homepage = "https://github.com/dropbox/mypy-protobuf";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lnl7 ];
|
||||
};
|
||||
}
|
||||
@@ -28,7 +28,10 @@ buildPythonPackage rec {
|
||||
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
|
||||
'';
|
||||
|
||||
preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
|
||||
preBuild = ''
|
||||
# Workaround for https://github.com/google/protobuf/issues/2895
|
||||
${python}/bin/${python.executable} setup.py build
|
||||
'' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
|
||||
${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
|
||||
'';
|
||||
|
||||
|
||||
18
pkgs/development/python-modules/pycrc/default.nix
Normal file
18
pkgs/development/python-modules/pycrc/default.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyCRC";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d3b0e788b501f48ae2ff6eeb34652343c9095e4356a65df217ed29b51e4045b6";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/cristianav/PyCRC;
|
||||
description = "Python libraries for CRC calculations (it supports CRC-16, CRC-32, CRC-CCITT, etc)";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ guibou ];
|
||||
};
|
||||
}
|
||||
@@ -9,17 +9,17 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "frama-c-${version}";
|
||||
version = "20171101";
|
||||
slang = "Sulfur";
|
||||
version = "20180502";
|
||||
slang = "Chlorine";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
|
||||
sha256 = "1vwjfqmm1r36gkybsy3a7m89q5zicf4rnz5vlsn9imnpjpl9gjw1";
|
||||
sha256 = "1m4r8h8n1z957pylyf9b0kjblh59imnqm1bkb4s6rdwl4a1gbjgc";
|
||||
};
|
||||
|
||||
why2 = fetchurl {
|
||||
url = "http://why.lri.fr/download/why-2.39.tar.gz";
|
||||
sha256 = "0nf17jl00s7q9z8gkbamnf7mglvxqrm3967c17ic4c9xz8g125a8";
|
||||
url = "http://why.lri.fr/download/why-2.40.tar.gz";
|
||||
sha256 = "0h1mbpxsgwvf3pbl0qbg22j6f4v1ffka24ap1ajbjk9b1yb3ali8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf makeWrapper ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-deps-${version}";
|
||||
version = "2018-05-31";
|
||||
version = "2018-08-16";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/johnynek/bazel-deps";
|
||||
@@ -15,8 +15,8 @@ buildBazelPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnynek";
|
||||
repo = "bazel-deps";
|
||||
rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4";
|
||||
sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855";
|
||||
rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81";
|
||||
sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5";
|
||||
};
|
||||
|
||||
bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
|
||||
@@ -26,7 +26,7 @@ buildBazelPackage rec {
|
||||
fetchAttrs = {
|
||||
preInstall = ''
|
||||
# Remove all built in external workspaces, Bazel will recreate them when building
|
||||
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
|
||||
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,embedded_jdk,\@embedded_jdk.marker,local_*,\@local_*}
|
||||
# For each external workspace, remove all files that aren't referenced by Bazel
|
||||
# Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD)
|
||||
files_to_delete=()
|
||||
@@ -66,7 +66,7 @@ buildBazelPackage rec {
|
||||
find . -type d -empty -delete
|
||||
'';
|
||||
|
||||
sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g";
|
||||
sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "11.1.0";
|
||||
version = "11.2.0";
|
||||
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
|
||||
docker_x86_64 = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
|
||||
sha256 = "0l7j69isnp6wlix3ysjxcr9dgcx5a0j9z2k0bsl714ff339js6j5";
|
||||
sha256 = "1dphrws6118l0ryvgny0z5h9fsdbwckm4x21bh8hwb6bxdbqr0yn";
|
||||
};
|
||||
|
||||
docker_arm = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
|
||||
sha256 = "16x9wbyd90jgyn7x45j9cyrdfz4hg8qav132schqrrdfrgjyrb4x";
|
||||
sha256 = "162lzbi7z9afp470w0qkcja728jyb48s7krzinmvg45fb3fb0lfn";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
@@ -29,7 +29,7 @@ buildGoPackage rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b632jnqbj74nx27nlpiia6nq8668gf41lcb4s24gw9jnfmrwhym";
|
||||
sha256 = "1y4fb5jbks6xab7zim10s112h11bq04hh3lddmhm4f2nyqcmlrqh";
|
||||
};
|
||||
|
||||
patches = [ ./fix-shell-path.patch ];
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.99.3";
|
||||
version = "1.0.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "flatpak-builder-${version}";
|
||||
|
||||
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk";
|
||||
sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "camlp5${if transitional then "_transitional" else ""}-7.05";
|
||||
name = "camlp5${if transitional then "_transitional" else ""}-7.06";
|
||||
|
||||
src = fetchzip {
|
||||
url = https://github.com/camlp5/camlp5/archive/rel705.tar.gz;
|
||||
sha256 = "16igfyjl2jja4f1mibjfzk0c2jr09nxsz6lb63x1jkccmy6430q2";
|
||||
url = https://github.com/camlp5/camlp5/archive/rel706.tar.gz;
|
||||
sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
buildGoPackage rec {
|
||||
name = "packer-${version}";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/packer";
|
||||
|
||||
@@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "hashicorp";
|
||||
repo = "packer";
|
||||
rev = "v${version}";
|
||||
sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n";
|
||||
sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001
|
||||
From: Greg Nietsky <gregory@distrotech.co.za>
|
||||
Date: Tue, 4 Mar 2014 11:33:40 +0200
|
||||
Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64
|
||||
|
||||
Botan is imported hardwired for x86 this small patch allows it
|
||||
too operate on arm other platforms could be added.
|
||||
|
||||
Task-number: QTCREATORBUG-8107
|
||||
Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a
|
||||
---
|
||||
src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++-
|
||||
src/libs/3rdparty/botan/botan.h | 2 ++
|
||||
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
|
||||
index 917c385..4364a2e 100644
|
||||
--- a/src/libs/3rdparty/botan/botan.cpp
|
||||
+++ b/src/libs/3rdparty/botan/botan.cpp
|
||||
@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
|
||||
|
||||
#if (BOTAN_MP_WORD_BITS != 32)
|
||||
#error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
|
||||
+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
+typedef Botan::u64bit dword;
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_UNIX
|
||||
@@ -1118,6 +1120,7 @@ extern "C" {
|
||||
*/
|
||||
inline word word_madd2(word a, word b, word* c)
|
||||
{
|
||||
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
asm(
|
||||
ASM("mull %[b]")
|
||||
ASM("addl %[c],%[a]")
|
||||
@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c)
|
||||
: "0"(a), "1"(b), [c]"g"(*c) : "cc");
|
||||
|
||||
return a;
|
||||
+#else
|
||||
+ dword z = (dword)a * b + *c;
|
||||
+ *c = (word)(z >> BOTAN_MP_WORD_BITS);
|
||||
+ return (word)z;
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c)
|
||||
*/
|
||||
inline word word_madd3(word a, word b, word c, word* d)
|
||||
{
|
||||
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
asm(
|
||||
ASM("mull %[b]")
|
||||
|
||||
@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d)
|
||||
: "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
|
||||
|
||||
return a;
|
||||
+#else
|
||||
+ dword z = (dword)a * b + c + *d;
|
||||
+ *d = (word)(z >> BOTAN_MP_WORD_BITS);
|
||||
+ return (word)z;
|
||||
+#endif
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2315,7 +2329,7 @@ namespace Botan {
|
||||
|
||||
extern "C" {
|
||||
|
||||
-#ifdef Q_OS_UNIX
|
||||
+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
/*
|
||||
* Helper Macros for x86 Assembly
|
||||
*/
|
||||
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
|
||||
index 6a9cbe0..3bfdbc2 100644
|
||||
--- a/src/libs/3rdparty/botan/botan.h
|
||||
+++ b/src/libs/3rdparty/botan/botan.h
|
||||
@@ -81,7 +81,9 @@
|
||||
#endif
|
||||
|
||||
#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
|
||||
+#if !defined(__arm__) && !defined(__aarch64__)
|
||||
#define BOTAN_TARGET_CPU_IS_X86_FAMILY
|
||||
+#endif
|
||||
#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
|
||||
|
||||
#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper ];
|
||||
|
||||
patches = optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -55,6 +57,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://wiki.qt.io/Category:Tools::QtCreator;
|
||||
license = "LGPL";
|
||||
maintainers = [ maintainers.akaWolf ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
41
pkgs/development/tools/wabt/default.nix
Normal file
41
pkgs/development/tools/wabt/default.nix
Normal file
@@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wabt-${version}";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "wabt";
|
||||
rev = version;
|
||||
sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The WebAssembly Binary Toolkit";
|
||||
longDescription = ''
|
||||
WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
|
||||
including:
|
||||
* wat2wasm: translate from WebAssembly text format to the WebAssembly
|
||||
binary format
|
||||
* wasm2wat: the inverse of wat2wasm, translate from the binary format
|
||||
back to the text format (also known as a .wat)
|
||||
* wasm-objdump: print information about a wasm binary. Similiar to
|
||||
objdump.
|
||||
* wasm-interp: decode and run a WebAssembly binary file using a
|
||||
stack-based interpreter
|
||||
* wat-desugar: parse .wat text form as supported by the spec interpreter
|
||||
(s-expressions, flat syntax, or mixed) and print "canonical" flat
|
||||
format
|
||||
* wasm2c: convert a WebAssembly binary file to a C source and header
|
||||
'';
|
||||
homepage = https://github.com/WebAssembly/wabt;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ekleog ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "postman-${version}";
|
||||
version = "6.1.4";
|
||||
version = "6.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "2f93a860f87d842c0e0433b55cd7c46e04d1d20c0adcae8680332585dffd86eb";
|
||||
sha256 = "9fd52b4c4ac744d3c70f28e39dbfeda3d03a8640c562e82e3744c2f9d0f8ade1";
|
||||
name = "${name}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user