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.

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

volk: 3.0.0 -> 3.1.2 #330477

Merged
merged 11 commits into from
Aug 3, 2024
Merged

volk: 3.0.0 -> 3.1.2 #330477

merged 11 commits into from
Aug 3, 2024

Conversation

doronbehar
Copy link
Contributor

Description of changes

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)
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jul 27, 2024
@doronbehar doronbehar linked an issue Jul 27, 2024 that may be closed by this pull request
@tko
Copy link

tko commented Jul 27, 2024

FWIW I built default.nix on aarch64-darwin successfully earlier, and other than some cosmetics this PR seems fine.

nixpkgs-review is taking a long while...

@doronbehar
Copy link
Contributor Author

doronbehar commented Jul 27, 2024

FWIW I built default.nix on aarch64-darwin successfully earlier, and other than some cosmetics this PR seems fine.

That's not the same thing - now the expression is very different - it is not even located in the same place and it, and it doesn't build the same sources.

nixpkgs-review is taking a long while...

Yea I should have recommended to you to wait a bit for ofborg to finish evaluation here so that you won't run it locally. See the ofborg (first) feature explained here. ofborg just finished evaluating attributes here, so respawning nixpkgs-review should at least start building things a bit faster. If it already builds attributes for you, there is no way to speed it up.

@tko
Copy link

tko commented Jul 28, 2024

Result of nixpkgs-review pr 330477 run on aarch64-darwin 1

1 package failed to build:
  • gnuradio3_8Packages.ais
20 packages built:
  • gnuradio
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
  • gnuradio3_9
  • gnuradioMinimal (gnuradio3_9Minimal)
  • gnuradio3_9Packages.grnet
  • gnuradio3_9Packages.osmosdr
  • gnuradio3_9Packages.osmosdr.dev
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • sdrpp
  • sigdigger
  • sigutils
  • suscan
  • suwidgets
  • volk

@doronbehar
Copy link
Contributor Author

Result of nixpkgs-review pr 330477 run on x86_64-linux 1

14 packages failed to build:
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.ais
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.limesdr
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
  • gnuradio3_9
  • gnuradio3_9Packages.grnet
  • gnuradio3_9Packages.osmosdr
  • gnuradio3_9Packages.osmosdr.dev
  • inspectrum
  • qradiolink
15 packages built:
  • gnss-sdr
  • gnuradio
  • gnuradioMinimal (gnuradio3_9Minimal)
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • nixpkgs-manual
  • sdrpp
  • sigdigger
  • sigutils
  • suscan
  • suwidgets
  • volk

@doronbehar
Copy link
Contributor Author

Hmm very peculiar ... The gnuradio3_8 builds failed for me on x86_64-linux. Also gnuradio3_9 builds failed, but in a slightly different manner.

I pushed a few more commits for to these attributes. If @tie you'd be kind enough to run a nixpkgs-review again for these commits it'd be great, I can cc you when ofborg finished evaluation, so it won't take too much resources from you like before.

@tie
Copy link
Member

tie commented Jul 28, 2024

If @tie you'd be kind enough to run a nixpkgs-review again

I assume this is a typo and you wanted to ping @tko 😅
But feel free to also ping me, I can run nixpkgs-review on aarch64-linux.

@tko
Copy link

tko commented Jul 28, 2024

error:
       … while querying the derivation named 'gr-ais-2020-08-13'
[..]
       error: attribute 'volk' missing

       at /Users/tko/.cache/nixpkgs-review/pr-330477-6/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix:29:59:

           28|     # always be needed
           29|     buildInputs = (args.buildInputs or []) ++ [ unwrapped unwrapped.volk ];
             |                                                           ^
           30|   };

@doronbehar
Copy link
Contributor Author

error:
       … while querying the derivation named 'gr-ais-2020-08-13'
[..]
       error: attribute 'volk' missing

       at /Users/tko/.cache/nixpkgs-review/pr-330477-6/nixpkgs/pkgs/development/gnuradio-modules/mkDerivation.nix:29:59:

           28|     # always be needed
           29|     buildInputs = (args.buildInputs or []) ++ [ unwrapped unwrapped.volk ];
             |                                                           ^
           30|   };

Thanks. At least this error will be fixed now. (will recheck ofborg once more in a while).

@doronbehar
Copy link
Contributor Author

Evaluation finished successfully. Now running nixpkgs-review locally on an x86_64-linux.

@doronbehar
Copy link
Contributor Author

Result of nixpkgs-review pr 330477 run on x86_64-linux 1

25 packages built:
  • gnss-sdr
  • gnuradio
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.ais
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.limesdr
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
  • gnuradioMinimal
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • inspectrum
  • nixpkgs-manual
  • qradiolink
  • sdrpp
  • sigdigger
  • sigutils
  • suscan
  • suwidgets
  • volk

@tko
Copy link

tko commented Jul 28, 2024

Result of nixpkgs-review pr 330477 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • gnuradio3_8Packages.ais
6 packages failed to build:
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
10 packages built:
  • gnuradio
  • gnuradioMinimal
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • sdrpp
  • sigdigger
  • sigutils
  • suscan
  • suwidgets
  • volk

@doronbehar
Copy link
Contributor Author

Thanks for the quick report! Could you share please the build logs of gnuradio3_8Minimal? It is available in logs directory of the nixpkgs-review shell..

@tie
Copy link
Member

tie commented Jul 28, 2024

Result of nixpkgs-review pr 330477 run on aarch64-linux 1

24 packages built:
  • gnss-sdr
  • gnuradio
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.ais
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.limesdr
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
  • gnuradioMinimal
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • inspectrum
  • qradiolink
  • sdrpp
  • sigdigger
  • sigutils
  • suscan
  • suwidgets
  • volk

@tie
Copy link
Member

tie commented Jul 28, 2024

Had to run with --build-args '--max-jobs 1' because of OOM (with 32GB, 16 cores).

@tko
Copy link

tko commented Jul 28, 2024

gnuradio3_8Minimal.log

@doronbehar doronbehar changed the title volk: 3.0.0 -> 3.1.2; cleanup volk: 3.0.0 -> 3.1.2 Jul 28, 2024
@doronbehar
Copy link
Contributor Author

Thanks @tko :). This build log I am afraid indicates that for GR 3.8 there is no choice but to go back to volk2, for all platforms. I've found for it an alternative build solution - using Python 3.11 (like GR 3.8 uses), as it still supports the deprecated distutils.

If in an hour or two (after ofborg evaluation finishes) you'd be able to run a nixpkgs-review again, that would be great 🙏.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 28, 2024
@tko
Copy link

tko commented Jul 28, 2024

Result of nixpkgs-review pr 330477 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • gnuradio3_8Packages.ais
2 packages failed to build:
  • sigdigger
  • suscan
14 packages built:
  • gnuradio
  • gnuradio3_8
  • gnuradio3_8Minimal
  • gnuradio3_8Packages.grnet
  • gnuradio3_8Packages.osmosdr
  • gnuradio3_8Packages.osmosdr.dev
  • gnuradio3_8Packages.rds
  • gnuradioMinimal
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • sdrpp
  • sigutils
  • suwidgets
  • volk

The build error looks to have been suscan, dependency of sigdigger

-- Could NOT find ZLIB (missing: ZLIB_LIBRARY) (found version "1.2.11")
[..]
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
ZLIB_LIBRARY
    linked by target "suscan" in directory /tmp/nix-build-suscan-unstable-2022-07-05.drv-0/source

@doronbehar
Copy link
Contributor Author

Thanks again for the report @tko. Maybe an update to suscan will fix the issue. I checked that sigdigger compiles on x86_64-linux with the suscan update I just pushed, and I checked basic functionality of both packages' commands.

I will give a few days for the maintainers of both packages (@polygon and @oxapentane) to respond to this suscan update, and I will also let a few more days for ofborg to build this on aarch64-darwin. If you really want to speed things up, you can run a nixpkgs-review once more, but that's up to you :). Thanks again for contributing your local hardware's time :).

@doronbehar
Copy link
Contributor Author

@ofborg build sigdigger

@tko
Copy link

tko commented Jul 28, 2024

I see same error from suscan-0.3.0

-- Could NOT find ZLIB (missing: ZLIB_LIBRARY) (found version "1.2.11")
[..]
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
ZLIB_LIBRARY
    linked by target "suscan" in directory /tmp/nix-build-suscan-0.3.0.drv-0/source

@doronbehar
Copy link
Contributor Author

OK I found out that the suscan update wasn't really an update - upstream only decided to tag the same revision that we used as v0.3.0 . Makes the expression nicer, but of course it won't solve the zlib issue.

I fixed the expression to use rev = "v${version}";. And I won't make an effort to fix that. It is barely related to this update, and I can't fix that without my hands on a Darwin machine. I also expect Darwin users to experience this issue in the next channel update (if there are Darwin users that use this package).

I'll give a few days for the maintainers of suscan to respond, and I'll merge this in a few days.

@doronbehar
Copy link
Contributor Author

OK suscan was broken apparently on all platforms - I missed that because my branch wasn't rebased upon latest master, and ofborg didn't miss that. Now it should be fixed. I'll wait for CI to be greener and I'll merge this.

pkgs/by-name/vo/volk2/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/vo/volk2/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/vo/volk2/package.nix Outdated Show resolved Hide resolved
Based on the expression deleted in a previous commit, use this
expression in an upcoming commit for gnuradio3_8{,Minimal}.
Nothing really changed, only upstream tagged the same commit as v0.3.0,
see:
BatchDrake/suscan@37dad54...v0.3.0
@doronbehar doronbehar merged commit 79860d1 into NixOS:master Aug 3, 2024
26 of 27 checks passed
@doronbehar doronbehar deleted the pkg/volk3 branch August 3, 2024 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: volk
4 participants