Merge master into staging-next

NixOS · May 22, 2022 · deef19c · deef19c
2 parents dbef850 + 3b468e6
commit deef19c
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 167 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -13,7 +13,7 @@
 # To not have to set the option in every repository it is needed in,
 # save the following script in your path with the name "git-bblame"
 # now you can run
-# $ git bblame $FILE
+# $ git blame $FILE
 # to use the .git-blame-ignore-revs file if it is present.
 #
 # #!/usr/bin/env bash

diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix
@@ -19,20 +19,20 @@
 
 stdenv.mkDerivation rec {
   pname = "amberol";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = pname;
     rev = version;
-    hash = "sha256-mbRBLhnALPFoHwvx05o0lH5Ld4BN+hPY2OyajgTFsek=";
+    hash = "sha256-cY4VZRtmDrIgjHa5pMOVO+lpPU+VHhLonpwTxKn834M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-/5AHwbolEWsj3ChLFJxQaccfookEGvSSkehw0THYnSE=";
+    hash = "sha256-z3R2UG31s7lV6c+dNChMvzimXfPbxDvuOL+Nduxwawg=";
   };
 
   postPatch = ''

diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix
@@ -1,18 +1,18 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+{ lib, buildGoModule, fetchFromGitHub, testVersion, lndconnect }:
+buildGoModule rec {
   pname = "lndconnect";
-  version = "0.2.0";
-
-  goPackagePath = "github.com/LN-Zap/lndconnect";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "LN-Zap";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zp23vp4i4csc6x1b6z39rqcmknxd508x6clr8ckdj2fwjwkyf5a";
+    sha256 = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Generate QRCode to connect apps to lnd Resources";
@@ -22,4 +22,3 @@ buildGoPackage rec {
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/applications/blockchains/lndconnect/deps.nix b/pkgs/applications/blockchains/lndconnect/deps.nix
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage {
+buildGoModule rec {
   pname = "autospotting";
-  version = "unstable-2018-11-17";
-  goPackagePath = "github.com/AutoSpotting/AutoSpotting";
+  version = "unstable-2022-02-17";
 
   src = fetchFromGitHub {
-    owner = "AutoSpotting";
+    owner = "cloudutil";
     repo = "AutoSpotting";
-    rev = "122ab8f292a2f718dd85e79ec22acd455122907e";
-    sha256 = "0p48lgig9kblxvgq1kggczkn4qdbx6ciq9c8x0179i80vl4jf7v6";
+    rev = "f295a1f86c4a21144fc7fe28a69da5668fb7ad0c";
+    sha256 = "sha256-n5R5RM2fv3JWqtbSsyb7GWS4032dkgcihAKbpjB/5PM=";
   };
 
-  # patching path where repository used to exist
-  postPatch = ''
-    sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go
-  '';
+  vendorSha256 = "sha256-w7OHGZ7zntu8ZlI5gA19Iq7TKR23BQk9KpkUO+njL9Q=";
+
+  excludedPackages = [ "scripts" ];
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
-    homepage = "https://github.com/AutoSpotting/AutoSpotting";
     description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes";
-    license = licenses.free;
-    maintainers = [ maintainers.costrouc ];
+    homepage = "https://github.com/cloudutil/AutoSpotting";
+    license = licenses.osl3;
+    maintainers = with maintainers; [ costrouc ];
     mainProgram = "AutoSpotting";
     platforms = platforms.unix;
   };
-
 }
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib bzip2 xz ];
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of `cupsfilter';
+  #     foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   installPhase = ''
     install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin
   '';

diff --git a/pkgs/applications/science/logic/zchaff/default.nix b/pkgs/applications/science/logic/zchaff/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl }:
+{ lib, clangStdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+clangStdenv.mkDerivation rec {
   pname = "zchaff";
   version = "2004.5.13";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./sat_solver.patch ];
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ];
+  makeFlags = [ "CC=${clangStdenv.cc.targetPrefix}c++" ];
   installPhase= ''
     runHook preInstall
     install -Dm755 -t $out/bin zchaff

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
@@ -22,13 +22,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2022.Q2.1";
+  version = "2022.Q2.2";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "MJTpPzmIcTf4/RNte1oDYmn6/wLUJrHM2igrGgXIVqI=";
+    sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
   };
 
   buildInputs = [

diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.77.0";
+  version = "1.77.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs=";
+    sha256 = "sha256-S0HXIjZI48A+tMv+gT8UfYqmCI4NOwWAFykfhW73WPc=";
   };
 
   vendorSha256 = null;
@@ -17,8 +17,13 @@ buildGoModule rec {
     # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
     # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web
     #
-    # This appears to be some of test server for development purposes only.
+    # This appears to be some kind of test server for development purposes only.
     rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
+
+    # Increase timeouts in tests to prevent failure on heavily loaded builders
+    substituteInPlace lib/storage/storage_test.go \
+      --replace "time.After(10 " "time.After(120 " \
+      --replace "time.After(30 " "time.After(120 "
   '';
 
   ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];

diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     platforms = postgresql.meta.platforms;
     maintainers = [ maintainers.marsam ];
-    broken = versionOlder postgresql.version "10";
+    broken = versions.major postgresql.version != "11";
   };
 }
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
@@ -11,11 +11,11 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "212";
+  version = "213";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "sha256-Kr8OHArnLR9AwN/s5QUSzX/puINkK1eu869OaFz3nlw=";
+    sha256 = "sha256-l2kdV1QUGsS3D6Y/b485iDmQcBNIzaBywxhqfRDINX8=";
   };
 
   outputs = [ "out" "man" ];