Commit 3a6265b8 authored by Weijia Wang's avatar Weijia Wang
Browse files

Merge branch 'master' into staging-next

parents d157c073 165090ed

nixos/modules/programs/singularity.nix

+20 −16
Original line number Diff line number Diff line 
{ config, pkgs, lib, ... }:

{

  config,

  pkgs,

  lib,

  ...

}:



with lib;

let
@@ -12,9 +17,7 @@ in 
        Whether to install Singularity/Apptainer with system-level overriding such as SUID support.

      '';

    };

    package = mkPackageOption pkgs "singularity" {

      example = "apptainer";

    };

    package = mkPackageOption pkgs "singularity" { example = "apptainer"; };

    packageOverriden = mkOption {

      type = types.nullOr types.package;

      default = null;
@@ -75,17 +78,19 @@ in 
  };



  config = mkIf cfg.enable {

    programs.singularity.packageOverriden = (cfg.package.override (

      optionalAttrs cfg.enableExternalLocalStateDir {

        externalLocalStateDir = "/var/lib";

      } // optionalAttrs cfg.enableFakeroot {

    programs.singularity.packageOverriden = (

      cfg.package.override (

        optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; }

        // optionalAttrs cfg.enableFakeroot {

          newuidmapPath = "/run/wrappers/bin/newuidmap";

          newgidmapPath = "/run/wrappers/bin/newgidmap";

      } // optionalAttrs cfg.enableSuid {

        }

        // optionalAttrs cfg.enableSuid {

          enableSuid = true;

          starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid";

        }

    ));

      )

    );

    environment.systemPackages = [ cfg.packageOverriden ];

    security.wrappers."${cfg.packageOverriden.projectName}-suid" = mkIf cfg.enableSuid {

      setuid = true;
@@ -97,5 +102,4 @@ in 
      "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -"

    ];

  };



}

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

+2 −2
Original line number Diff line number Diff line
@@ -817,11 +817,11 @@ in { 
                base_url = mkOption {

                    type = types.nullOr types.nonEmptyStr;

                    default = if lib.versionOlder config.system.stateVersion "24.05"

                              then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"

                              then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}"

                              else null;

                    defaultText = literalExpression ''

                      if lib.versionOlder config.system.stateVersion "24.05"

                      then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"

                      then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}"

                      else null;

                    '';

                    description = ''

pkgs/applications/audio/faust/faust2.nix

+2 −10
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ with lib.strings; 


let



  version = "2.70.3";

  version = "2.72.14";



  src = fetchFromGitHub {

    owner = "grame-cncm";

    repo = "faust";

    rev = version;

    sha256 = "sha256-z6fW/T7wJZxugmvABlpvyMXvR4WkmC16INOKyyfKx8k=";

    sha256 = "sha256-RdSXiOYwKsfyrfHEughCeSwa9VFM6/3pMg54yCMpzLU=";

    fetchSubmodules = true;

  };
@@ -63,14 +63,6 @@ let 
        ncurses_static

      ];



      patches = [

        (fetchpatch {

          name = "fix-CsigFFun-API-declaration.patch";

          url = "https://github.com/grame-cncm/faust/commit/10ce960e91a6237c7bff14a338e770757076ce9e.patch";

          hash = "sha256-WMFLpLGTZpG7ni3lhI5VJHsmJViWZf4pAFuhYmFVRCE=";

        })

      ];



      passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };



      preConfigure = ''

pkgs/applications/misc/ssw/default.nix

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


stdenv.mkDerivation rec {

  pname = "ssw";

  version = "0.8";

  version = "0.10";



  src = fetchurl {

    url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz";

    sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs=";

    sha256 = "sha256-gGkuw1AnGZXhR9x1mSnN1507ZF5rXvqmtX9NLQXoR+U=";

  };



  nativeBuildInputs = [ pkg-config ];

pkgs/applications/networking/browsers/floorp/default.nix

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


((buildMozillaMach rec {

  pname = "floorp";

  packageVersion = "11.12.0";

  packageVersion = "11.12.2";

  applicationName = "Floorp";

  binaryName = "floorp";

  branding = "browser/branding/official";
@@ -22,7 +22,7 @@ 
    repo = "Floorp";

    fetchSubmodules = true;

    rev = "v${packageVersion}";

    hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q=";

    hash = "sha256-KWUoR/0XOz4mCWBkTgDfvvrWukZMa3tQzQ+k5+BfzzY=";

  };



  extraConfigureFlags = [