Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6304c9af4845
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5d2cb158f390
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 14, 2020

  1. php.packages.phpcbf: 3.5.3 -> 3.5.4 

    Changelog:
https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.5.4

Also switch to phpWithExtensions because it complained about missing
extensions when running the binary.
    @etu
    etu committed Apr 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e71139 View commit details

  2. php.packages.phpcs: 3.5.3 -> 3.5.4 

    Changelog:
https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.5.4

Also switch to phpWithExtensions because it complained about missing
extensions when running the binary.
    @etu
    etu committed Apr 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    83c9620 View commit details

  3. Merge pull request #85224 from etu/update-php-codesniffer 

    php.packages.phpc(bf|s): 3.5.3 -> 3.5.4
    @talyz
    talyz authored Apr 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d2cb15 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/top-level/php-packages.nix
12 changes: 6 additions & 6 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -149,12 +149,12 @@ in
};

phpcbf = mkDerivation rec {
version = "3.5.3";
version = "3.5.4";
pname = "phpcbf";

src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
sha256 = "1mrsf9p6p64pyqyylnlxb2b7cirdfccch83g7yhfnka3znffq86v";
sha256 = "18x7fk59l821pivw1i2r868y78qgs0qk47b9il1smwi6plwyyflr";
};

phases = [ "installPhase" ];
@@ -163,7 +163,7 @@ in
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/phpcbf/phpcbf.phar
makeWrapper ${php}/bin/php $out/bin/phpcbf \
makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcbf \
--add-flags "$out/libexec/phpcbf/phpcbf.phar"
'';

@@ -176,12 +176,12 @@ in
};

phpcs = mkDerivation rec {
version = "3.5.3";
version = "3.5.4";
pname = "phpcs";

src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
sha256 = "0y4nhsifj4pdmf5g1nnm4951yjgiqswyz7wmjxx6kqiqc7chlkml";
sha256 = "1lrybdxxig3yqd3i3nwji5jjn377p50sbpm4s4852dlsxz9qnlgs";
};

phases = [ "installPhase" ];
@@ -190,7 +190,7 @@ in
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/phpcs/phpcs.phar
makeWrapper ${php}/bin/php $out/bin/phpcs \
makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcs \
--add-flags "$out/libexec/phpcs/phpcs.phar"
'';