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

Merge master into staging-next

parents 3a4c73a2 30ef0997

nixos/modules/services/web-apps/gerrit.nix

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ in 
        PrivateDevices = true;

        PrivateTmp = true;

        ProtectClock = true;

        ProtectControlGroups = true;

        ProtectControlGroups = "strict";

        ProtectHome = true;

        ProtectHostname = true;

        ProtectKernelLogs = true;

pkgs/by-name/cd/cdncheck/package.nix

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


buildGoModule rec {

  pname = "cdncheck";

  version = "1.2.3";

  version = "1.2.4";



  src = fetchFromGitHub {

    owner = "projectdiscovery";

    repo = "cdncheck";

    tag = "v${version}";

    hash = "sha256-E6LMl0cArzVZ33xaG/2nvSgLy+Owr9br2fU3oFNyvGY=";

    hash = "sha256-O4tw/Uc2EuZerAVD8l2n5HejqWZUcCPHuU757r+uRmY=";

  };



  vendorHash = "sha256-IJk6HTiF2B1paVZ4qa63DwivtpOf5V0OKQEKAs3BpYY=";

  vendorHash = "sha256-6GxqDWRnvvj4OM2hqkwWFDvhOm+2VQvoGHivuOtTyCg=";



  subPackages = [ "cmd/cdncheck/" ];

pkgs/by-name/de/deck/package.nix

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


buildGoModule rec {

  pname = "deck";

  version = "1.51.1";

  version = "1.52.0";



  src = fetchFromGitHub {

    owner = "Kong";

    repo = "deck";

    tag = "v${version}";

    hash = "sha256-r7nqPsFXLhTg0gctNc8dYLv5L02J3YWw6AOfqHTsXIw=";

    hash = "sha256-fKcI40DqQwVw4YzPXVOXdij4LAwRkCp2U+TpjYmIO8I=";

  };



  nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec { 
  ];



  proxyVendor = true; # darwin/linux hash mismatch

  vendorHash = "sha256-5JSMw73Vo59OMpkQcakYodd9HySmPPaJIi3x85npd6Y=";

  vendorHash = "sha256-h7wtQDw8kixqGK5RE9YQ6a/I3yRO1k/6qcHX/K4M6fc=";



  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    installShellCompletion --cmd deck \

pkgs/desktops/lomiri/data/suru-icon-theme/default.nix

+12 −2
Original line number Diff line number Diff line
@@ -10,15 +10,25 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "suru-icon-theme";

  version = "2024.10.13";

  version = "2025.05.0";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/core/suru-icon-theme";

    rev = finalAttrs.version;

    hash = "sha256-rbhfcjca0vMBa0tJWGpXMRGGygZH1hmdQv/nLJWPS7s=";

    hash = "sha256-6MyZTRcfCpiCXzwrwNiBP6J4L4oFbFtoymhke13tLy0=";

  };



  # Commit 79763fa4ff701d1d89d7362c37c65b2a3cbdf543 introduced abunch of symlinks for Lomiri apps' icons to files from this theme.

  # This seems to have broken Lomiri, as it now gets stuck during startup (presumably?) trying to resolve the icons of these apps in the sidebar.

  # Can't apply a revert of the commit because patch refuses to touch symlinks.

  postPatch = ''

    for app in dekko2 lomiri-{addressbook,calculator,calendar,camera,clock,dialer,docviewer,gallery,mediaplayer,messaging,music,notes,terminal,weather}-app lomiri-system-settings lomiri-online-accounts-{facebook,flickr,google,owncloud,twitter,ubuntuones,yahoo}; do

      find suru/apps -name "$app".png -exec rm -v {} \;

      find suru/apps -name "$app"-symbolic.svg -exec rm -v {} \;

    done

  '';



  strictDeps = true;



  nativeBuildInputs = [

pkgs/development/libraries/gegl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "gegl";

  version = "0.4.62";

  version = "0.4.64";



  outputs = [

    "out"
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor finalAttrs.version}/gegl-${finalAttrs.version}.tar.xz";

    hash = "sha256-WIdXY3Hr8dnpB5fRDkuafxZYIo1IJ1g+eeHbPZRQXGw=";

    hash = "sha256-DeHJ3SLBYNXkvfw4jSkvA0R8ymJYVBuaEv7Xg9DPfGA=";

  };



  nativeBuildInputs = [