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

Merge master into staging-next

parents 06b911fa 76e87812

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ in 
            '';

          };



          locations."~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = ''

          locations."~* \\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = ''

            expires 1y;

            add_header Cache-Control "public, immutable";

          '';

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

+6 −6
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ 
    "vendorHash": null

  },

  "bpg_proxmox": {

    "hash": "sha256-BYpqXdtjEez7uOtUw3x70ki6sNVUzVuQVvQ8Y7vwOdc=",

    "hash": "sha256-hyrbCXLsebkXdGovKxgLlRI6Y7WgHbLCclABRLxKzbE=",

    "homepage": "https://registry.terraform.io/providers/bpg/proxmox",

    "owner": "bpg",

    "repo": "terraform-provider-proxmox",

    "rev": "v0.95.0",

    "rev": "v0.96.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-LvzKLPNZ+37qSSll6VqV44MOVe8/jGmUiKrSWCHkqf8="

    "vendorHash": "sha256-oLvWBDf5wKI5lltwITHrJ+0RmEF1pMuqFoxd161uvrI="

  },

  "brightbox_brightbox": {

    "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -1193,13 +1193,13 @@ 
    "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="

  },

  "selectel_selectel": {

    "hash": "sha256-hmXFDWbo79t15nKsyDOi5SDzyG3tA+6oo7LPoMURzh8=",

    "hash": "sha256-/1s3TQK8EkM7WgHW77a/JGsCemiustIwlLAam9CZpiY=",

    "homepage": "https://registry.terraform.io/providers/selectel/selectel",

    "owner": "selectel",

    "repo": "terraform-provider-selectel",

    "rev": "v7.5.3",

    "rev": "v7.5.4",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE="

    "vendorHash": "sha256-QdfBhTY7HwPqz9qm7KE0OL4ACOWiU8gLOKKdFbMrAro="

  },

  "siderolabs_talos": {

    "hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=",

pkgs/by-name/av/avdl/package.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{

  lib,

  rustPlatform,

  fetchFromGitHub,

}:



rustPlatform.buildRustPackage (finalAttrs: {

  pname = "avdl";

  version = "0.1.5+1.12.1";



  src = fetchFromGitHub {

    owner = "jonhoo";

    repo = "avdl";

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

    hash = "sha256-/YGDtezPMMdogk8eGoHgqt8B0t6SNA3TVqroLOOANxs=";

    fetchSubmodules = true;

  };



  cargoHash = "sha256-QPC58tt7e8O/KJyE3c5mdLMyEt37hKG9lEDBs47prAQ=";



  meta = {

    description = "Rust port of avro-tools' IDL tooling";

    homepage = "https://github.com/jonhoo/avdl";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ ck3d ];

    mainProgram = "avdl";

  };

})

pkgs/by-name/ca/candy-icons/package.nix

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


stdenvNoCC.mkDerivation {

  pname = "candy-icons";

  version = "0-unstable-2026-01-28";

  version = "0-unstable-2026-02-13";



  src = fetchFromGitHub {

    owner = "EliverLara";

    repo = "candy-icons";

    rev = "ade95a235a50e5ea653a02fd3773c214ac43d425";

    hash = "sha256-XyFhC4I7Y1ppTfLs7em+hXmXx6jQ09rJxcf66EwoK7g=";

    rev = "b0a85a7414504191342b0c6d073c6f9233cb923a";

    hash = "sha256-SzZMCNNTIctzFqx2qHwE4y4lioctpum39AyRrylurZA=";

  };



  nativeBuildInputs = [ gtk3 ];

pkgs/by-name/ch/checkstyle/package.nix

+33 −14
Original line number Diff line number Diff line 
{

  lib,

  stdenvNoCC,

  fetchurl,

  fetchFromGitHub,

  makeBinaryWrapper,

  jre,

  maven,

  nix-update-script,

}:



stdenvNoCC.mkDerivation rec {

maven.buildMavenPackage rec {

  version = "13.2.0";

  pname = "checkstyle";



  src = fetchurl {

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

    sha256 = "sha256-rAPNT/zbMXX1s4upQlZD6QnNFliNPlVBzbUjxcTL3PU=";

  src = fetchFromGitHub {

    owner = "checkstyle";

    repo = "checkstyle";

    tag = "checkstyle-${version}";

    hash = "sha256-f9jJK9zp7sm8VEn30qQA73+ynARJWY3BxbSMEppEDlk=";

  };



  nativeBuildInputs = [ makeBinaryWrapper ];

  buildInputs = [ jre ];

  mvnHash = "sha256-+l3ubVFWx1QVTSgwVv0yGVyh8RPnxyHBU/vKE4sBRoE=";



  dontUnpack = true;

  nativeBuildInputs = [

    maven

    makeBinaryWrapper

  ];



  mvnParameters = lib.escapeShellArgs [ "-Passembly,no-validations" ];



  installPhase = ''

    runHook preInstall

    install -D $src $out/checkstyle/checkstyle-all.jar



    mkdir -p $out/bin $out/share/checkstyle

    install -Dm644 target/checkstyle-${version}-all.jar $out/share/checkstyle/checkstyle-all.jar



    makeWrapper ${jre}/bin/java $out/bin/checkstyle \

      --add-flags "-jar $out/checkstyle/checkstyle-all.jar"

      --add-flags "-jar $out/share/checkstyle/checkstyle-all.jar"



    runHook postInstall

  '';



  passthru.updateScript = nix-update-script { };



  meta = {

    description = "Checks Java source against a coding standard";

    mainProgram = "checkstyle";
@@ -38,9 +51,15 @@ stdenvNoCC.mkDerivation rec { 
    '';

    homepage = "https://checkstyle.org/";

    changelog = "https://checkstyle.org/releasenotes.html#Release_${version}";

    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];

    sourceProvenance = with lib.sourceTypes; [

      fromSource

      binaryBytecode

    ];

    license = lib.licenses.lgpl21;

    maintainers = with lib.maintainers; [ pSub ];

    platforms = jre.meta.platforms;

    maintainers = with lib.maintainers; [

      pSub

      progrm_jarvis

    ];

    inherit (jre.meta) platforms;

  };

}