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

Merge master into staging-next

parents 0ef8af09 1c8d52a3

pkgs/applications/version-management/sublime-merge/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ let 
in

{

  sublime-merge = common {

    buildVersion = "2110";

    aarch64sha256 = "lG95VgRsicSRjve7ESTamU9dp/xBjR6yyLL+1wh6BXg=";

    x64sha256 = "v5CFqS+bB0Oe0fZ+vP0zxrJ2SUctNXKqODmB8M9XMIY=";

    buildVersion = "2112";

    aarch64sha256 = "XtJ4bAKiCZnBEG1ssXhViuyOsLNdeahHAkWZqqCRmvU=";

    x64sha256 = "rzk3PlGpGXDh3Ig3gKb9WSER6PzPKmp1PJJiD0sGVS4=";

  } { };



  sublime-merge-dev = common {

pkgs/by-name/jm/jmol/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ let 
  };

in

stdenv.mkDerivation rec {

  version = "16.3.31";

  version = "16.3.33";

  pname = "jmol";



  src =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 
    in

    fetchurl {

      url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";

      hash = "sha256-VrxF3edZHEyaTfeSbBg8Po7/DOqEdtaXhdLg6KEu9kc=";

      hash = "sha256-U2UEK+ZjSErzgQAkcoZwoLZ9m3pI10pcdz79M7BmBB4=";

    };



  patchPhase = ''

pkgs/by-name/ko/komga/package.nix

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


stdenvNoCC.mkDerivation rec {

  pname = "komga";

  version = "1.23.3";

  version = "1.23.4";



  src = fetchurl {

    url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";

    sha256 = "sha256-Q52u284BqN6IktMKOAbiwdM77ZOPQrHIzOkExz91Xeo=";

    sha256 = "sha256-mFcnD6QAuc3VGpa6AhJVfXF++yCaQ7irvftew33ImUo=";

  };



  nativeBuildInputs = [

pkgs/by-name/la/lasuite-meet-frontend/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


buildNpmPackage rec {

  pname = "lasuite-meet-frontend";

  version = "0.1.33";

  version = "0.1.34";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "meet";

    tag = "v${version}";

    hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";

    hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";

  };



  sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec { 
  npmDeps = fetchNpmDeps {

    inherit version src;

    sourceRoot = "source/src/frontend";

    hash = "sha256-s5HgGFY7yPct7P2nutYab1KsMbzHWBHKEm4W74qsgIw=";

    hash = "sha256-svCLdlX5GnVCoYlf6uzYBr5wIp3buURj6Op60VtGFjg=";

  };



  buildPhase = ''

pkgs/by-name/la/lasuite-meet/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ in 


python.pkgs.buildPythonApplication rec {

  pname = "lasuite-meet";

  version = "0.1.33";

  version = "0.1.34";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "meet";

    tag = "v${version}";

    hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";

    hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";

  };



  sourceRoot = "source/src/backend";