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

Merge master into staging-next

parents 2d7ec3e6 ac76a342

pkgs/applications/networking/browsers/qutebrowser/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -26,15 +26,17 @@ let 
    stripRoot = false;

  };



  version = "3.2.1";

  version = "3.3.1";

in



python3.pkgs.buildPythonApplication {

  pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5";

  inherit version;

  pyproject = true;



  src = fetchurl {

    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";

    hash = "sha256-AqevKmxds42HsiWwuEEsgNmDgzXzLQ6KOPbX+804iX0=";

    hash = "sha256-qttkrMxzC8mhXONByaBYCx82OD7Uh09U0xzh2r6U4Xo=";

  };



  # Needs tox
@@ -47,6 +49,10 @@ python3.pkgs.buildPythonApplication { 
    qtwayland

  ];



  build-system = with python3.pkgs; [

    setuptools

  ];



  nativeBuildInputs = [

    wrapQtAppsHook asciidoc

    docbook_xml_dtd_45 docbook_xsl libxml2 libxslt

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
callPackage ./generic.nix { } rec {

  pname = "signal-desktop-beta";

  dir = "Signal Beta";

  version = "7.29.0-beta.1";

  version = "7.30.0-beta.1";

  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";

  hash = "sha256-+IfCdwoDgHgqOKS7QAca0P3ULw8EE40asqJvj2zWWPA=";

  hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E=";

}

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "signal-desktop";

  version = "7.28.0";

  version = "7.29.0";



  src = fetchurl {

    url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";

    hash = "sha256-yPObHZPCXRycuf9VexooWkXDJLReEiTuFSmCxlHA/OU=";

    hash = "sha256-R/NYPb7bvLbyDYntw2K75SC1/sqNO7HAJ3QUwGThvUg=";

  };

  sourceRoot = ".";

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
callPackage ./generic.nix { } rec {

  pname = "signal-desktop";

  dir = "Signal";

  version = "7.28.0";

  version = "7.29.0";

  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";

  hash = "sha256-ZBnEIQvx3FLp1aoAKHDpNBptl9jK/z69OyAWLfk2fDw=";

  hash = "sha256-TftTt9pN4EjgZs3N94TlCzXK64g1g+oGPx1ZLVX02VA=";

}

pkgs/by-name/mi/microsoft-identity-broker/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 


  src = fetchurl {

    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb";

    hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM=";

    hash = "sha256-I4Q6ucT6ps8/QGiQTNbMXcKxq6UMcuwJ0Prcqvov56M=";

  };



  nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ];