Unverified Commit ce5d58b0 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 83fd7330 f57e1a41

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

+2 −2
Original line number Diff line number Diff line
@@ -851,11 +851,11 @@ 
    "vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="

  },

  "loafoe_htpasswd": {

    "hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=",

    "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",

    "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd",

    "owner": "loafoe",

    "repo": "terraform-provider-htpasswd",

    "rev": "v2.0.0",

    "rev": "v2.1.0",

    "spdx": "MIT",

    "vendorHash": "sha256-1gzJdcSvFPE8Spkwxe24U7DUyrz4qpDoFVHm6vCWF6A="

  },

pkgs/applications/video/kodi/addons/trakt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
buildKodiAddon rec {

  pname = "trakt";

  namespace = "script.trakt";

  version = "3.6.1";

  version = "3.8.2";



  src = fetchzip {

    url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";

    sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo=";

    sha256 = "sha256-75neHPVWpHhzMIOfNFvvX/Xqy3n1DO3SGg16zv/r9dU=";

  };



  propagatedBuildInputs = [

pkgs/by-name/au/audiobookshelf/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 


let

  source = {

    version = "2.33.0";

    hash = "sha256-jHwSJm1VB0W3/sIas39wgvcn+K62DyKJqMdO0kbSgeY=";

    npmDepsHash = "sha256-PvtnkQytGkKS2MYwpwAGd5F2CrsVKJ2lLbS46ta5a5c=";

    clientNpmDepsHash = "sha256-+ivzzGLWPCnXWJt6Z6jzXkzMjzXWUK4iRfmF+gUSKEo=";

    version = "2.33.1";

    hash = "sha256-O1AurSUq3MNcSchQlC/UfPO2KoB4dBBsONAQ2Bmxk9o=";

    npmDepsHash = "sha256-NVHKPiT4GFiFVVyO7z/fZtU8Zf4o/LM1PmUs6zwzZF0=";

    clientNpmDepsHash = "sha256-KWGnFeXxOVGqAruB9k/FqQfQNG6JrZFUQpo0Ls8jEYA=";

  };



  src = fetchFromGitHub {

pkgs/by-name/au/autotier/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { 
    })

  ];



  postPatch = ''

    # Fix build with boost 1.89+ where boost_system stub library has been removed

    substituteInPlace makefile --replace-fail "-lboost_system" ""

  '';



  # Required by rocksdb after 10.7.5

  env.EXTRA_CFLAGS = "-std=c++20 -fno-char8_t";

pkgs/by-name/cv/cvc5/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "cvc5";

  version = "1.3.2";

  version = "1.3.3";



  src = fetchFromGitHub {

    owner = "cvc5";

    repo = "cvc5";

    tag = "cvc5-${finalAttrs.version}";

    hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";

    hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";

  };



  __structuredAttrs = true;