Unverified Commit d32585d4 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 33859d60 ffd548d5

pkgs/applications/audio/spek/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }:

{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:



stdenv.mkDerivation rec {

  pname = "spek";

  version = "0.8.4";

  version = "0.8.5";



  src = fetchFromGitHub {

    owner = "alexkay";

    repo = "spek";

    rev = "v${version}";

    sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU=";

    sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg=";

  };



  nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];



  buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ];

  buildInputs = [ ffmpeg wxGTK32 gtk3 ];



  meta = with lib; {

    description = "Analyse your audio files by showing their spectrogram";

pkgs/applications/networking/cluster/terraform-providers/providers.json

+19 −19
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ 
    "vendorHash": null

  },

  "aws": {

    "hash": "sha256-cmE7jJO49CuYdiKjrPaHhNCFoMbT0z4uSnFdC7Fnd9g=",

    "hash": "sha256-oD8I7wWLdn9Yv6naRcq0myg1L2DcvP/a6VL/fUfdC+g=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",

    "owner": "hashicorp",

    "repo": "terraform-provider-aws",

    "rev": "v4.65.0",

    "rev": "v4.66.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-UvbuWjxlou7lwvU5D6DaEXuCFvn8ECTbkNvKGrHwsu8="

    "vendorHash": "sha256-tetNRSjQTgFzFLSdmRL6f+UlwKp62zr00JzFXJs8nMs="

  },

  "azuread": {

    "hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=",
@@ -566,13 +566,13 @@ 
    "vendorHash": null

  },

  "ibm": {

    "hash": "sha256-YIabiu1o2+gJ6ZK5F1PRnVqKP3gbhD96FkDfytX8Hak=",

    "hash": "sha256-0ZIm6OTVTfbWcPMWsLNxmD3QDDbB72lvwsISkiWzcFQ=",

    "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",

    "owner": "IBM-Cloud",

    "repo": "terraform-provider-ibm",

    "rev": "v1.52.1",

    "rev": "v1.53.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-BTt21bR4kgzyAuS3flalgOJuRxVPwwNOIR2nj2zdw9E="

    "vendorHash": "sha256-bcCiNWwVSLI3F3ikTx8z/TtkbgjLAB8puSFTC9LTEMU="

  },

  "icinga2": {

    "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -819,13 +819,13 @@ 
    "vendorHash": null

  },

  "okta": {

    "hash": "sha256-pSGoD4WSfw6lTJTn/Yf8k60CtbPjZeEPJ7mH1c6cRD0=",

    "hash": "sha256-NUczAdOYpqpHGpE2OaJtziggA5o+CUYSq2F/RkTL7YU=",

    "homepage": "https://registry.terraform.io/providers/okta/okta",

    "owner": "okta",

    "repo": "terraform-provider-okta",

    "rev": "v3.46.0",

    "rev": "v4.0.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM="

    "vendorHash": "sha256-LjYPZaF8vy1WUNeI/TFIDjVh08sxf6nKLpvmQsCQFFo="

  },

  "oktaasa": {

    "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@@ -855,13 +855,13 @@ 
    "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="

  },

  "opentelekomcloud": {

    "hash": "sha256-bRvs4IxnUObX/ChPdCn97VUQSxTjV2tfnmBmWmgAXUA=",

    "hash": "sha256-WgddD3gy8pTRAtkh6FHqFzN15aLkFz7KnPFUN0MS56Q=",

    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",

    "owner": "opentelekomcloud",

    "repo": "terraform-provider-opentelekomcloud",

    "rev": "v1.34.2",

    "rev": "v1.34.3",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-VEreMBvqvBGUZz5EY5+0jbNDOVbmhYerfLYGa1rl+aw="

    "vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY="

  },

  "opsgenie": {

    "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@@ -1180,12 +1180,12 @@ 
    "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="

  },

  "vault": {

    "hash": "sha256-etQTHPZ1bngVMpeQ/IZ8yaoe94ZPNT2IG4ip4d+73Xg=",

    "hash": "sha256-eTHdmow16TJ/uJ4M5yFiYrwuYo4kYSnkPXymxAYVjuw=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/vault",

    "owner": "hashicorp",

    "proxyVendor": true,

    "repo": "terraform-provider-vault",

    "rev": "v3.15.1",

    "rev": "v3.15.2",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="

  },
@@ -1235,11 +1235,11 @@ 
    "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="

  },

  "vultr": {

    "hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=",

    "hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=",

    "homepage": "https://registry.terraform.io/providers/vultr/vultr",

    "owner": "vultr",

    "repo": "terraform-provider-vultr",

    "rev": "v2.14.1",

    "rev": "v2.15.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -1253,13 +1253,13 @@ 
    "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="

  },

  "yandex": {

    "hash": "sha256-UFAWifGu/3QKH8JLBYObLhO/PdCQ1f5e9hmehF8grak=",

    "hash": "sha256-ij/KKv/e3KzT5c5KbsW7LszsqzVgwPF2jrnRFOw0uxw=",

    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",

    "owner": "yandex-cloud",

    "proxyVendor": true,

    "repo": "terraform-provider-yandex",

    "rev": "v0.89.0",

    "rev": "v0.90.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-RfSPCBDb4crv6GZPhsVSQOWnZ3xHa/VWln5pSg68Exg="

    "vendorHash": "sha256-5pzIvNVgfFT4j18JNHxJ5ZappuS9nFjlpPC3dcsIQRQ="

  }

}

pkgs/development/libraries/science/math/faiss/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ assert cudaSupport -> nvidia-thrust.cudaSupport; 


let

  pname = "faiss";

  version = "1.7.2";

  version = "1.7.4";



  inherit (cudaPackages) cudaFlags backendStdenv;

  inherit (cudaFlags) cudaCapabilities dropDot;
@@ -64,7 +64,7 @@ stdenv.mkDerivation { 
    owner = "facebookresearch";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg=";

    hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";

  };



  buildInputs = [

pkgs/development/libraries/science/math/faiss/tests.nix

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ buildPythonPackage { 
  pname = "faiss-pytest-suite";

  inherit (faiss) version;



  format = "other";



  src = "${faiss.src}/tests";



  dontBuild = true;
@@ -21,6 +23,11 @@ buildPythonPackage { 
    "test_contrib.py"

  ];



  disabledTests = [

    # https://github.com/facebookresearch/faiss/issues/2836

    "test_update_codebooks_with_double"

  ];



  nativeCheckInputs = [

    faiss

    pytestCheckHook

pkgs/development/libraries/tclx/default.nix

+12 −7
Original line number Diff line number Diff line 
{ lib, fetchurl, tcl }:

{ lib

, fetchFromGitHub

, tcl

}:



tcl.mkTclDerivation rec {

  pname = "tclx";

  version = "8.4.1";

  version = "8.6.1";



  src = fetchurl {

    url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2";

    sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59";

  src = fetchFromGitHub {

    owner = "flightaware";

    repo = "tclx";

    rev = "v${version}";

    hash = "sha256-HdbuU0IR8q/0g2fIs1xtug4oox/D24C8E2VbEJC5B1A=";

  };



  # required in order for tclx to properly detect tclx.tcl at runtime
@@ -17,9 +22,9 @@ tcl.mkTclDerivation rec { 
  '';



  meta = {

    homepage = "https://tclx.sourceforge.net/";

    homepage = "https://github.com/flightaware/tclx";

    description = "Tcl extensions";

    license = lib.licenses.tcltk;

    maintainers = with lib.maintainers; [ kovirobi ];

    maintainers = with lib.maintainers; [ kovirobi fgaz ];

  };

}