diff options
Diffstat (limited to 'pkgs/development')
11 files changed, 89 insertions, 59 deletions
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 72eaae99877..3f9ee17ca27 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "33"; + version = "42"; rev = "version_${version}"; name = "binaryen-${version}"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp"; + sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k"; inherit rev; }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b46da64c342..35a3ab0985e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -281,6 +281,7 @@ self: super: { hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; hath = dontCheck super.hath; + haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85 haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; hedis = dontCheck super.hedis; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 94369449ff3..827d3de79ea 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { name = "libassuan-2.5.1"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ]; + buildInputs = [ libgpgerror pth ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; doCheck = true; @@ -20,18 +21,16 @@ stdenv.mkDerivation rec { sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = { + meta = with stdenv.lib; { description = "IPC library used by GnuPG and related software"; - longDescription = '' Libassuan is a small library implementing the so-called Assuan protocol. This protocol is used for IPC between most newer GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 397000fc7d2..45564d64861 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 8bff5a21cd0..3f7a4bed9cc 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror }: +{ stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.3.5"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix index 3c7cd077cdc..77b540fdef0 100644 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ b/pkgs/development/python-modules/nose-parameterized/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ fetchPypi, parameterized }: -buildPythonPackage rec { +parameterized.overrideAttrs (o: rec { pname = "nose-parameterized"; version = "0.6.0"; @@ -8,20 +8,4 @@ buildPythonPackage rec { inherit pname version; sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; }; - - # Tests require some python3-isms but code works without. - doCheck = isPy3k; - - buildInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -v - ''; - - meta = with stdenv.lib; { - description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; - license = licenses.bsd3; - }; -} +}) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix new file mode 100644 index 00000000000..14b41fe950b --- /dev/null +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: + +buildPythonPackage rec { + pname = "parameterized"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + }; + + # Tests require some python3-isms but code works without. + doCheck = isPy3k; + + checkInputs = [ nose glibcLocales ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Parameterized testing with any Python test framework"; + homepage = https://pypi.python.org/pypi/parameterized; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix new file mode 100644 index 00000000000..c81d60ced4d --- /dev/null +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }: + +buildPythonPackage rec { + pname = "pybase64"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ parameterized nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pybase64; + description = "Fast Base64 encoding/decoding"; + license = licenses.bsd2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2bfec89aa66..6afec72de5f 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.1"; + version = "2.3.11"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; + sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; }; nativeBuildInputs = [ cmake ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index 16d7a9bfd3e..f70e3811f65 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,31 +1,23 @@ ---- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 -@@ -48,6 +48,7 @@ +--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 +@@ -49,6 +49,7 @@ import shutil import contextlib import logging +from distutils.spawn import find_executable - # Ignored compiler options map for compilation database creation. - # The map is used in `split_command` method. (Which does ignore and classify -@@ -447,7 +448,6 @@ - # do extra check on number of source files - return result if result.files else None + # Map of ignored compiler option for the creation of a compilation database. + # This map is used in _split_command method, which classifies the parameters +@@ -540,7 +541,11 @@ + any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) -- - def split_compiler(command): - """ A predicate to decide the command is a compiler call or not. - -@@ -467,7 +467,11 @@ - for pattern in COMPILER_CPP_PATTERNS) - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) # type: str ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None + -+ executable = os.path.basename(absolute_executable) - parameters = command[1:] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. ++ executable = os.path.basename(absolute_executable) # type: str + parameters = command[1:] # type: List[str] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 642a6a97bc0..1586d636087 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.103"; + version = "2.105"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; + sha256 = "0q6xyjkqlrwjgf7rzmyy8m0w7lhqyavici76zzngg159xkyh5cfh"; }; buildCommand = '' |