Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

phpdocumentor: update and fix hash #372987

Merged
merged 1 commit into from
Jan 11, 2025
Merged

phpdocumentor: update and fix hash #372987

merged 1 commit into from
Jan 11, 2025

Conversation

drupol
Copy link
Contributor

@drupol drupol commented Jan 11, 2025

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@drupol drupol changed the title phpdocumenter: update and fix hash phpdocumentor: update and fix hash Jan 11, 2025
@drupol drupol force-pushed the push-mnpztnowwtnn branch from 37ee298 to 83de556 Compare January 11, 2025 17:16
@drupol drupol mentioned this pull request Jan 11, 2025
Merged
13 tasks
@drupol drupol merged commit 3c09035 into NixOS:master Jan 11, 2025
19 checks passed
@drupol drupol added the backport release-24.11 Backport PR automatically label Jan 11, 2025
@drupol drupol deleted the push-mnpztnowwtnn branch January 11, 2025 17:20
@nix-backports
Copy link

nix-backports bot commented Jan 11, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-372987-to-release-24.11 origin/release-24.11
cd .worktree/backport-372987-to-release-24.11
git switch --create backport-372987-to-release-24.11
git cherry-pick -x 83de55619abae02470fb06d54006dc549056baba

1 similar comment
@nix-backports
Copy link

nix-backports bot commented Jan 11, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-372987-to-release-24.11 origin/release-24.11
cd .worktree/backport-372987-to-release-24.11
git switch --create backport-372987-to-release-24.11
git cherry-pick -x 83de55619abae02470fb06d54006dc549056baba

@piotrkwiecinski
Copy link
Contributor

@drupol I reckon we still have the problem :(

I just run phpdocumentor from local master and get different hash:

error: hash mismatch in fixed-output derivation '/nix/store/m3lfvsd61gwpgx2n9688jjin4qz4xs49-phpdocumentor-composer-repository-3.6.0.drv':
         specified: sha256-PVaa0o8daoqXs8l3bF/Fsmtx3bdpO2uXTnR4tx8cUC4=
            got:    sha256-j+/EV/PeGXBYXH4qa3lsMmOMWruSdqt5MtjfVjEfdmM=

@drupol
Copy link
Contributor Author

drupol commented Jan 12, 2025

This is critical.... I wish I could run diffoscope on both outputs to find out the differences. Do you have a clue on how we could do that ?

@piotrkwiecinski
Copy link
Contributor

@drupol unfortunately at the moment I don't. I checked other packages we have and so far this one is the only one breaking...

@drupol
Copy link
Contributor Author

drupol commented Jan 12, 2025 •
edited
Loading

I wasn't able to reproduce the issue. Are you sure that you're using the Composer with the patch? I can see that it is only available on nixpkgs-unstable (https://nixpkgs-tracker.ocfox.me/?pr=372696).

Here's my complete terminal log:

❯ nix shell github:NixOS/nixpkgs/nixpkgs-unstable#phpPackages.composer
❯ composer --version
Composer version 2.8.4 2024-12-11 11:57:47
PHP version 8.3.15 (/nix/store/5vbvzfwnisybmm4kria458l0yk0sclb1-php-with-extensions-8.3.15/bin/php)
Run the "diagnose" command to get more detailed diagnostics output.
❯ rm -rf vendor0 vendor1
❯ composer --no-cache --quiet install
❯ mv vendor vendor0
❯ composer --no-cache --quiet install
❯ mv vendor vendor1
❯ diffoscope --exclude-directory-metadata recursive vendor0 vendor1
❯

Let me know if you have the same result.

@piotrkwiecinski
Copy link
Contributor

I run nix-build -A phpdocumentor using master branch.

@drupol
Copy link
Contributor Author

drupol commented Jan 12, 2025

I run nix-build -A phpdocumentor using master branch.

Can you try the reproducer there and see if you have the same result as mine?

@piotrkwiecinski
Copy link
Contributor

On freshly cloned phpDocumentor repo:

composer --version
Composer version 2.8.4 2024-12-11 11:57:47
PHP version 8.3.15 (/nix/store/5vbvzfwnisybmm4kria458l0yk0sclb1-php-with-extensions-8.3.15/bin/php)
Run the "diagnose" command to get more detailed diagnostics output.

Output of diff:

diffoscope --exclude-directory-metadata recursive vendor0 vendor1
--- vendor0
+++ vendor1
│   --- vendor0/composer
├── +++ vendor1/composer
│ │   --- vendor0/composer/autoload_psr4.php
│ ├── +++ vendor1/composer/autoload_psr4.php
│ │ @@ -2,17 +2,17 @@
│ │  
│ │  // autoload_psr4.php @generated by Composer
│ │  
│ │  $vendorDir = dirname(__DIR__);
│ │  $baseDir = dirname($vendorDir);
│ │  
│ │  return array(
│ │ +    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'),
│ │ -    'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/reflection-common/src'),
│ │      'phpDocumentor\\JsonPath\\' => array($baseDir . '/incubator/json-path/tests/unit', $vendorDir . '/phpdocumentor/json-path/src'),
│ │ +    'phpDocumentor\\Guides\\' => array($vendorDir . '/phpdocumentor/guides-graphs/src', $vendorDir . '/phpdocumentor/guides/src', $vendorDir . '/phpdocumentor/guides-restructured-text/src', $vendorDir . '/phpdocumentor/guides-markdown/src'),
│ │ -    'phpDocumentor\\Guides\\' => array($vendorDir . '/phpdocumentor/guides/src', $vendorDir . '/phpdocumentor/guides-restructured-text/src', $vendorDir . '/phpdocumentor/guides-graphs/src', $vendorDir . '/phpdocumentor/guides-markdown/src'),
│ │      'phpDocumentor\\GraphViz\\PHPStan\\' => array($vendorDir . '/phpdocumentor/graphviz/src/phpDocumentor/PHPStan'),
│ │      'phpDocumentor\\GraphViz\\' => array($vendorDir . '/phpdocumentor/graphviz/src/phpDocumentor/GraphViz'),
│ │      'phpDocumentor\\' => array($baseDir . '/src/phpDocumentor', $baseDir . '/tests/unit/phpDocumentor', $baseDir . '/tests/integration/phpDocumentor', $baseDir . '/tests/functional/phpDocumentor', $vendorDir . '/phpdocumentor/reflection/src/phpDocumentor'),
│ │      'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
│ │      'Twig\\' => array($vendorDir . '/twig/twig/src'),
│ │      'TwigCsFixer\\' => array($baseDir . '/tests/twig-cs-fixer', $vendorDir . '/vincentlanglet/twig-cs-fixer/src'),
│ │      'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'),
│ │   --- vendor0/composer/autoload_static.php
│ ├── +++ vendor1/composer/autoload_static.php
│ │ @@ -495,25 +495,25 @@
│ │  00001ee0: 6179 2028 0a20 2020 2020 2020 2027 7068  ay (.        'ph
│ │  00001ef0: 7044 6f63 756d 656e 746f 725c 5c52 6566  pDocumentor\\Ref
│ │  00001f00: 6c65 6374 696f 6e5c 5c27 203d 3e20 0a20  lection\\' => . 
│ │  00001f10: 2020 2020 2020 2061 7272 6179 2028 0a20         array (. 
│ │  00001f20: 2020 2020 2020 2020 2020 2030 203d 3e20             0 => 
│ │  00001f30: 5f5f 4449 525f 5f20 2e20 272f 2e2e 2720  __DIR__ . '/..' 
│ │  00001f40: 2e20 272f 7068 7064 6f63 756d 656e 746f  . '/phpdocumento
│ │ +00001f50: 722f 7265 666c 6563 7469 6f6e 2d63 6f6d  r/reflection-com
│ │ +00001f60: 6d6f 6e2f 7372 6327 2c0a 2020 2020 2020  mon/src',.      
│ │ +00001f70: 2020 2020 2020 3120 3d3e 205f 5f44 4952        1 => __DIR
│ │ +00001f80: 5f5f 202e 2027 2f2e 2e27 202e 2027 2f70  __ . '/..' . '/p
│ │ +00001f90: 6870 646f 6375 6d65 6e74 6f72 2f74 7970  hpdocumentor/typ
│ │ +00001fa0: 652d 7265 736f 6c76 6572 2f73 7263 272c  e-resolver/src',
│ │ +00001fb0: 0a20 2020 2020 2020 2020 2020 2032 203d  .            2 =
│ │ +00001fc0: 3e20 5f5f 4449 525f 5f20 2e20 272f 2e2e  > __DIR__ . '/..
│ │ +00001fd0: 2720 2e20 272f 7068 7064 6f63 756d 656e  ' . '/phpdocumen
│ │ +00001fe0: 746f 722f 7265 666c 6563 7469 6f6e 2d64  tor/reflection-d
│ │ +00001ff0: 6f63 626c 6f63 6b2f 7372 6327 2c0a 2020  ocblock/src',.  
│ │ -00001f50: 722f 7479 7065 2d72 6573 6f6c 7665 722f  r/type-resolver/
│ │ -00001f60: 7372 6327 2c0a 2020 2020 2020 2020 2020  src',.          
│ │ -00001f70: 2020 3120 3d3e 205f 5f44 4952 5f5f 202e    1 => __DIR__ .
│ │ -00001f80: 2027 2f2e 2e27 202e 2027 2f70 6870 646f   '/..' . '/phpdo
│ │ -00001f90: 6375 6d65 6e74 6f72 2f72 6566 6c65 6374  cumentor/reflect
│ │ -00001fa0: 696f 6e2d 646f 6362 6c6f 636b 2f73 7263  ion-docblock/src
│ │ -00001fb0: 272c 0a20 2020 2020 2020 2020 2020 2032  ',.            2
│ │ -00001fc0: 203d 3e20 5f5f 4449 525f 5f20 2e20 272f   => __DIR__ . '/
│ │ -00001fd0: 2e2e 2720 2e20 272f 7068 7064 6f63 756d  ..' . '/phpdocum
│ │ -00001fe0: 656e 746f 722f 7265 666c 6563 7469 6f6e  entor/reflection
│ │ -00001ff0: 2d63 6f6d 6d6f 6e2f 7372 6327 2c0a 2020  -common/src',.  
│ │  00002000: 2020 2020 2020 292c 0a20 2020 2020 2020        ),.       
│ │  00002010: 2027 7068 7044 6f63 756d 656e 746f 725c   'phpDocumentor\
│ │  00002020: 5c4a 736f 6e50 6174 685c 5c27 203d 3e20  \JsonPath\\' => 
│ │  00002030: 0a20 2020 2020 2020 2061 7272 6179 2028  .        array (
│ │  00002040: 0a20 2020 2020 2020 2020 2020 2030 203d  .            0 =
│ │  00002050: 3e20 5f5f 4449 525f 5f20 2e20 272f 2e2e  > __DIR__ . '/..
│ │  00002060: 2f2e 2e27 202e 2027 2f69 6e63 7562 6174  /..' . '/incubat
│ │ @@ -526,24 +526,24 @@
│ │  000020d0: 2020 2020 2029 2c0a 2020 2020 2020 2020       ),.        
│ │  000020e0: 2770 6870 446f 6375 6d65 6e74 6f72 5c5c  'phpDocumentor\\
│ │  000020f0: 4775 6964 6573 5c5c 2720 3d3e 200a 2020  Guides\\' => .  
│ │  00002100: 2020 2020 2020 6172 7261 7920 280a 2020        array (.  
│ │  00002110: 2020 2020 2020 2020 2020 3020 3d3e 205f            0 => _
│ │  00002120: 5f44 4952 5f5f 202e 2027 2f2e 2e27 202e  _DIR__ . '/..' .
│ │  00002130: 2027 2f70 6870 646f 6375 6d65 6e74 6f72   '/phpdocumentor
│ │ +00002140: 2f67 7569 6465 732d 6772 6170 6873 2f73  /guides-graphs/s
│ │ +00002150: 7263 272c 0a20 2020 2020 2020 2020 2020  rc',.           
│ │ +00002160: 2031 203d 3e20 5f5f 4449 525f 5f20 2e20   1 => __DIR__ . 
│ │ +00002170: 272f 2e2e 2720 2e20 272f 7068 7064 6f63  '/..' . '/phpdoc
│ │ +00002180: 756d 656e 746f 722f 6775 6964 6573 2f73  umentor/guides/s
│ │ +00002190: 7263 272c 0a20 2020 2020 2020 2020 2020  rc',.           
│ │ +000021a0: 2032 203d 3e20 5f5f 4449 525f 5f20 2e20   2 => __DIR__ . 
│ │ +000021b0: 272f 2e2e 2720 2e20 272f 7068 7064 6f63  '/..' . '/phpdoc
│ │ +000021c0: 756d 656e 746f 722f 6775 6964 6573 2d72  umentor/guides-r
│ │ +000021d0: 6573 7472 7563 7475 7265 642d 7465 7874  estructured-text
│ │ -00002140: 2f67 7569 6465 732f 7372 6327 2c0a 2020  /guides/src',.  
│ │ -00002150: 2020 2020 2020 2020 2020 3120 3d3e 205f            1 => _
│ │ -00002160: 5f44 4952 5f5f 202e 2027 2f2e 2e27 202e  _DIR__ . '/..' .
│ │ -00002170: 2027 2f70 6870 646f 6375 6d65 6e74 6f72   '/phpdocumentor
│ │ -00002180: 2f67 7569 6465 732d 7265 7374 7275 6374  /guides-restruct
│ │ -00002190: 7572 6564 2d74 6578 742f 7372 6327 2c0a  ured-text/src',.
│ │ -000021a0: 2020 2020 2020 2020 2020 2020 3220 3d3e              2 =>
│ │ -000021b0: 205f 5f44 4952 5f5f 202e 2027 2f2e 2e27   __DIR__ . '/..'
│ │ -000021c0: 202e 2027 2f70 6870 646f 6375 6d65 6e74   . '/phpdocument
│ │ -000021d0: 6f72 2f67 7569 6465 732d 6772 6170 6873  or/guides-graphs
│ │  000021e0: 2f73 7263 272c 0a20 2020 2020 2020 2020  /src',.         
│ │  000021f0: 2020 2033 203d 3e20 5f5f 4449 525f 5f20     3 => __DIR__ 
│ │  00002200: 2e20 272f 2e2e 2720 2e20 272f 7068 7064  . '/..' . '/phpd
│ │  00002210: 6f63 756d 656e 746f 722f 6775 6964 6573  ocumentor/guides
│ │  00002220: 2d6d 6172 6b64 6f77 6e2f 7372 6327 2c0a  -markdown/src',.
│ │  00002230: 2020 2020 2020 2020 292c 0a20 2020 2020          ),.     
│ │  00002240: 2020 2027 7068 7044 6f63 756d 656e 746f     'phpDocumento

@drupol drupol mentioned this pull request Jan 12, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@drupol @piotrkwiecinski