commit 25450f2b29eff6c615eb662144c6c5541abb25b4 · pyrox.dev/nixpkgs

+4 -9

nixos/modules/services/development/blackfire.nix

···

       19
       19
        
             enable = lib.mkEnableOption "Blackfire profiler agent";

     

       20
       20
        
             settings = lib.mkOption {

     

       21
       21
        
               description = ''

     

       22
       22
       -
                 See https://blackfire.io/docs/configuration/agent

     

       22
       22
       +
                 See https://blackfire.io/docs/up-and-running/configuration/agent

     

       23
       23
        
               '';

     

       24
       24
        
               type = lib.types.submodule {

     

       25
       25
        
                 freeformType = with lib.types; attrsOf str;

     
···

       53
       53
        
       

     

       54
       54
        
           services.blackfire-agent.settings.socket = "unix:///run/${agentSock}";

     

       55
       55
        
       

     

       56
       56
       -
           systemd.services.blackfire-agent = {

     

       57
       57
       -
             description = "Blackfire agent";

     

       58
       58
       -
       

     

       59
       59
       -
             serviceConfig = {

     

       60
       60
       -
               ExecStart = "${pkgs.blackfire}/bin/blackfire-agent";

     

       61
       61
       -
               RuntimeDirectory = "blackfire";

     

       62
       62
       -
             };

     

       63
       63
       -
           };

     

       56
       56
       +
           systemd.packages = [

     

       57
       57
       +
             pkgs.blackfire

     

       58
       58
       +
           ];

     

       64
       59
        
         };

     

       65
       60
        
       }

+2 -1

nixos/modules/services/development/blackfire.xml

···

       28
       28
        
           enable = true;

     

       29
       29
        
           settings = {

     

       30
       30
        
             # You will need to get credentials at https://blackfire.io/my/settings/credentials

     

       31
       31
       -
             # You can also use other options described in https://blackfire.io/docs/configuration/agent

     

       31
       31
       +
             # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent

     

       32
       32
        
             server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX";

     

       33
       33
        
             server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";

     

       34
       34
        
           };

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         # Make the agent run on start-up.

     

       38
       38
       +
         # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138)

     

       38
       39
        
         # Alternately, you can start it manually with `systemctl start blackfire-agent`.

     

       39
       40
        
         systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ];

     

       40
       41
        
       }</programlisting>

+18 -5

pkgs/development/tools/misc/blackfire/default.nix

···

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         pname = "blackfire-agent";

     

       14
       14
       -
         version = "1.49.4";

     

       13
       13
       +
         pname = "blackfire";

     

       14
       14
       +
         version = "2.5.1";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
       -
           url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb";

     

       18
       18
       -
           sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A=";

     

       17
       17
       +
           url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";

     

       18
       18
       +
           sha256 = "wak7LE5j6OKIHqCsEGrxSq1FAFzehMetYj6c/Zkr9dk=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

     
···

       32
       32
        
           mv $out/usr/* $out

     

       33
       33
        
           rmdir $out/usr

     

       34
       34
        
       

     

       35
       35
       +
           # Fix ExecStart path and replace deprecated directory creation method,

     

       36
       36
       +
           # use dynamic user.

     

       37
       37
       +
           substituteInPlace "$out/lib/systemd/system/blackfire-agent.service" \

     

       38
       38
       +
             --replace '/usr/' "$out/" \

     

       39
       39
       +
             --replace 'ExecStartPre=/bin/mkdir -p /var/run/blackfire' 'RuntimeDirectory=blackfire' \

     

       40
       40
       +
             --replace 'ExecStartPre=/bin/chown blackfire: /var/run/blackfire' "" \

     

       41
       41
       +
             --replace 'User=blackfire' 'DynamicUser=yes' \

     

       42
       42
       +
             --replace 'PermissionsStartOnly=true' ""

     

       43
       43
       +
       

     

       44
       44
       +
           # Modernize socket path.

     

       45
       45
       +
           substituteInPlace "$out/etc/blackfire/agent" \

     

       46
       46
       +
             --replace '/var/run' '/run'

     

       47
       47
       +
       

     

       35
       48
        
           runHook postInstall

     

       36
       49
        
         '';

     

       37
       50
        
       

     

       38
       51
        
         passthru = {

     

       39
       52
        
           updateScript = writeShellScript "update-${pname}" ''

     

       40
       53
        
             export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"

     

       41
       41
       -
             update-source-version "$UPDATE_NIX_ATTR_PATH" "$(curl https://blackfire.io/api/v1/releases | jq .agent --raw-output)"

     

       54
       54
       +
             update-source-version "$UPDATE_NIX_ATTR_PATH" "$(curl https://blackfire.io/api/v1/releases | jq .cli --raw-output)"

     

       42
       55
        
           '';

     

       43
       56
        
         };

     

       44
       57