Unverified Commit ad483919 authored by Christopher Auer's avatar Christopher Auer Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 66e97f79 5d30429b

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

+1 −2
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ in 
      ];

    };

    phpPackage = mkPackageOption pkgs "php" {

      default = [ "php83" ];

      example = "php82";

    };
@@ -1072,8 +1073,6 @@ in 
            nextcloud31

        );



      services.nextcloud.phpPackage = pkgs.php83;



      services.nextcloud.phpOptions = mkMerge [

        (mapAttrs (const mkOptionDefault) defaultPHPSettings)

        {

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ in 


buildGoModule rec {

  pname = "chroma";

  version = "2.15.0";

  version = "2.19.0";



  # To update:

  # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec { 
    inherit (srcInfo) sha256;

  };



  vendorHash = "sha256:14jg809xz647yv6sc8rnnksg2bpnn75panj8a2kdk2v87yrpq2zr";

  vendorHash = "sha256-Gqldcp68Rn4wkfQptbmKUjkwLSb+qaFboJNfmWVkrPU=";



  modRoot = "./cmd/chroma";

pkgs/by-name/ch/chroma/src.json

+5 −5
Original line number Diff line number Diff line 
{

  "url": "https://github.com/alecthomas/chroma.git",

  "rev": "009385f9487ee14c8a54e49aaf4331fea0830310",

  "date": "2024-12-30T09:27:18+11:00",

  "path": "/nix/store/rr2cj4bmlfw803diwyfpbrpai35gifaw-chroma",

  "sha256": "088w3aixwfk8s04iyb2mjn3kx5dl3gb9q14jzawabcdy2ar7iijn",

  "hash": "sha256-VsZ4shK+saW4+pIEnNYbtJU+h5VVLB8J0Gg63qMaHCE=",

  "rev": "adeac8f5dbfb6806a51bcf07eefd89fc8a0aee6a",

  "date": "2025-07-01T09:59:45+10:00",

  "path": "/nix/store/063ldbczafhxq02g5n28bxr1xnl6fwgd-chroma",

  "sha256": "1r50gqbizi7l1l07syx9wgfyx1k8gzspmsbpk42jnwgw3h9dcw42",

  "hash": "sha256-gnDWEhz8cSsFmXfpevV/aIbu3eOpe30ADfTEHxd+oOQ=",

  "fetchLFS": false,

  "fetchSubmodules": false,

  "deepClone": false,

pkgs/by-name/li/libdwarf/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "libdwarf";

  version = "2.0.0";

  version = "2.1.0";



  src = fetchFromGitHub {

    owner = "davea42";

    repo = "libdwarf-code";

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

    hash = "sha256-SsFg+7zGBEGxDSzfiIP5bxdttlBkhEiEQWaU12hINas=";

    hash = "sha256-Q+ke5vRSBFZirCIBu8M88LzBQW851kjkW4vUgE89ejQ=";

  };



  nativeBuildInputs = [