Merge staging-next into staging

2020-12-17 00:42:56 +00:00
parent 2f14c7f550 74b8783c49
commit c40424f79b
41 changed files with 558 additions and 172 deletions
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:

 stdenv.mkDerivation rec {
-  version = "3.2p3";
+  version = "3.2p4";
  pname = "libow";

  src = fetchFromGitHub {
    owner = "owfs";
    repo = "owfs";
    rev = "v${version}";
-    sha256 = "02l3r4ixhicph5iqxdjanck2gbqkfs9vnnac112bzlvlw3x9r03m";
+    sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s";
  };

  nativeBuildInputs = [ autoconf automake pkgconfig ];
@@ -162,15 +162,11 @@ stdenv.mkDerivation {

  # This prevents cmake from using libraries in impure paths (which
  # causes build failure on non NixOS)
-  # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
-  # what appears to be some stray headers in dnn/misc/tensorflow
-  # in contrib when generating the Python bindings:
  patches = [
    ./cmake-don-t-use-OpenCVFindOpenEXR.patch
  ] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
  postPatch = ''
    sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
-    sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
  '';

  preConfigure =
@@ -4,12 +4,12 @@
 }:

 buildPythonPackage rec {
-  version = "1.5.7";
+  version = "1.5.8";
  pname = "bids-validator";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2";
+    sha256 = "5b8c3b9047d2e00e25746d55f56f62071f0a82dd2de59371a1ee589fe28b2852";
  };

  # needs packages which are not available in nixpkgs
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "django-cors-headers";
-  version = "3.5.0";
+  version = "3.6.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a";
+    sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f";
  };

  propagatedBuildInputs = [ django ];
@@ -9,12 +9,12 @@

 buildPythonPackage rec {
  pname = "docplex";
-  version = "2.18.200";
+  version = "2.19.202";

  # No source available from official repo
  src = fetchPypi {
    inherit pname version;
-    sha256 = "340848e67e1389b32b44d16a100aed1ebb0a6f0519b0f3cbce7cd0de6478fd6c";
+    sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b";
  };

  propagatedBuildInputs = [
@@ -3,11 +3,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-runtimeconfig";
-  version = "0.32.0";
+  version = "0.32.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a";
+    sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad";
  };

  disabled = pythonOlder "3.5";
@@ -11,11 +11,11 @@

 buildPythonPackage rec {
  pname = "howdoi";
-  version = "2.0.7";
+  version = "2.0.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "09362f7390119dffd83c61a942801ad4d19aee499340ef7e8d5871167391d3d6";
+    sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb";
  };

  postPatch = ''
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "influxdb-client";
-  version = "1.12.0";
+  version = "1.13.0";

  disabled = pythonOlder "3.6"; # requires python version >=3.6

@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "influxdata";
    repo = "influxdb-client-python";
    rev = "v${version}";
-    sha256 = "0b4xr8nwrnikj2rnyrrcl6pym2il8iirr9f9cyg6vzfgx8l8brk9";
+    sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q";
  };

  # makes test not reproducible
@@ -18,12 +18,12 @@

 buildPythonPackage rec {
  pname = "pyatv";
-  version = "0.7.4";
+  version = "0.7.5";
  src = fetchFromGitHub {
    owner = "postlund";
    repo = pname;
    rev = "v${version}";
-    sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi";
+    sha256 = "06qj6r9kcal2nimg8rpjfid8rnlz43l7hn0v9v1mpayjmv2fl8sp";
  };

  nativeBuildInputs = [ pytestrunner];
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, async_generator, rsa, pyaes, pythonOlder }:
+{ lib, buildPythonPackage, fetchPypi, openssl, async_generator, rsa, pyaes, pythonOlder }:

 buildPythonPackage rec {
  pname = "telethon";
@@ -10,6 +10,11 @@ buildPythonPackage rec {
    sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m";
  };

+  patchPhase = ''
+    substituteInPlace telethon/crypto/libssl.py --replace \
+      "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'"
+  '';
+
  propagatedBuildInputs = [
    rsa
    pyaes
@@ -1,22 +1,24 @@
-From 6ab08bc1c889e4fb9a39432b1a654eaa19ee65eb Mon Sep 17 00:00:00 2001
-From: Austin Seipp <aseipp@pobox.com>
-Date: Fri, 2 May 2014 12:28:23 -0500
-Subject: [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+From 40239d92957f1969652cdd41d6d2749c41ac4338 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Fri, 31 Jul 2020 09:22:03 +0100
+Subject: [PATCH] [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit

-Signed-off-by: Austin Seipp <aseipp@pobox.com>
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
 ---
- tools/scan-build/ccc-analyzer | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ tools/scan-build/libexec/ccc-analyzer | 8 ++++++++
+ 1 file changed, 8 insertions(+)

-diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer
-index b463ec0..9d39dd0 100755
--- a/tools/scan-build/ccc-analyzer
-+++ b/tools/scan-build/ccc-analyzer
-@@ -207,6 +207,15 @@ sub Analyze {
-       push @Args, "-Xclang", "-analyzer-viz-egraph-ubigraph";
+diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer
+index 800f38b5..0fb50fb3 100755
+--- a/tools/scan-build/libexec/ccc-analyzer
+++ b/tools/scan-build/libexec/ccc-analyzer
+@@ -246,6 +246,14 @@ sub Analyze {
+       push @Args, "-target", $AnalyzerTarget;
     }
 
-+
 +    # Add Nix flags to analysis
 +    if (defined $ENV{'NIX_CFLAGS_COMPILE'}) {
 +      my @nixArgs = split(/\s+/, $ENV{'NIX_CFLAGS_COMPILE'});
@@ -25,9 +27,9 @@ index b463ec0..9d39dd0 100755
 +      }
 +    }
 +
-     my $AnalysisArgs = GetCCArgs("--analyze", \@Args);
+     my $AnalysisArgs = GetCCArgs($HtmlDir, "--analyze", \@Args);
     @CmdArgs = @$AnalysisArgs;
   }
 -- 
-1.8.3.2
+2.27.0

@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
+{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }:

 stdenv.mkDerivation rec {
  pname = "clang-analyzer";
-  version = "3.4";
-
-  src = fetchurl {
-    url    = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
-    sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92";
-  };
+  inherit (llvmPackages.clang-unwrapped) src version;

  patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
-  buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
+  buildInputs = [ clang llvmPackages.clang perl python3 ];
+  nativeBuildInputs = [ makeWrapper ];

  dontBuild = true;

  installPhase = ''
-    mkdir -p $out/bin $out/libexec
-    cp -R tools/scan-view  $out/libexec
-    cp -R tools/scan-build $out/libexec
+    mkdir -p $out/share/scan-view $out/bin
+    cp -R tools/scan-view/share/* $out/share/scan-view
+    cp -R tools/scan-view/bin/* $out/bin/scan-view
+    cp -R tools/scan-build/* $out

-    makeWrapper $out/libexec/scan-view/scan-view $out/bin/scan-view
-    makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build \
+    rm $out/bin/*.bat $out/libexec/*.bat $out/CMakeLists.txt
+
+    wrapProgram $out/bin/scan-build \
      --add-flags "--use-cc=${clang}/bin/clang" \
      --add-flags "--use-c++=${clang}/bin/clang++" \
      --add-flags "--use-analyzer='${llvmPackages.clang}/bin/clang'"
@@ -18,7 +18,7 @@ buildGoModule rec {
    description = "Prometheus service discovery for Equinix Metal";
    homepage = "https://github.com/packethost/prometheus-packet-sd";
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = [ maintainers.andir ];
  };
 }