Unverified Commit c69a5f66 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #242918 from NixOS/php/extension/update-snuffleupagus 

phpExtensions.snuffleupagus: 0.7.0 -> 0.9.0
parents 78109c4d eb3677ff

pkgs/development/php-packages/snuffleupagus/default.nix

+15 −16
Original line number Diff line number Diff line 
{ buildPecl

{ stdenv

, buildPecl

, lib

, libiconv

, php

, fetchFromGitHub

, pcre2

, fetchpatch

, darwin

}:



buildPecl rec {

  pname = "snuffleupagus";

  version = "0.7.0";

  version = "0.9.0";



  src = fetchFromGitHub {

    owner = "jvoisin";

    repo = pname;

    repo = "snuffleupagus";

    rev = "v${version}";

    sha256 = "1la6wa9xznc110b7isiy502x71mkvhisq6m8llhczpq4rs4nbcw2";

    hash = "sha256-1a4PYJ/j9BsoeF5V/KKGu7rqsL3YMo/FbaCBfNc4bfw=";

  };



  buildInputs = [

    pcre2

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk_11_0.frameworks.CoreFoundation

    darwin.apple_sdk_11_0.Libsystem

    libiconv

  ];



  internalDeps = with php.extensions; [

    session

  ];



  patches = [

    (fetchpatch {

      url = "https://github.com/jvoisin/snuffleupagus/commit/3c528d9d03cec872382a6f400b5701a8fbfd59b4.patch";

      sha256 = "0lnj4xcl867f477mha697d1py1nwxhl18dvvg40qgflpdbywlzns";

      stripLen = 1;

    })

  ];



  sourceRoot = "source/src";



  configureFlags = [
@@ -42,10 +41,10 @@ buildPecl rec { 
    ./configure --enable-snuffleupagus

  '';



  meta = with lib; {

  meta = {

    description = "Security module for php7 and php8 - Killing bugclasses and virtual-patching the rest!";

    license = licenses.lgpl3Only;

    homepage = "https://github.com/jvoisin/snuffleupagus";

    maintainers = teams.php.members ++ [ maintainers.zupo ];

    license = lib.licenses.lgpl3Only;

    maintainers = lib.teams.php.members;

  };

}

pkgs/top-level/php-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ lib.makeScope pkgs.newScope (self: with self; { 


    smbclient = callPackage ../development/php-packages/smbclient { };



    snuffleupagus = callPackage ../development/php-packages/snuffleupagus { };

    snuffleupagus = callPackage ../development/php-packages/snuffleupagus {

      inherit (pkgs) darwin;

    };



    sqlsrv = callPackage ../development/php-packages/sqlsrv { };