diff options
Diffstat (limited to 'pkgs/development')
113 files changed, 1405 insertions, 316 deletions
diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix new file mode 100644 index 000000000000..82e15db66858 --- /dev/null +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jrsonnet"; + version = "0.3.8"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "CertainLach"; + repo = "jrsonnet"; + sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + }; + + postInstall = '' + ln -s $out/bin/jrsonnet $out/bin/jsonnet + ''; + + cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + + meta = { + description = "Purely-functional configuration language that helps you define JSON data"; + maintainers = with lib.maintainers; [ lach ]; + license = lib.licenses.mit; + homepage = "https://github.com/CertainLach/jrsonnet"; + }; +} diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 1ef16cfb9b1d..880cad1c72b1 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -7,12 +7,16 @@ import json import os import re import subprocess +import sys from codecs import iterdecode from datetime import datetime from urllib.request import urlopen, Request +DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') + + def get_latest_chromium_build(): HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' print(f'GET {HISTORY_URL}') @@ -39,6 +43,16 @@ def get_commit(ref): return json.loads(http_response.read().decode()) +def get_current_revision(): + """Get the current revision of llvmPackages_git.""" + with open(DEFAULT_NIX) as f: + for line in f: + rev = re.search(r'^ rev = "(.*)";', line) + if rev: + return rev.group(1) + sys.exit(1) + + def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" print(f'nix-prefetch-url {url}') @@ -55,13 +69,15 @@ clang_revision = re.search(r"^CLANG_REVISION = '(.+)'$", clang_update_script, re clang_commit_short = re.search(r"llvmorg-[0-9]+-init-[0-9]+-g([0-9a-f]{8})", clang_revision).group(1) release_version = re.search(r"^RELEASE_VERSION = '(.+)'$", clang_update_script, re.MULTILINE).group(1) commit = get_commit(clang_commit_short) +if get_current_revision() == commit["sha"]: + print('No new update available.') + sys.exit(0) date = datetime.fromisoformat(commit['commit']['committer']['date'].rstrip('Z')).date().isoformat() version = f'unstable-{date}' print('Prefetching source tarball...') hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["sha"]}.tar.gz') print('Updating default.nix...') -default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') -with fileinput.FileInput(default_nix, inplace=True) as f: +with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index f6d2053f315c..e7dc9ceae6d9 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { setSourceRoot = ''export sourceRoot="$(echo */src)"''; + # MosML needs a specific RPATH entry pointing to $(out)/lib (added + # by the build system), which patchelf will remove. + dontPatchELF = true; + meta = with lib; { description = "A light-weight implementation of Standard ML"; longDescription = '' diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 678ab3adb06c..40c216d79c34 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; - sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; + sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0"; - sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm"; + rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391"; + sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "979924c8bc839e4cb1b69d03d48398551f369ce7"; - sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85"; + rev = "0c28b6451d77774912e52949c1e57fa726edf113"; + sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2020.2"; + version = "2021.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w"; + sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs="; }; patchPhase = '' diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 5ff4ffd75653..638210f8412f 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -8,18 +8,22 @@ , cppunit , log4cpp , osmosdr +, gmp +, mpir +, fftwFloat +, icu }: mkDerivation rec { pname = "gr-ais"; - version = "2015-12-20"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + rev = "2162103226f3dae43c8c2ab23b79483b84346665"; + sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; }; - disabledForGRafter = "3.8"; + disabledForGRafter = "3.9"; nativeBuildInputs = [ cmake @@ -32,6 +36,10 @@ mkDerivation rec { osmosdr boost log4cpp + gmp + mpir + fftwFloat + icu ]; meta = with lib; { diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 0a9e1de61265..73152fb9d2c3 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "guile-gcrypt"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitea { domain = "notabug.org"; owner = "cwebber"; repo = "guile-gcrypt"; rev = "v${version}"; - sha256 = "LKXIwO8v/T/h1JKARWD5ta57sgRcVu7hcYYwr3wUQ1g="; + sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; postConfigure = '' diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index f337eefecb2f..254afae0cc4f 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "1s77s70gzfj6h7bglq431kw8l4iknhsfpc0mnvcp4lkhwdcgyn1n"; + sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ="; }; postConfigure = '' diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1d84bf37ce58..5433bbb1aa64 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.4.1"; + version = "4.5.2"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-UqZt3pqXQzeHpzEiMvOMKSh1gK/K2KaJ70jMllNxBPc="; + sha256 = "GrBG7DaxxEwEGsJ1Vo2Bh4TXH6uaXZX5Eoz+iiUFGTM="; }; postConfigure = '' diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 3ecbf3de2a91..9e344adc15a3 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.4.3"; - sha256 = "wmR0XTMrJ3608HD341lNlYChwxs/8jb12Okw3RNHGCA="; + version = "23.3.4.4"; + sha256 = "dnoSGfBUZrgcnNQNAoqmVOxK/NQlt1DC187sxg7mPq8="; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 38ee086a88fe..b8132cea4fc7 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -208,7 +208,7 @@ in with passthru; stdenv.mkDerivation { # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 ./3.7/no-win64-workaround.patch - ] ++ optionals (isPy37 || isPy38 || isPy39) [ + ] ++ optionals (pythonAtLeast "3.7") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonOlder "3.8") [ @@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 || isPy38 || isPy39 then + else if pythonAtLeast "3.7" then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 1b2655fe7712..fdb3a78a1b7e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp, removeReferencesTo }: stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { - url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk"; + url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "11ixlqmvbb37abksdysg5r4lkbwzr486lkc0ssl3wca4iiy3mhgf"; }; + nativeBuildInputs = [ removeReferencesTo ]; + buildInputs = [ icu zlib gmp perl ]; configureScript = "perl ./Configure.pl"; configureFlags = [ @@ -16,15 +18,14 @@ stdenv.mkDerivation rec { "--with-nqp=${nqp}/bin/nqp" ]; - # Remove test of profiler, fails since 2020.09 - preCheck = "rm t/09-moar/01-profilers.t"; - - # Some tests fail on Darwin - doCheck = !stdenv.isDarwin; + disallowedReferences = [ stdenv.cc.cc ]; + postFixup = '' + remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar.so)" + ''; meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = "https://www.rakudo.org"; + homepage = "https://rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 0dbe0f5d97e3..60a5e071545e 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { - url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i"; + url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; + sha256 = "19vjcyb9fg9msjw1ih00c2qby480gl4highw24zx7j84slhsj013"; }; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; - homepage = "https://www.moarvm.org/"; + homepage = "https://moarvm.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 317a8226852e..4b456d819f6d 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.05"; + version = "2021.06"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l"; + sha256 = "1d00lajjdd2k510fb0cb6c8bpklvlnncykf6jz8j8djfp0b2i696"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index d19600f39b85..4dcb70bd3ec7 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "0ciia8hhkkyh6rmrxgbk3bgwjwzkcba6645wlcm0vlgk2w4i5m3z"; + sha256 = "191f60db2y1f3xw1x81mw88vclf1c4kgvnfv74g5vb3vn7n57c5j"; fetchSubmodules = true; }; - cargoSha256 = "140bzxhsyfif99x5a1m1d45ppb6jzvy9m4xil7z1wg2pnq9k7zz8"; + cargoSha256 = "0hhwixqhrl79hpzmvq7ga3kp2cfrwr4i8364cwnr7195xwnfxb0k"; nativeBuildInputs = [ cmake pkg-config ]; @@ -32,7 +32,9 @@ rustPlatform.buildRustPackage rec { ]; cargoTestFlags = [ - "--features" "test-cranelift,test-jit" + "--features" "test-cranelift" + # Can't use test-jit : + # error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit` ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -47,6 +49,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://wasmer.io/"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne shamilton ]; }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index faa819ec5615..74122f7ed24e 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; src = fetchurl { - url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; + url = "https://liba52.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; }; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { "--enable-shared" ]; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with # hardeningDisable = lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 8234891046da..ebb989c94035 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,41 +1,42 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libuuid, zlib, openssl, lib }: +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib }: stdenv.mkDerivation rec { pname = "drogon"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "an-tao"; repo = "drogon"; rev = "v${version}"; - sha256 = "0ncdlsi3zhmpdwh83d52npb1b2q982y858yl88zl2nfq4zhcm3wa"; + sha256 = "18wn9ashv3h3pal6x5za6y7byfcrd49zy3wfx4hx0ygxzplmss0r"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # examples are used in the test during installCheckPhase, otherwise they are unnecessary - "-DBUILD_EXAMPLES=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_EXAMPLES=OFF" ]; propagatedBuildInputs = [ jsoncpp - libuuid + libossp_uuid zlib openssl ]; patches = [ - # this part of the test fails because it attempts to configure a CMake project that uses find_package on itself - # the rest of the test runs fine because it uses executables that are built in buildPhase when BUILD_EXAMPLES is enabled - ./no_cmake_test.patch + # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself + # this patch makes drogon and trantor visible to the test + ./fix_find_package.patch ]; + # modifying PATH here makes drogon_ctl visible to the test installCheckPhase = '' cd .. patchShebangs test.sh - ./test.sh + PATH=$PATH:$out/bin ./test.sh ''; doInstallCheck = true; diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/development/libraries/drogon/fix_find_package.patch new file mode 100644 index 000000000000..b76dbfe48830 --- /dev/null +++ b/pkgs/development/libraries/drogon/fix_find_package.patch @@ -0,0 +1,13 @@ +diff --git a/test.sh b/test.sh +index f017b9a..027031e 100755 +--- a/test.sh ++++ b/test.sh +@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then + conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths + cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" + fi +-cmake .. $cmake_gen ++cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor + + if [ $? -ne 0 ]; then + echo "Failed to run CMake for example project" diff --git a/pkgs/development/libraries/drogon/no_cmake_test.patch b/pkgs/development/libraries/drogon/no_cmake_test.patch deleted file mode 100644 index 8d38fbf44b70..000000000000 --- a/pkgs/development/libraries/drogon/no_cmake_test.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/test.sh b/test.sh -index e5da08e..ba620cc 100755 ---- a/test.sh -+++ b/test.sh -@@ -157,37 +157,6 @@ cd ../views - - echo "Hello, world!" >>hello.csp - --cd ../build --if [ $os = "windows" ]; then -- conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths -- cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" --fi --cmake .. $cmake_gen -- --if [ $? -ne 0 ]; then -- echo "Error in testing" -- exit -1 --fi -- --cmake --build . -- $make_flags -- --if [ $? -ne 0 ]; then -- echo "Error in testing" -- exit -1 --fi -- --if [ $os = "linux" ]; then -- if [ ! -f "drogon_test" ]; then -- echo "Failed to build drogon_test" -- exit -1 -- fi --else -- if [ ! -f "Debug\drogon_test.exe" ]; then -- echo "Failed to build drogon_test" -- exit -1 -- fi --fi -- - cd ../../ - rm -rf drogon_test - diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch new file mode 100644 index 000000000000..b2e71fe3aed1 --- /dev/null +++ b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch @@ -0,0 +1,37 @@ +From 2d6dd1c286eb57fbf968510318cafc94888b98de Mon Sep 17 00:00:00 2001 +From: OPNA2608 <christoph.neidahl@gmail.com> +Date: Sun, 13 Jun 2021 21:56:03 +0200 +Subject: [PATCH] Darwin build fix + +--- + gspell/Makefile.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/gspell/Makefile.am b/gspell/Makefile.am +index 69ee421..7c58973 100644 +--- a/gspell/Makefile.am ++++ b/gspell/Makefile.am +@@ -95,6 +95,7 @@ nodist_libgspell_core_la_SOURCES = \ + $(BUILT_SOURCES) + + libgspell_core_la_LIBADD = \ ++ $(GTK_MAC_LIBS) \ + $(CODE_COVERAGE_LIBS) + + libgspell_core_la_CFLAGS = \ +@@ -161,6 +162,12 @@ gspell_private_headers += \ + gspell_private_c_files += \ + gspell-osx.c + ++libgspell_core_la_CFLAGS += \ ++ -xobjective-c ++ ++libgspell_core_la_LDFLAGS += \ ++ -framework Cocoa ++ + endif # OS_OSX + + if HAVE_INTROSPECTION +-- +2.29.3 + diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index f591246eaf81..be45a48090ff 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,6 +2,8 @@ , fetchurl , pkg-config , libxml2 +, autoreconfHook +, gtk-doc , glib , gtk3 , enchant2 @@ -9,6 +11,7 @@ , vala , gobject-introspection , gnome +, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -23,17 +26,26 @@ stdenv.mkDerivation rec { sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; }; + patches = [ + # Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149 + ./0001-Darwin-build-fix.patch + ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection libxml2 + autoreconfHook + gtk-doc ]; buildInputs = [ glib gtk3 icu + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration ]; propagatedBuildInputs = [ @@ -53,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index fc4439e223ee..2b9124032590 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 4015ab02a3a8..0011dc2f6e11 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,6 +1,16 @@ -{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc +{ stdenv +, config +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, libusb1 +, ninja +, pkg-config +, gcc , cudaSupport ? config.cudaSupport or false, cudatoolkit -, enablePython ? false, pythonPackages ? null }: +, enablePython ? false, pythonPackages ? null +}: assert cudaSupport -> cudatoolkit != null; assert enablePython -> pythonPackages != null; @@ -24,7 +34,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); - patches = lib.optionals enablePython [ + patches = [ + # fix build on aarch64-darwin + # https://github.com/IntelRealSense/librealsense/pull/9253 + (fetchpatch { + url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch"; + sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8"; + }) ./py_sitepackage_dir.patch ./py_pybind11_no_external_download.patch ]; @@ -57,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 7180587e8e6b..f4eaa9c31993 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Zp1+PW0WtNzRYIA87X42CJeSzVFhi5sGi9/rlUP4Vo="; + sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 958be905f835..b7df32633b4a 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: +{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which antlr ]; + nativeBuildInputs = [ flex which antlr2 ]; buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix new file mode 100644 index 000000000000..7f8ef3dc47d7 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, python3 } : + +stdenv.mkDerivation rec { + pname = "xcfun"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "dftlibs"; + repo = pname; + rev = "v${version}"; + sha256= "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; + }; + + nativeBuildInputs = [ + cmake + gfortran + ]; + + propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pybind11 ])) ]; + + cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ]; + + meta = with lib; { + description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + homepage = "https://github.com/dftlibs/xcfun"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 45cccf22c7df..074dfc001e68 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -3,7 +3,7 @@ # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; - url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; }), pkgs ? import nixpkgsSource {}, @@ -41,7 +41,7 @@ let # If you copy this example out of nixpkgs, something like this will work: /*androidEnvNixpkgs = fetchTarball { name = "androidenv"; - url = https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz"; sha256 = "<fill me in with nix-prefetch-url --unpack>"; }; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index b652c28c6293..9047910a2138 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { }; checkPhase = '' + export HOME=$TMPDIR + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + pushd tests py.test -Wignore::DeprecationWarning ./. popd diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 7072e9249dab..641dd4ffa4ff 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8="; + sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix new file mode 100644 index 000000000000..d25cdadc89a6 --- /dev/null +++ b/pkgs/development/python-modules/aladdin-connect/default.nix @@ -0,0 +1,33 @@ +{ lib +, requests +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "aladdin-connect"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "shoejosh"; + repo = pname; + rev = version; + sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aladdin_connect" ]; + + meta = with lib; { + description = "Python library for interacting with Genie Aladdin Connect devices"; + homepage = "https://github.com/shoejosh/aladdin-connect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix new file mode 100644 index 000000000000..8e8b1c920733 --- /dev/null +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "anyascii"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Unicode to ASCII transliteration"; + homepage = "https://github.com/anyascii/anyascii"; + license = licenses.isc; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index c4df114e24df..96e18d76ba74 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.6.6"; + version = "0.0.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; + sha256 = "1dh3bp7m9fjfrfrahblibrx91sagndkdi0325ail63kyvlhzbkma"; }; checkInputs = [ @@ -32,6 +32,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/coqui-ai/coqpit"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 36430a29ef0f..4a2a410c4ad5 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stringcase , typing-inspect , marshmallow-enum +, hypothesis +, mypy +, pytestCheckHook }: buildPythonPackage rec { pname = "dataclasses-json"; version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; + src = fetchFromGitHub { + owner = "lidatong"; + repo = pname; + rev = "v${version}"; + sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; }; propagatedBuildInputs = [ @@ -21,6 +26,19 @@ buildPythonPackage rec { marshmallow-enum ]; + checkInputs = [ + hypothesis + mypy + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: Type annotations check failed + "test_type_hints" + ]; + + pythonImportsCheck = [ "dataclasses_json" ]; + meta = with lib; { description = "Simple API for encoding and decoding dataclasses to and from JSON"; homepage = "https://github.com/lidatong/dataclasses-json"; diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix new file mode 100644 index 000000000000..608286c8bcf6 --- /dev/null +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, urllib3, pytest }: + +buildPythonPackage rec { + pname = "downloader-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228"; + }; + + propagatedBuildInputs = [ urllib3 ]; + + # Disable checks due to networking (Errno 101) + doCheck = false; + + pythonImportsCheck = [ "downloader_cli" ]; + + meta = with lib; { + description = "A simple downloader written in Python with an awesome customizable progressbar. "; + homepage = "https://github.com/deepjyoti30/downloader-cli"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix new file mode 100644 index 000000000000..e3001d7fa46c --- /dev/null +++ b/pkgs/development/python-modules/ecoaliface/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "ecoaliface"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hzx0r3311f952jik3pgmrg74xp5m6w9c5v6snfrb8w2m19vs6qy"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ecoaliface" ]; + + meta = with lib; { + description = "Python library for interacting with eCoal water boiler controllers"; + homepage = "https://github.com/matkor/ecoaliface"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix new file mode 100644 index 000000000000..8ac474b6e5f8 --- /dev/null +++ b/pkgs/development/python-modules/enturclient/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enturclient"; + version = "0.2.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hfurubotten"; + repo = pname; + rev = "v${version}"; + sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "enturclient" ]; + + meta = with lib; { + description = "Python library for interacting with the Entur.org API"; + homepage = "https://github.com/hfurubotten/enturclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 38e9761952d6..bf921207fc5c 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "feedparser"; - version = "6.0.2"; + version = "6.0.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; + sha256 = "1syd15460a6m397rajdpbr9q0hgxm1j6xf9ba18z9pighxdjmxkq"; }; propagatedBuildInputs = [ sgmllib3k ]; diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 3f614258a8fb..dd1dd0e34d12 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; + sha256 = "sha256-VFPmTKiFwwL1THpjDeFeHgssXvIRB+ppvZb9aU1yPV4="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix new file mode 100644 index 000000000000..556bc09ed6e5 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-appengine-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.appengine_logging" + "google.cloud.appengine_logging_v1" + ]; + + meta = with lib; { + description = "Appengine logging client library"; + homepage = "https://github.com/googleapis/python-appengine-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index bd8bdc0b8c31..61e69c5b29da 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2, < 0.2.1"' + --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 94516e25a38d..899eef02c9a1 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,14 +14,18 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806"; + sha256 = "sha256-UjYzSWtP4cp0p7Is2qIGWBgEhjgTv0YeL0N9D7etIbY="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; checkInputs = [ google-cloud-storage @@ -35,10 +39,13 @@ buildPythonPackage rec { preCheck = '' # do not shadow imports rm -r google - # requires credentials - rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; + disabledTestPaths = [ + # requires credentials + "tests/system/gapic/v1beta1/test_system_tables_client_v1.py" + ]; + disabledTests = [ # requires credentials "test_prediction_client_client_info" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 8aff49154721..c7df1160631b 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; + sha256 = "sha256-msjNBqYL/cUE85+80IblGAyGhM/+/ndFqf9qY5xXVik="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix new file mode 100644 index 000000000000..566c566bbe48 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.bigquery_logging" + "google.cloud.bigquery_logging_v1" + ]; + + meta = with lib; { + description = "Bigquery logging client library"; + homepage = "https://github.com/googleapis/python-bigquery-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0c62727ff8ac..f79916e51158 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.13.1"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4"; + sha256 = "sha256-0JLyWfQKN7kYnXW/DRJp3ZH+EesLv7/CXJPmxXYtb4M="; }; propagatedBuildInputs = [ @@ -51,6 +51,8 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + # Mocking of _ensure_bqstorage_client fails + "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 786250ce9e15..f7eb9a51a8a3 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,33 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 , google-api-core , google-cloud-core -, pytest +, grpc_google_iam_v1 +, libcst , mock +, proto-plus +, pytestCheckHook }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.7.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; + sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; checkPhase = '' + # Prevent google directory from shadowing google imports rm -r google - pytest tests/unit -k 'not policy' ''; + disabledTests = [ + "policy" + ]; + + pythonImportsCheck = [ + "google.cloud.bigtable_admin_v2" + "google.cloud.bigtable_v2" + "google.cloud.bigtable" + ]; + meta = with lib; { description = "Google Cloud Bigtable API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index ce21a27209fd..d3fea60d33b3 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9"; + sha256 = "sha256-59k8o5ndb7X9D5kZAkhTHJxYPRqF580snuSFSVRZ7ng="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 0115524d5467..c7dce6cba118 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TADApBkE4DvEFkVFy56Flh2s6XR9uGxzGTf5aspohsA="; + sha256 = "sha256-blNz/r5CDisjddIlKychKfEaN/8biKdYcyKTEGO+jTg="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 4c8c79c7ddae..dae19022d06c 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.1.0"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; + sha256 = "sha256-56UQdZudVf9jyYPjxCy/XDX5tzEPTWEevjaX2mV2vLQ="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # directory shadows imports rm -r google - # requires credentials - rm tests/system/test_system.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + ]; + pythonImportsCheck = [ "google.cloud.datastore" "google.cloud.datastore_admin_v1" diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 47f0522e1a6c..4674c1ce1dd1 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "193c2c012639f0c063999e0b899f92d70763be605d5528f3d1da93d6734a1aa8"; + sha256 = "sha256-sPSPx5Y36MOjd81D8qDMpkWJ3YWQfRlEHqBn3N75NB4="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 8a481945efba..8aae0c072a0f 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -21,12 +21,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'google-cloud-logging>=1.14.0, <2.1' 'google-cloud-logging>=1.14.0' + --replace 'google-cloud-logging>=1.14.0, <2.4' 'google-cloud-logging>=1.14.0' ''; - propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; + propagatedBuildInputs = [ + google-cloud-logging + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials @@ -34,8 +43,8 @@ buildPythonPackage rec { "test_report_exception" ]; - # prevent google directory from shadowing google imports preCheck = '' + # prevent google directory from shadowing google imports rm -r google ''; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0aac21ee317..4ff4c920c8ad 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kG68fG9EqwvE72nzc89MXwEQ/YYEM9tYH6zK2iTCFJo="; + sha256 = "sha256-73sKlKHX7ThsdZJyT22wiqbema7o3aOIaWS8WYrri+w="; }; propagatedBuildInputs = [ @@ -39,10 +39,10 @@ buildPythonPackage rec { rm -r google ''; - pytestFlagsArray = [ - # tests are broken - "--ignore=tests/system/test_system.py" - "--ignore=tests/system/test_system_async.py" + disabledTestPaths = [ + # Tests are broken + "tests/system/test_system.py" + "tests/system/test_system_async.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix new file mode 100644 index 000000000000..55d36ac2a7c7 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-iam-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.iam_logging" + "google.cloud.iam_logging_v1" + ]; + + meta = with lib; { + description = "IAM Service Logging client library"; + homepage = "https://github.com/googleapis/python-iam-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 243c2b86c1ee..ddcc20c66bc4 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d34604508e3e87b9161ccd5ff29474867ac91ffb8d29e1a2fc9ff0e26d934b73"; + sha256 = "sha256-H2S3jIVMBinyCQMBHW3vKMmBzlaCpSIQMfauHKoKH+o="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 55efb8e2c2d4..458d5b720c02 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yi3lG7tKi2BkU7vtMIEPsll1UX/JxrNj4G+DJaGQ/+k="; + sha256 = "sha256-BuAqNkK817Zz4dbI16ttoVnapR+8DDrp8RGDZtUej7s="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 7ca698b66452..56932ec48598 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b463704affab327c1d3fa4af280a858635b5f59a88456b2a08db62a336a352aa"; + sha256 = "sha256-7qVemc7siW/8mO4wUXEKJBt9M18kagRyu/+7DLLe9FM="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 1a11fcfc731b..6bce8cc5a89b 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gyqZ+JthC/Qja8ZCX79r4K+evuZY5jPZ73cA6hrgSA="; + sha256 = "sha256-hwZVe3FTLHauxIQJ3KwYnKrEfPLey4hQrnVpS/cDJrI="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc_google_iam_v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com - rm -r tests/unit/pubsub_v1 ''; + disabledTestPaths = [ + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + "tests/unit/pubsub_v1" + ]; + pythonImportsCheck = [ "google.cloud.pubsub" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 8787eb6779a1..9070d2f083e5 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59"; + sha256 = "sha256-2X/ek2ECarZ/U1V6j+nz2yYSGVmrWG/kU/QqQB1A+0w="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0a3285566f19..588918ad62e9 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.1"; + version = "0.32.2"; src = fetchPypi { inherit pname version; - sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; + sha256 = "sha256-UoWu+Y/bmmkefFR4nnxJPFFnS253/myWcXKujq27oCY="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 184044594d52..ac630ba27c4d 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.1.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; + sha256 = "sha256-cyJ58BPB7mYWbmHFxPAxnf2JX0b8kqLJF4hdcppaNNI="; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 726e48ee192b..eae38f5dfc17 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,25 +14,42 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XnOCmxQ6YCO1C7RYHzcZY4ihrt2KommWTkTD9y+B5tg="; + sha256 = "sha256-8o7pr9msuMfIN7UMX+/gppmD3MWXt2hBqb7vcLUE22M="; }; - propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + propagatedBuildInputs = [ + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + sqlparse + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # disable tests which require credentials - rm tests/system/test_{system,system_dbapi}.py - rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + "tests/system/test_system_dbapi.py" + "tests/unit/spanner_dbapi/test_connect.py" + "tests/unit/spanner_dbapi/test_connection.py" + "tests/unit/spanner_dbapi/test_cursor.py" + ]; + pythonImportsCheck = [ "google.cloud.spanner_admin_database_v1" "google.cloud.spanner_admin_instance_v1" diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 2261345f4205..bccc2ad8bac9 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.2.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AviYDI68Z11M/rqHgQTQugYNemPTA5nW4aVQTiwMYxI="; + sha256 = "sha256-mR7gYBvJVhEOhzruGnREHWYiexDNWBGVV1Q1iEOE84s="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 40d70176c5d6..e54a52479828 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.37.0"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IAPF7Uc/mzfQRfMMTIvn0w19Dripe80sWLOovFScTMw="; + sha256 = "sha256-FiAR1m9kuNxdeTZgml2vAGbMUhIxVGrqAsEmpVWURsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index c01c294ec334..d04c996acf91 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6be2f2bca14b4eb1c1bdb0f4ba1dadf791e79a2a3e1fae762e5631a3d9fe094e"; + sha256 = "sha256-fMJNOJBzxAr0Hi/AkUF97G5YrwfbmxKVhT/D1UXIDP4="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index ab4415e3412b..f1cbf3f307ab 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzssVnXA1xe3270yEOREJ9GdmyRPjV1F4EBelf9AQ/c="; + sha256 = "sha256-xQzCG134i2lmgNiqw6tshoIMDk0HHWpdzZtjSkVs9Z8="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 486a71c7a97e..9f814c36c2b3 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; + sha256 = "sha256-NoNHel10dFEzKjjWyM6mUrWZHbH25MOZB/o2eXCKwhg="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index a884919c7e18..b1167433b4c0 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,16 +14,26 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zVRD2lWRaKtSlZn84Rqpj+a1OT7Wcak524TKsBctueE="; + sha256 = "sha256-jNlX9LKajHqYPgpCfCcSUzxBu3AHt2qMyI1sZQdcZ5o="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index f56b00af0a54..c68db2bfece9 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gn/KWf3A4SkTqt9rqwYcsaxvfKXPvb7DXJ+zryGjWIA="; + sha256 = "sha256-CBBt3uyQon9Lxwb3Jn7BxS8r/3Rbr9RxC8aJhGDI6aY="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 5857de341d29..2a98edced7a9 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6XYHADzyk0/WSGk9wni9bOtVURJ+U2Eve8LAh0Eg7KI="; + sha256 = "sha256-Nnqm+f2OSKBRTOpuB7PQBvAaunCA8XoontDfkuh/f4Q="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 971f5cce90e7..5598a98cf839 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lrMnp9jVndz0C8VdreVudYdwh7zSdRniPHYm9BNdjak="; + sha256 = "sha256-Lg6yoqOu88lZHT/H9FPdgVgSDm7oLUaPm7T1UsXB8Fo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix new file mode 100644 index 000000000000..6081f914c646 --- /dev/null +++ b/pkgs/development/python-modules/herepy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "herepy"; + version = "3.5.2"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "abdullahselek"; + repo = "HerePy"; + rev = version; + sha256 = "0z1brgnrzdzfmnydipja4hhrhnz4fwdjy3xa05mz28bwi6z52bcj"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "herepy" ]; + + meta = with lib; { + description = "Library that provides a Python interface to the HERE APIs"; + homepage = "https://github.com/abdullahselek/HerePy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix new file mode 100644 index 000000000000..d1bacfbe826a --- /dev/null +++ b/pkgs/development/python-modules/idasen/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, bleak +, pyyaml +, voluptuous +, pytestCheckHook +, pytest-asyncio +, poetry-core +}: + +buildPythonPackage rec { + pname = "idasen"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "newAM"; + repo = "idasen"; + rev = "v${version}"; + sha256 = "1jdgdby33fd63mnxrfv04dz4fsrikkfmc0ybwwxi816mbkml7n34"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + pyyaml + voluptuous + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "idasen" ]; + + meta = with lib; { + description = "Python API and CLI for the ikea IDÅSEN desk"; + homepage = "https://github.com/newAM/idasen"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index f81ceabd27e1..9081a30ac6be 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 38f6f58910db..21e614d7d7c9 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.17.0"; + version = "1.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z"; + sha256 = "0xgp1wxdfa4y316dfkpmj38chlh68mndr8kqphckpnw16qxsl3d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix new file mode 100644 index 000000000000..4720101d8177 --- /dev/null +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }: + +buildPythonPackage rec { + pname = "itunespy"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "sleepyfran"; + repo = pname; + rev = version; + sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; + }; + + propagatedBuildInputs = [ requests pycountry mypy ]; + + # This module has no tests + doCheck = false; + + pythonImportsCheck = [ "itunespy" ]; + + meta = with lib; { + description = "A simple library to fetch data from the iTunes Store API"; + homepage = "https://github.com/sleepyfran/itunespy"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index b515cd92b23b..8b7146ebef93 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Chinese Words Segementation Utilities"; homepage = "https://github.com/fxsjy/jieba"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 4e762e456ceb..8df7d6f6e00f 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,35 +1,65 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, dataclasses-json +, fetchFromGitHub +, htmlmin +, jinja2 +, markdown2 +, pbr +, pygments +, pytestCheckHook +, pytz +, pyyaml +, requests }: buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.27.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "v${version}"; - sha256 = "0d2a4a2lcqssr5g9rmc76f86nkqc9grixh507vzc9fi1h3gbi765"; + sha256 = "1aj1w0qxdw8d6mf5vngk0xjgs7z8vzwc2aycahnkqg7q3cagq19n"; }; nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ - click dataclasses-json htmlmin jinja2 markdown2 - pygments pytz pyyaml requests + click + dataclasses-json + htmlmin + jinja2 + markdown2 + pygments + pytz + pyyaml + requests ]; preBuild = '' export PBR_VERSION=0.0.1 ''; - checkInputs = [ pytestCheckHook beautifulsoup4 ]; - pytestFlagsArray = [ "--ignore tests/generate_test.py" ]; + checkInputs = [ + beautifulsoup4 + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_references_url" + ]; + + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - homepage = "https://github.com/coveooss/json-schema-for-humans"; - license = licenses.asl20; + homepage = "https://github.com/coveooss/json-schema-for-humans"; + license = licenses.asl20; maintainers = with maintainers; [ astro ]; }; } diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ed6e7755bf15..314bc82cd4fb 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,21 +1,22 @@ { lib +, black , buildPythonPackage +, dataclasses , fetchFromGitHub -, pythonOlder , hypothesis -, dataclasses -, hypothesmith -, pytestCheckHook +, isort +, pytest +, python +, pythonOlder , pyyaml , typing-extensions , typing-inspect -, black -, isort }: buildPythonPackage rec { pname = "libcst"; version = "0.3.18"; + disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi # https://github.com/Instagram/LibCST/issues/331 @@ -26,25 +27,37 @@ buildPythonPackage rec { sha256 = "sha256-19yGaKBLpGASSPv/aSX0kx9lh2JxKExHJDKKtuBbuqI="; }; - disabled = pythonOlder "3.6"; - - propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ] - ++ lib.optional (pythonOlder "3.7") dataclasses; - - checkInputs = [ black hypothesmith isort pytestCheckHook ]; + propagatedBuildInputs = [ + hypothesis + typing-extensions + typing-inspect + pyyaml + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; - # can't run tests due to circular dependency on hypothesmith -> licst - doCheck = false; + checkInputs = [ + black + isort + pytest + ]; preCheck = '' - python -m libcst.codegen.generate visitors - python -m libcst.codegen.generate return_types + ${python.interpreter} -m libcst.codegen.generate visitors + ${python.interpreter} -m libcst.codegen.generate return_types + # Can't run all tests due to circular dependency on hypothesmith -> libcst + rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} ''; + disabledTests = [ + # No files are generated + "test_codemod_formatter_error_input" + ]; + pythonImportsCheck = [ "libcst" ]; meta = with lib; { - description = "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; maintainers = with maintainers; [ ruuda SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 6a6e35367331..f61ace8960da 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.17"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "9a15a8e39f9d0b36c91dfe0f5dd1efc8752cc1d317057840a3dbffd6ee90e068"; + sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 6a39ff347cd5..221410fa3eae 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU="; + sha256 = "sha256-ncw8ILOD+i5aW78opv62VRcV58MQb5IG33MGTqNgDRk="; }; propagatedBuildInputs = [ @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt --replace "dnspython3" "dnspython" - ''; - pythonImportsCheck = [ "mcstatus" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix new file mode 100644 index 000000000000..eec3da25e0f2 --- /dev/null +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipykernel +, isPy27 +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "metakernel"; + version = "0.27.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy"; + }; + + propagatedBuildInputs = [ ipykernel ]; + + # Tests hang, so disable + doCheck = false; + + meta = with lib; { + description = "Jupyter/IPython Kernel Tools"; + homepage = "https://github.com/Calysto/metakernel"; + license = licenses.bsd3; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 5ae4d0b280f5..e104dbff4f62 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/GV5ZhrJxeChcYwmH/9FsLceAYRSeTCDe4lMEwdTa8Y="; + sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 1e38f401a43d..129275b2987f 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,17 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , requests -, testfixtures, mock, requests_toolbelt -, betamax, betamax-serializers, betamax-matchers, pytest +, testfixtures +, mock +, requests_toolbelt +, betamax +, betamax-serializers +, betamax-matchers +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "prawcore"; - version = "2.0.0"; - disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 + version = "2.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tJjZtvVJkQBecn1SNcj0nqW6DJpteT+3Q7QPoInNNtE="; + sha256 = "08wiij1r3flpnqzdx8bf536yf7lqyhg9461aybhcykcw8nnjzr5x"; }; propagatedBuildInputs = [ @@ -25,18 +33,16 @@ buildPythonPackage rec { betamax-serializers betamax-matchers requests_toolbelt - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "prawcore" ]; meta = with lib; { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; - license = licenses.gpl3; + license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pydes/default.nix b/pkgs/development/python-modules/pydes/default.nix new file mode 100644 index 000000000000..78f131d42437 --- /dev/null +++ b/pkgs/development/python-modules/pydes/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pydes"; + version = "unstable-2019-01-08"; + + src = fetchFromGitHub { + owner = "twhiteman"; + repo = "pyDes"; + rev = "e988a5ffc9abb8010fc75dba54904d1c5dbe83db"; + sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; + }; + + checkPhase = "python test_pydes.py"; + + pythonImportsCheck = [ "pyDes" ]; + + meta = with lib; { + description = "A pure python module which implements the DES and Triple-DES encryption algorithms"; + homepage = "https://github.com/twhiteman/pyDes"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix new file mode 100644 index 000000000000..86adb4e3e14a --- /dev/null +++ b/pkgs/development/python-modules/pypca/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, colorlog +, fetchPypi +, pythonOlder +, pyserial +}: + +buildPythonPackage rec { + pname = "pypca"; + version = "0.0.13"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y0p2rm22x21mykipiv42fjc79b0969qsbhk3cqkrdnqwh5psbdl"; + }; + + propagatedBuildInputs = [ + colorlog + pyserial + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pypca" ]; + + meta = with lib; { + description = "Python library for interacting with the PCA 301 smart plugs"; + homepage = "https://github.com/majuss/pypca"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 9615e07d7c74..edefbf16ca2d 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "1s01dd5n6cgjg24dmji0abxkyvr1yi18lx4rpm9z54v0q3wkccg9"; + sha256 = "0i0ggizkgd809ylz74j1v5lfpyifz3wypj6f8l8fr5ad7a7r9s09"; }; postPatch = '' @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozillazg/python-pinyin"; changelog = "https://github.com/mozillazg/python-pinyin/blob/master/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index e1e0578c83b8..f25283dbbbcc 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages"; homepage = "https://github.com/nipunsadvilkar/pySBD"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix new file mode 100644 index 000000000000..1f08eb14180c --- /dev/null +++ b/pkgs/development/python-modules/pysml/default.nix @@ -0,0 +1,37 @@ +{ lib +, async-timeout +, bitstring +, buildPythonPackage +, fetchFromGitHub +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "pysml"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "mtdcr"; + repo = pname; + rev = version; + sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + }; + + propagatedBuildInputs = [ + async-timeout + bitstring + pyserial-asyncio + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sml" ]; + + meta = with lib; { + description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; + homepage = "https://github.com/mtdcr/pysml"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 49113dfad5ef..bd8933be824c 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , redis @@ -30,6 +31,10 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ionelmc/python-redis-lock/issues/86 "test_no_overlap2" + ] ++ lib.optionals stdenv.isDarwin [ + # fail on Darwin because it defaults to multiprocessing `spawn` + "test_reset_signalizes" + "test_reset_all_signalizes" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 911983691013..34ef2355905a 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.7.0"; + version = "6.7.1"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-Y0h5Aiu85/EWCmSc+eCtK6ZaPuu/LYZiwhXOx0XhfwQ="; + sha256 = "0g9yifv3p3zbcxbcdyg4p9k3vwvaq0vym40j3yrv534m4qbynwhk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix new file mode 100644 index 000000000000..d1471286bb84 --- /dev/null +++ b/pkgs/development/python-modules/simber/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: + +buildPythonPackage rec { + pname = "simber"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + }; + + propagatedBuildInputs = [ colorama ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "simber" ]; + + meta = with lib; { + description = "Simple, minimal and powerful logger for Python"; + homepage = "https://github.com/deepjyoti30/simber"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 8bdb69a3074e..336a371c0714 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }: +{ lib, fetchurl, buildPythonPackage, antlr2, isPy3k }: buildPythonPackage rec { pname = "PyStringTemplate"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; - propagatedBuildInputs = [ antlr ]; + propagatedBuildInputs = [ antlr2 ]; disabled = isPy3k; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index dbf0f26c3a3f..041b102ce348 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.17.5"; + version = "1.21.1"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m"; + sha256 = "sha256-mTyDfvdFrd+XKifXv7oM5Riihj0aUOBzclW3ZNI+DvI="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/unidic-lite/default.nix b/pkgs/development/python-modules/unidic-lite/default.nix new file mode 100644 index 000000000000..eec9c7022a0d --- /dev/null +++ b/pkgs/development/python-modules/unidic-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "unidic-lite"; + version = "1.0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv"; + }; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "unidic_lite" + ]; + + meta = with lib; { + description = "A small version of UniDic"; + homepage = "https://github.com/polm/unidic-lite"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 14cac4998831..d3881032af13 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -5,11 +5,10 @@ , buildPythonPackage , libiconv }: -let + +buildPythonPackage rec { pname = "wasmer"; version = "1.0.0"; -in buildPythonPackage rec { - inherit pname version; src = fetchFromGitHub { owner = "wasmerio"; diff --git a/pkgs/development/python-modules/youtube-search/default.nix b/pkgs/development/python-modules/youtube-search/default.nix new file mode 100644 index 000000000000..41424aa56d2e --- /dev/null +++ b/pkgs/development/python-modules/youtube-search/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "youtube-search"; + version = "unstable-2021-02-27"; + + src = fetchFromGitHub { + owner = "joetats"; + repo = "youtube_search"; + rev = "886fe1b16c829215ee0984b6859f874b4a30d875"; + sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo="; + }; + + propagatedBuildInputs = [ requests ]; + + # Check disabled due to relative import with no known parent package + doCheck = false; + pythonImportsCheck = [ "youtube_search" ]; + + meta = with lib; { + description = "Tool for searching for youtube videos to avoid using their heavily rate-limited API"; + homepage = "https://github.com/joetats/youtube_search"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 545c9e165a12..67d9e39af62c 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "scheme-bytestructures"; - version = "1.0.7"; + version = "1.0.10"; src = fetchFromGitHub { owner = "TaylanUB"; repo = pname; rev = "v${version}"; - sha256 = "0q0habjiy3h9cigb7q1br9kz6z212dn2ab31f6dgd3rrmsfn5rvb"; + sha256 = "04oDvwvzTRzAVyywbcCm3Ug3p3xNbxjI7nOKYakEZZI="; }; postConfigure = '' diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile b/pkgs/development/tools/analysis/brakeman/Gemfile new file mode 100644 index 000000000000..1ff5490b0a77 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "brakeman" diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock new file mode 100644 index 000000000000..13425cf9ee76 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + brakeman (5.0.4) + +PLATFORMS + ruby + +DEPENDENCIES + brakeman + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 3ac6b34f9488..72c4b1fbc3e3 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -1,11 +1,11 @@ -{ lib, ruby, buildRubyGem }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "brakeman"; - version = "5.0.0"; - source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; +bundlerApp rec { + pname = "brakeman"; + exes = [ "brakeman" ]; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "brakeman"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix new file mode 100644 index 000000000000..f37158353e00 --- /dev/null +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -0,0 +1,12 @@ +{ + brakeman = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd"; + type = "gem"; + }; + version = "5.0.4"; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8d76b8925dc7..c1060744f449 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -2,30 +2,54 @@ , buildGoModule , fetchFromGitHub , protobuf +, git }: buildGoModule rec { pname = "buf"; - version = "0.41.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog="; + sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + leaveDotGit = true; # Required by TestWorkspaceGit }; + vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; patches = [ ./skip_test_requiring_network.patch ]; + nativeBuildInputs = [ protobuf ]; + checkInputs = [ git ]; + + ldflags = [ "-s" "-w" ]; + preCheck = '' export PATH=$PATH:$GOPATH/bin + # To skip TestCloneBranchAndRefToBucket + export CI=true ''; - nativeBuildInputs = [ protobuf ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + dir="$GOPATH/bin" + # Only install required binaries, don't install testing binaries + for file in \ + "buf" \ + "protoc-gen-buf-breaking" \ + "protoc-gen-buf-lint" \ + "protoc-gen-buf-check-breaking" \ + "protoc-gen-buf-check-lint"; do + cp "$dir/$file" "$out/bin/" + done - vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc="; + runHook postInstall + ''; meta = with lib; { description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ce3264e1adde..d154adbdc1be 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.12.0"; + version = "14.0.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 = "0m0r295520jy45wn8jw3jzhiixl4c6yrfx7gvgbd4c1v4y8ivrci"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; + sha256 = "156dm6kg154fyn3axgw7kcpq9xz8mxdyhch8snp0vxzh941sc74w"; }; docker_arm = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0syfggplp19bbmhhpyc17h0f1dii9hc6n04q483l0xdk7sv39fwx"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; + sha256 = "0cnjbcc3bdiahff3iyxwppj9gwaj7r7x80hk2cv2q4hkdpsji655"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "01ajl7zka5fnph5zcnp3z6ir8xr81wzkam69gxazwjb3nbs642an"; + sha256 = "14g78m5h5d02k04lc07jc8yp7sqmfkjif589rb8wkb9jmbh7glmi"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 40238d0effa4..45b5f185880d 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qttools, sqlite }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ antlr qtbase sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 133db2d9ff00..3045842d91f0 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr"; + sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; }; - vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq"; + vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index c8339fe6d851..0b1e8d16b65a 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.4"; + version = "3.14.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; + sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-hyupBMRKuw77SJNIk3mEUixV0LV5mEmZx8M70qGmYJY="; + vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 2f7c088cd486..d7715d67acb4 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ , freeimage, libGL }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "gamecube-tools"; nativeBuildInputs = [ autoreconfHook ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "gamecube-tools"; rev = "v${version}"; - sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; + sha256 = "sha256-0iMY2LokfsYgHzIuFc8RlrVlJCURqVqprP54PG4oW0M="; }; meta = with lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index f4ff5dd2b946..32af811c0005 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.41.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-ogH3L2EG0xdGpCaEfMUYnCWyFTGgx/C/O54mMxcJSBA="; + sha256 = "sha256-7xokU2uw7oiXhirTKuNfqJ143PlnI7M1zSixT0S6jtE="; }; - vendorSha256 = "sha256-gYulktNetcgXk43Ydk4+WEMZMFCrmx6p5VnsFIJdQhk="; + vendorSha256 = "sha256-s0ZFQJIhF23FtLol1Gegljf6eyGkCmVxTKmHbQBtPvM="; doCheck = false; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index dfef3906602c..1220ec90d90f 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo="; + sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index e297de7a0db0..5493bf24428d 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib rdkafka yajl ]; + buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; preConfigure = '' patchShebangs ./configure diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix new file mode 100644 index 000000000000..b7a5b1dc7eb8 --- /dev/null +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, cmake +, llvmPackages_11 +, unstableGitUpdater +}: + +let + c2ffiBranch = "llvm-11.0.0"; + llvmPackages = llvmPackages_11; +in + +llvmPackages.stdenv.mkDerivation { + pname = "c2ffi-${c2ffiBranch}"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "rpav"; + repo = "c2ffi"; + rev = "0255131f80b21334e565231331c2b451b6bba8c4"; + sha256 = "0ihysgqjyg5xwi098hxf15lpdi6g4nwpzczp495is912c48fy6b6"; + }; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rpav/c2ffi.git"; + branch = c2ffiBranch; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.clang + llvmPackages.libclang + ]; + + # This isn't much, but... + doInstallCheck = true; + installCheckPhase = '' + $out/bin/c2ffi --help 2>&1 >/dev/null + ''; + + # LLVM may be compiled with -fno-rtti, so let's just turn it off. + # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: + # undefined reference to `typeinfo for clang::ASTConsumer' + CXXFLAGS="-fno-rtti"; + + meta = with lib; { + homepage = "https://github.com/rpav/c2ffi"; + description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 262d8c4945eb..336cbef9bae0 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q="; + sha256 = "0jvyqynhg2fva29bzj4wrg3f22xpvl1hdf9kqws2c3wdiz9lc8l4"; }; - cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; + cargoSha256 = "1jijpm4k3py09k9w9a2zj1795r02wsa53r4sxa4ws96d4gkv4x5b"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 117ac7ba00a3..48250297e496 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "1p6k5al8vvafz2w4z27jnyw8w2cp316h70dlx40ir4c3lk511n2j"; + sha256 = "0idx4664p9ggv8p2pwgpch42li9ksiilszpwva19y4fa5xrmcyr2"; }; - cargoSha256 = "0ssfny11pv2b4zz7lh28cv603slp54pbcgj18y9k7b6jjajrz67q"; + cargoSha256 = "1hc7zvrfiiijk4wr6i5jk6k32nz0lf64gqin3n8b8x5pp9d8fcfk"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index eb12f9e1dcd7..6ff541b933c4 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.2"; + version = "4.25.4"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + sha256 = "94ade97d79e6949022ac45e4f8f9c025a9e3efa54a1a891a086a24eb9a9765a7"; }; dontBuild = true; diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix new file mode 100644 index 000000000000..49d28cb17ee8 --- /dev/null +++ b/pkgs/development/web/protege-distribution/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, unzip, jre8, copyDesktopItems, makeDesktopItem }: + +stdenv.mkDerivation rec { + pname = "protege-distribution"; + version = "5.5.0"; + + src = fetchurl { + url = "https://github.com/protegeproject/protege-distribution/releases/download/v${version}/Protege-${version}-platform-independent.zip"; + sha256 = "092x22wyisdnhccx817mqq15sxqdfc7iz4whr4mbvzrd9di6ipjq"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + postPatch = '' + # Delete all those commands meant to change directory to the source directory + sed -i -e '3,9d' run.sh + + # Change directory to where the application is stored to avoid heavy patching + # of searchpaths + sed -i -e "2a\ + cd $out/protege" run.sh + + # Set the correct Java executable (Protege is a JRE 8 application) + substituteInPlace run.sh \ + --replace "java -X" "exec ${jre8.outPath}/bin/java -X" \ + + # Silence console logs, since these are not shown in graphical environments + sed -i -e '4,8d;21d' conf/logback.xml + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + + # Delete non-Linux launch scripts + rm run.{bat,command} + + # Move launch script into /bin, giving it a recognizable name + install -D run.sh $out/bin/run-protege + + # Copy icon to where it can be found + install -D app/Protege.ico $out/share/icons/hicolor/128x128/apps/protege.ico + + # Move everything else under protege/ + mkdir $out/protege + mv {bin,bundles,conf,plugins} $out/protege + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Protege"; + desktopName = "Protege Desktop"; + icon = "protege.ico"; + comment = "OWL2 ontology editor"; + exec = "run-protege"; + }) + ]; + + meta = with lib; { + description = "The OWL2 ontology editor from Stanford, with third-party plugins included"; + homepage = "https://protege.stanford.edu/"; + downloadPage = "https://protege.stanford.edu/products.php#desktop-protege"; + maintainers = with maintainers; [ nessdoor ]; + license = with licenses; [ asl20 bsd2 epl10 lgpl3 ]; + platforms = platforms.linux; + }; +} |