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

ffado: 2.4.1 -> 2.4.2 #83128

Merged
merged 3 commits into from Mar 30, 2020
Merged

ffado: 2.4.1 -> 2.4.2 #83128

merged 3 commits into from Mar 30, 2020

Conversation

michojel
Copy link
Contributor

@michojel michojel commented Mar 22, 2020 •
edited

Motivation for this change

Bumped version and did some fixes to binaries.

  • fixed broken ffado-diag (hardcoded kernel module paths)
  • fixed ffado-mixer (broken Qt5)
  • enabled ffado-test
  • added desktop file for ffado-mixer
  • formatted using nixpkgs-fmt
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
    • ffado-diag
    • ffado-test
    • ffado-mixer
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@michojel
ffado: 2.4.1 -> 2.4.2
bb317ec 
- fixed ffado-diag
- fixed ffado-mixer
- enabled ffado-test

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
@michojel
Copy link
Contributor Author

@goibhniu could you please take a look?

@ofborg ofborg bot requested a review from cillianderoiste March 22, 2020 11:09
@michojel
switched from the current system to the booted one
22327ea 
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
@michojel
Copy link
Contributor Author

A dependent package (tambura) fails to build both with this change and in the master:

Failing package review:

nixpkgs-review rev HEAD
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
$ git worktree add /home/miminar/.cache/nixpkgs-review/rev-bb317ecbc684fddc12cc78d607272826ed29a9c7/nixpkgs 6c48c7b81f230e469becfe7f8447c434a955f08b
Preparing worktree (detached HEAD 6c48c7b81f2)
Updating files: 100% (21248/21248), done.
HEAD is now at 6c48c7b81f2 fd: 7.4.0 -> 7.5.0
$ nix-env -f /home/miminar/.cache/nixpkgs-review/rev-bb317ecbc684fddc12cc78d607272826ed29a9c7/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit bb317ecbc684fddc12cc78d607272826ed29a9c7
Auto-merging pkgs/top-level/all-packages.nix
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/miminar/.cache/nixpkgs-review/rev-bb317ecbc684fddc12cc78d607272826ed29a9c7/nixpkgs -qaP --xml --out-path --show-trace --meta
19 package updated:
aj-snapshot carla faust2jack faust2jaqt ffado (2.4.1 → 2.4.2) ffado (2.4.1 → 2.4.2) giada jack1 jack2 jackmix lsp-plugins ltc-tools luppp pulseeffects shotcut soundtracker Tambura tetraproc tuxguitar                                                                                                                                                                                     

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/miminar/.cache/nixpkgs-review/rev-bb317ecbc684fddc12cc78d607272826ed29a9c7/build.nix
warning: ignoring the user-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user
waiting for locks or build slots...
builder for '/nix/store/505csnqn7ic0z93hxbpvy9fh9w4yblmy-Tambura-1.0.drv' failed with exit code 1; last 10 log lines:
  building
  sh: which: not found
  sh: which: not found
  sh: which: not found
  /nix/store/4364p9986svv5fzski7dj1yfy3v07xni-faust2jaqt-2.20.2/bin/.faust2jaqt-wrapped: line 29: which: command not found
  /nix/store/4364p9986svv5fzski7dj1yfy3v07xni-faust2jaqt-2.20.2/bin/.faust2jaqt-wrapped: line 29: which: command not found
  sh: which: not found
   
  start parser
  ERROR : unable to open file oscillator.lib
cannot build derivation '/nix/store/ys7871z1z0h6i5bcfgnx63v34zqrihh9-env.drv': 1 dependencies couldn't be built
[4 built (1 failed)]
error: build of '/nix/store/ys7871z1z0h6i5bcfgnx63v34zqrihh9-env.drv' failed
1 package failed to build:
tambura

17 package built:
aj-snapshot carla faust2jack faust2jaqt ffado giada jack1 jack2 jackmix_jack1 lsp-plugins ltc-tools luppp pulseeffects shotcut soundtracker tetraproc tuxguitar

Failing build in master:

nix-build $(pwd) -A tambura 
these derivations will be built:
  /nix/store/w4zc1a582ja8dmfqs94nvzglcpk7j4d5-Tambura-1.0.drv
these paths will be fetched (1.39 MiB download, 8.42 MiB unpacked):
  /nix/store/1s1gvnww2rzpzz3wds79nvgdpmd8xkc5-ffado-2.4.1
  /nix/store/91wxhs4rp6dacz76ya7rrkdh3rg8anjj-jack2-1.9.14
  /nix/store/dja1nhnr23f4r4324ifxs52dzx50lacr-faust2jaqt-2.20.2
copying path '/nix/store/1s1gvnww2rzpzz3wds79nvgdpmd8xkc5-ffado-2.4.1' from 'https://cache.nixos.org'...
copying path '/nix/store/91wxhs4rp6dacz76ya7rrkdh3rg8anjj-jack2-1.9.14' from 'https://cache.nixos.org'...
copying path '/nix/store/dja1nhnr23f4r4324ifxs52dzx50lacr-faust2jaqt-2.20.2' from 'https://cache.nixos.org'...
building '/nix/store/w4zc1a582ja8dmfqs94nvzglcpk7j4d5-Tambura-1.0.drv'...
unpacking sources
unpacking source archive /nix/store/a58fp3a7f3dpxiyhv1gcw2r1jp1lrk6f-source
source root is source
patching sources
configuring
no configure script, doing nothing
building
sh: which: not found
sh: which: not found
sh: which: not found
/nix/store/dja1nhnr23f4r4324ifxs52dzx50lacr-faust2jaqt-2.20.2/bin/.faust2jaqt-wrapped: line 29: which: command not found
/nix/store/dja1nhnr23f4r4324ifxs52dzx50lacr-faust2jaqt-2.20.2/bin/.faust2jaqt-wrapped: line 29: which: command not found
sh: which: not found

start parser
ERROR : unable to open file oscillator.lib
builder for '/nix/store/w4zc1a582ja8dmfqs94nvzglcpk7j4d5-Tambura-1.0.drv' failed with exit code 1
error: build of '/nix/store/w4zc1a582ja8dmfqs94nvzglcpk7j4d5-Tambura-1.0.drv' failed

That can be addressed in a follow-up I guess.

cc @magnetophon

@michojel
Copy link
Contributor Author

@GrahamcOfBorg build ffado

@magnetophon
Copy link
Member

@michojel That tambura error is unrelated.
It will be fixed when #82650 is merged.

bhipple
bhipple reviewed Mar 29, 2020
View reviewed changes
Copy link
Contributor

@bhipple bhipple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GrahamcOfBorg build ffado tambura

pkgs/os-specific/linux/ffado/default.nix Outdated Show resolved Hide resolved
@michojel
quoted home page URL according to RFC 0045
dd2e6d3 
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
bhipple
bhipple approved these changes Mar 30, 2020
View reviewed changes
Copy link
Contributor

@bhipple bhipple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 83128 1

1 package marked as broken and skipped: - sonic-pi
18 package built: - aj-snapshot - carla - faust2jack - faust2jaqt - ffado (libffado) - giada - jack1 - jack2 (jack2Full) - jackmix_jack1 - lsp-plugins - ltc-tools - luppp - pulseeffects - shotcut - soundtracker - tambura - tetraproc - tuxguitar

@bhipple bhipple merged commit 504579f into NixOS:master Mar 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth left review comments

@bhipple bhipple bhipple approved these changes

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@michojel @magnetophon @roberth @bhipple