Unverified Commit 28d4a221 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c60232a1 7f311dd9

nixos/modules/programs/singularity.nix

+6 −1
Original line number Diff line number Diff line
@@ -61,7 +61,12 @@ in 
    };

    enableSuid = mkOption {

      type = types.bool;

      default = true;

      # SingularityCE requires SETUID for most things. Apptainer prefers user

      # namespaces, e.g. `apptainer exec --nv` would fail if built

      # `--with-suid`:

      # > `FATAL: nvidia-container-cli not allowed in setuid mode`

      default = cfg.package.projectName != "apptainer";

      defaultText = literalExpression ''config.services.singularity.package.projectName != "apptainer"'';

      example = false;

      description = mdDoc ''

        Whether to enable the SUID support of Singularity/Apptainer.

pkgs/applications/networking/browsers/chromium/upstream-info.nix

+5 −5
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 
        version = "2023-10-23";

      };

      ungoogled-patches = {

        hash = "sha256-B1MNo8BdjMOmTvIr4uu3kg/MO1t+YLQz2S23L4Cye3E=";

        rev = "120.0.6099.199-1";

        hash = "sha256-qB1OrsfRCWfobKAAfcYJFmKc36ofF+VmjqPNbIPugJA=";

        rev = "120.0.6099.216-1";

      };

    };

    hash = "sha256-lT1CCwYj0hT4tCJb689mZwNecUsEwcfn2Ot8r9LBT+M=";

    hash_deb_amd64 = "sha256-4BWLn0+gYNWG4DsolbY6WlTvXWl7tZIZrnqXlrGUGjQ=";

    version = "120.0.6099.199";

    hash = "sha256-yqk0bh68onWqML20Q8eDsTT9o+eKtta7kS9HL74do6Q=";

    hash_deb_amd64 = "sha256-MxIyOXssQ1Ke5WZbBbB4FpDec+rn46m8+PbMdmxaQCA=";

    version = "120.0.6099.216";

  };

}

pkgs/applications/science/math/caffe/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec { 
      || cudaSupport

      || !(leveldbSupport -> (leveldb != null && snappy != null))

      || !(cudnnSupport -> (hasCudnn && cudaSupport))

      || !(ncclSupport -> cudaSupport)

      || !(ncclSupport -> (cudaSupport && !nccl.meta.unsupported))

      || !(pythonSupport -> (python != null && numpy != null))

    ;

    license = licenses.bsd2;

pkgs/applications/version-management/gitnuro/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec { 


  meta = with lib; {

    description = "A FOSS Git multiplatform client based on Compose and JGit";

    homepage = "https://gitnuro.jetpackduba.com";

    homepage = "https://gitnuro.com/";

    license = licenses.gpl3Plus;

    platforms = platforms.unix;

    maintainers = with maintainers; [ zendo ];

pkgs/applications/virtualization/libnvidia-container/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ stdenv.mkDerivation rec { 
    description = "NVIDIA container runtime library";

    license = licenses.asl20;

    platforms = platforms.linux;

    mainProgram = "nvidia-container-cli";

    maintainers = with maintainers; [ cpcloud ];

  };

}