commit eac28f38d6b78743accda7831613700cfd236a5c · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/networking/wstunnel.nix

···

       294
       294
        
               DynamicUser = true;

     

       295
       295
        
               SupplementaryGroups = optional (serverCfg.useACMEHost != null) certConfig.group;

     

       296
       296
        
               PrivateTmp = true;

     

       297
       297
       -
               AmbientCapabilities = optional (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];

     

       297
       297
       +
               AmbientCapabilities = optionals (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];

     

       298
       298
        
               NoNewPrivileges = true;

     

       299
       299
        
               RestrictNamespaces = "uts ipc pid user cgroup";

     

       300
       300
        
               ProtectSystem = "strict";

     
···

       340
       340
        
               EnvironmentFile = optional (clientCfg.environmentFile != null) clientCfg.environmentFile;

     

       341
       341
        
               DynamicUser = true;

     

       342
       342
        
               PrivateTmp = true;

     

       343
       343
       -
               AmbientCapabilities = (optional (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optional ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);

     

       343
       343
       +
               AmbientCapabilities = (optionals (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optionals ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);

     

       344
       344
        
               NoNewPrivileges = true;

     

       345
       345
        
               RestrictNamespaces = "uts ipc pid user cgroup";

     

       346
       346
        
               ProtectSystem = "strict";

+1 -1

pkgs/applications/misc/blender/default.nix

···

       51
       51
        
             libharu

     

       52
       52
        
             libepoxy

     

       53
       53
        
           ]

     

       54
       54
       -
           ++ lib.optional (!stdenv.isAarch64) [

     

       54
       54
       +
           ++ lib.optionals (!stdenv.isAarch64) [

     

       55
       55
        
             openimagedenoise

     

       56
       56
        
             embree

     

       57
       57
        
           ]

+1 -2

pkgs/applications/misc/klipper-estimator/default.nix

···

       23
       23
        
       

     

       24
       24
        
         buildInputs =

     

       25
       25
        
           [ openssl ]

     

       26
       26
       -
           ++ lib.optional stdenv.isDarwin [ libgit2 Security ];

     

       26
       26
       +
           ++ lib.optionals stdenv.isDarwin [ libgit2 Security ];

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
        
       

     
···

       36
       36
        
           maintainers = with maintainers; [ tmarkus ];

     

       37
       37
        
         };

     

       38
       38
        
       }

     

       39
       39
       -

+1 -1

pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix

···

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
        
         doCheck = true;

     

       34
       34
       -
         checkFlags = "-skip TestSetSessionHandlers";

     

       34
       34
       +
         checkFlags = [ "-skip=TestSetSessionHandlers" ];

     

       35
       35
        
       

     

       36
       36
        
         preCheck = ''

     

       37
       37
        
           if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then

+1 -1

pkgs/applications/science/biology/blast/bin.nix

···

       35
       35
        
       stdenv.mkDerivation {

     

       36
       36
        
         inherit pname version src;

     

       37
       37
        
       

     

       38
       38
       -
         nativeBuildInputs = lib.optional stdenv.isLinux [ autoPatchelfHook ];

     

       38
       38
       +
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       39
       39
        
       

     

       40
       40
        
         buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ];

     

       41
       41

+1 -1

pkgs/development/libraries/appstream/default.nix

···

       69
       69
        
           itstool

     

       70
       70
        
           vala

     

       71
       71
        
           gperf

     

       72
       72
       -
         ] ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

     

       72
       72
       +
         ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

     

       73
       73
        
           mesonEmulatorHook

     

       74
       74
        
         ];

     

       75
       75

+1 -1

pkgs/development/libraries/ucx/default.nix

···

       39
       39
        
           rdma-core

     

       40
       40
        
           zlib

     

       41
       41
        
         ] ++ lib.optional enableCuda cudatoolkit

     

       42
       42
       -
         ++ lib.optional enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];

     

       42
       42
       +
         ++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];

     

       43
       43
        
       

     

       44
       44
        
         configureFlags = [

     

       45
       45
        
           "--with-rdmacm=${rdma-core}"

+2 -2

pkgs/development/lisp-modules/packages.nix

···

       274
       274
        
             sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";

     

       275
       275
        
           };

     

       276
       276
        
       

     

       277
       277
       -
           buildInputs = [

     

       278
       278
       -
             pkgs.makeWrapper

     

       277
       277
       +
           nativeBuildInputs = [ pkgs.makeWrapper ];

     

       279
       278
        
       

     

       279
       279
       +
           buildInputs = [

     

       280
       280
        
             # needed for GSETTINGS_SCHEMAS_PATH

     

       281
       281
        
             pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3

     

       282
       282

+1 -1

pkgs/development/python-modules/snitun/default.nix

···

       43
       43
        
           "test_snitun_single_runner_throttling"

     

       44
       44
        
           # ConnectionResetError: [Errno 54] Connection reset by peer

     

       45
       45
        
           "test_peer_listener_timeout"

     

       46
       46
       -
         ] ++ lib.optional (pythonAtLeast "3.11") [

     

       46
       46
       +
         ] ++ lib.optionals (pythonAtLeast "3.11") [

     

       47
       47
        
           # TypeError: Passing coroutines is forbidden, use tasks explicitly.

     

       48
       48
        
           "test_snitun_runner_updown"

     

       49
       49
        
         ];

+1 -1

pkgs/development/python-modules/traittypes/default.nix

···

       36
       36
        
       

     

       37
       37
        
         nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ];

     

       38
       38
        
       

     

       39
       39
       -
         disabledTestPaths = lib.optional (lib.versionAtLeast numpy.version "1.17") [

     

       39
       39
       +
         disabledTestPaths = lib.optionals (lib.versionAtLeast numpy.version "1.17") [

     

       40
       40
        
           # https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87

     

       41
       41
        
           "traittypes/tests/test_traittypes.py"

     

       42
       42
        
         ];

+1 -1

pkgs/development/tools/marksman/default.nix

···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         projectFile = "Marksman/Marksman.fsproj";

     

       21
       21
       -
         dotnetBuildFlags = "-p:VersionString=${version}";

     

       21
       21
       +
         dotnetBuildFlags = [ "-p:VersionString=${version}" ];

     

       22
       22
        
       

     

       23
       23
        
         doCheck = true;

     

       24
       24
        
         testProjectFile = "Tests/Tests.fsproj";

+1 -1

pkgs/os-specific/linux/freeipa/default.nix

···

       79
       79
        
           automake

     

       80
       80
        
           autoconf

     

       81
       81
        
           gettext

     

       82
       82
       +
           pkg-config

     

       82
       83
        
         ];

     

       83
       84
        
       

     

       84
       85
        
         buildInputs = [

     
···

       88
       89
        
           sasl

     

       89
       90
        
           curl

     

       90
       91
        
           xmlrpc_c

     

       91
       91
       -
           pkg-config

     

       92
       92
        
           ding-libs

     

       93
       93
        
           p11-kit

     

       94
       94
        
           python3

+1 -1

pkgs/servers/audiobookshelf/default.nix

···

       37
       37
        
         buildInputs = [ util-linux ];

     

       38
       38
        
       

     

       39
       39
        
         dontNpmBuild = true;

     

       40
       40
       -
         npmInstallFlags = "--only-production";

     

       40
       40
       +
         npmInstallFlags = [ "--only-production" ];

     

       41
       41
        
         npmDepsHash = "sha256-0PFeXiS8RSffhrocrHODNpb6d9+nbpulCW5qYIrytDI=";

     

       42
       42
        
       

     

       43
       43
        
         installPhase = ''

+1 -1

pkgs/tools/system/monit/default.nix

···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ bison flex ] ++

     

       25
       25
       -
           lib.optional stdenv.hostPlatform.isDarwin [

     

       25
       25
       +
           lib.optionals stdenv.hostPlatform.isDarwin [

     

       26
       26
        
             darwin.apple_sdk.frameworks.DiskArbitration

     

       27
       27
        
           ];

     

       28
       28