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

Merge master into staging-nixos

parents f300ddee cf7e63fd

nixos/tests/qownnotes.nix

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
          machine.wait_for_text("Note folder")

          machine.send_key("ret")

          machine.wait_for_console_text("Note path '/home/alice/Notes' was now created.")

          machine.wait_for_text("Panel layout")

          machine.wait_for_text("Layout preset")

          machine.send_key("ret")

          machine.wait_for_text("Nextcloud")

          machine.send_key("ret")

pkgs/by-name/lu/luanti/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "luanti";

  version = "5.15.1";

  version = "5.15.2";



  src = fetchFromGitHub {

    owner = "luanti-org";

    repo = "luanti";

    tag = finalAttrs.version;

    hash = "sha256-aW/DSF0sBEHJmhxRcWVqMFDOmP24CkAMr/eEsCUN5B0=";

    hash = "sha256-E7YkUFuDvEuJpmn7ReasKZnQHucl6YbTk8InUtzTi9U=";

  };



  patches = [

pkgs/by-name/qo/qownnotes/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
stdenv.mkDerivation (finalAttrs: {

  pname = "qownnotes";

  appname = "QOwnNotes";

  version = "26.4.11";

  version = "26.4.14";



  src = fetchurl {

    url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";

    hash = "sha256-5V5fBxDlTjuj0RxxR4QcBlFmiSAWpRUxIZjpRzdDVJo=";

    hash = "sha256-LiznKJRaXMNQUO/iomWGn8IDlRnWYtZQKDFVL5Vl3ZQ=";

  };



  nativeBuildInputs = [

pkgs/by-name/zi/zizmor/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "zizmor";

  version = "1.23.1";

  version = "1.24.1";



  src = fetchFromGitHub {

    owner = "zizmorcore";

    repo = "zizmor";

    tag = "v${finalAttrs.version}";

    hash = "sha256-fNpIcOVPw0beoN10JM92ITOxCupUZj8xV+P4VXIilRo=";

    hash = "sha256-JPh6xw8kWWR3GfneOK0MytOgYnZI0dFxXp15g1Pkve8=";

  };



  cargoHash = "sha256-K0lL46Mbx3Bqbhxqz21s0xsz7W9GKeG3Qw72fek0c/M=";

  cargoHash = "sha256-K0547EuCK3NfASP2sDr7qSAv9zyWY6XZL8YCxbLu+5I=";



  buildInputs = [

    rust-jemalloc-sys