Skip to content

vobcopy: 1.2.0 -> 1.2.1; change upstream#416156

Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom
mdaniels5757:unbreak-vobcopy
Jun 19, 2025
Merged

vobcopy: 1.2.0 -> 1.2.1; change upstream#416156
Aleksanaa merged 1 commit intoNixOS:masterfrom
mdaniels5757:unbreak-vobcopy

Conversation

@mdaniels5757
Copy link
Member

@mdaniels5757 mdaniels5757 commented Jun 12, 2025

The previous upstream seems to be dead, but a Debian maintainer has a fork.

Fixes GCC 14 build. (Tracking: #388196 #356812)

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 12, 2025
@nix-owners nix-owners bot requested a review from bluescreen303 June 12, 2025 14:22
@mdaniels5757 mdaniels5757 changed the title vobcopy: unbreak build, change upstream vobcopy: 1.2.0 -> 1.2.1; change upstream Jun 12, 2025
Aleksanaa
Aleksanaa approved these changes Jun 12, 2025
View reviewed changes
@Sigmanificient Sigmanificient mentioned this pull request Jun 12, 2025
Open
28 tasks
@github-actions github-actions bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 17, 2025
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 18, 2025 •
edited
Loading

I still need to fix on Darwin:

nixpkgs-review result for #416156

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 416156

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/15735402145

x86_64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

aarch64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

x86_64-darwin (sandbox = true)

❌ 1 package failed to build:
  • vobcopy
Error logs: `x86_64-darwin`
vobcopy 
  176 |        if( !strcmp( path, buf.f_mntonname ) )
      |                           ~~~ ^
dvd.c:183:24: error: no member named 'f_mntfromname' in 'struct statvfs'
  183 |            strcat(device, buf.f_mntfromname + 5);
      |                           ~~~ ^
/nix/store/sjhayh3763d02l76flkf2smzkwkjsfpq-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/secure/_string.h:135:33: note: expanded from macro 'strcat'
  135 |                 __builtin___strcat_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
      |                                               ^~~~~~~~~~~
dvd.c:187:29: error: no member named 'f_mntfromname' in 'struct statvfs'
  187 |          strcpy(device, buf.f_mntfromname);
      |                         ~~~ ^
/nix/store/sjhayh3763d02l76flkf2smzkwkjsfpq-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/secure/_string.h:84:33: note: expanded from macro 'strcpy'
   84 |                 __builtin___strcpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
      |                                               ^~~~~~~~~~~
2 warnings and 3 errors generated.
make[2]: *** [Makefile:511: dvd.o] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-vobcopy-1.2.1.drv-0/source'
make[1]: *** [Makefile:612: all-recursive] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-vobcopy-1.2.1.drv-0/source'
make: *** [Makefile:392: all] Error 2

aarch64-darwin (sandbox = true)

❌ 1 package failed to build:
  • vobcopy
Error logs: `aarch64-darwin`
vobcopy 
  176 |        if( !strcmp( path, buf.f_mntonname ) )
      |                           ~~~ ^
dvd.c:183:24: error: no member named 'f_mntfromname' in 'struct statvfs'
  183 |            strcat(device, buf.f_mntfromname + 5);
      |                           ~~~ ^
/nix/store/bbq3psy4xax2xyw39fmlihql4czpca7k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/secure/_string.h:135:33: note: expanded from macro 'strcat'
  135 |                 __builtin___strcat_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
      |                                               ^~~~~~~~~~~
dvd.c:187:29: error: no member named 'f_mntfromname' in 'struct statvfs'
  187 |          strcpy(device, buf.f_mntfromname);
      |                         ~~~ ^
/nix/store/bbq3psy4xax2xyw39fmlihql4czpca7k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/secure/_string.h:84:33: note: expanded from macro 'strcpy'
   84 |                 __builtin___strcpy_chk (dest, __VA_ARGS__, __darwin_obsz (dest))
      |                                               ^~~~~~~~~~~
2 warnings and 3 errors generated.
make[2]: *** [Makefile:511: dvd.o] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-vobcopy-1.2.1.drv-0/source'
make[1]: *** [Makefile:612: all-recursive] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-vobcopy-1.2.1.drv-0/source'
make: *** [Makefile:392: all] Error 2

@mdaniels5757 mdaniels5757 force-pushed the unbreak-vobcopy branch 3 times, most recently from b20a6aa to 3e43acc Compare June 18, 2025 15:02
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. labels Jun 18, 2025
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 18, 2025

nixpkgs-review result for #416156

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 416156

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/15736525239

x86_64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

aarch64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

@mdaniels5757 mdaniels5757 requested a review from Aleksanaa June 18, 2025 15:10
Aleksanaa
Aleksanaa reviewed Jun 18, 2025
View reviewed changes
@Aleksanaa
Copy link
Member

Aleksanaa commented Jun 18, 2025

I don't think we should merge this before solving problems on macOS, because this will intentionally break darwin platform (it now works)

@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 18, 2025

I think I may have just found the solution? (I swear it didn't come up the first time I googled it...) Running nixpkgs-review now.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jun 18, 2025
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 18, 2025

nixpkgs-review result for #416156

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 416156

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/15738532244

x86_64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

aarch64-linux (sandbox = true)

✅ 1 package built:
  • vobcopy

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • vobcopy

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • vobcopy

Aleksanaa
Aleksanaa reviewed Jun 19, 2025
View reviewed changes
Aleksanaa
Aleksanaa reviewed Jun 19, 2025
View reviewed changes
@mdaniels5757
vobcopy: 1.2.0 -> 1.2.1-unstable-2023-08-29; change upstream
decbd77 
The previous upstream seems to be dead, but a Debian maintainer has a fork.

Fixes GCC 14 build.
@Aleksanaa Aleksanaa merged commit 02b4782 into NixOS:master Jun 19, 2025
23 of 26 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 19, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 19, 2025
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jun 19, 2025
Merged
1 task
@mdaniels5757 mdaniels5757 deleted the unbreak-vobcopy branch June 19, 2025 12:54
@mdaniels5757 mdaniels5757 mentioned this pull request Jun 22, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Aleksanaa Aleksanaa Aleksanaa approved these changes

@bluescreen303 bluescreen303 Awaiting requested review from bluescreen303

Assignees

No one assigned

Labels

0.kind: build failure A package fails to build 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mdaniels5757 @Aleksanaa