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

Update liquidsoap to 2.0.5 #140777

Merged
merged 9 commits into from Jun 9, 2022
Merged

Update liquidsoap to 2.0.5 #140777

merged 9 commits into from Jun 9, 2022

Conversation

dali99
Copy link
Member

@dali99 dali99 commented Oct 6, 2021

Motivation for this change

Liquidsoap no longer provides liquidsoap-full source, so all the savonet libraries must be packaged properly as libraries now.

Camomile's META file did not include a version, which is required for liquidsoap's configure step, so I added it.
Feel free to suggest a better way to accomplish this

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.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.

@dali99 dali99 force-pushed the update_liquidsoap branch 3 times, most recently from f2c62e8 to b1ab38f Compare October 7, 2021 00:13
@dali99
Copy link
Member Author

dali99 commented Oct 30, 2021

That should be all of the libraries documented on https://www.liquidsoap.info/doc-dev/build.html except:

  • osx-secure-transport
  • tsdl-image
  • tsdl-tff

tdsl-image seems pretty abandoned and didn't compile for me

@dali99 dali99 force-pushed the update_liquidsoap branch 2 times, most recently from 568af1a to db9301f Compare December 9, 2021 18:11
@ofborg ofborg bot requested a review from ehmry December 9, 2021 18:24
@dali99
Copy link
Member Author

dali99 commented Dec 9, 2021

1 package failed to build:
ligo

6 packages built:
libbap liquidsoap python38Packages.bap python39Packages.bap reason shine

but then when I tried building ligo manually it worked so it was just flaky with nix-review for some weird reason

@ehmry
Copy link
Contributor

ehmry commented Dec 11, 2021

Thanks for updating this, I tried earlier this year but gave up. I have some more ocalm packages that you might be able to use: master...ehmry:liquidsoap

@vbgl
Copy link
Contributor

vbgl commented Jan 2, 2022

This huge PR will be a pain to review. Fortunately many changes are independent and can be reviewed and merged separately. Could you please split this PR into smaller pieces?

@Lassulus
Copy link
Member

Lassulus commented Feb 3, 2022

would be glad to see this merged. can you maybe fix the merge conflict and then we could check if anything fails and if not merge it?

@dali99
Copy link
Member Author

dali99 commented Feb 3, 2022 via email

pkgs/tools/audio/liquidsoap/full.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/ssl/default.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/posix/time2.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/gstreamer/default.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix Outdated Show resolved Hide resolved
pkgs/development/ocaml-modules/fdkaac/default.nix Outdated Show resolved Hide resolved
@dali99
Copy link
Member Author

dali99 commented Jun 8, 2022

Current status:

checking for ocaml posix-time2 module... Not found.
checking for ocaml curl module >= 0.9.2... requires version >= 0.9.2 found 0.9.1.
checking for ocaml memtrace module... Not found.
checking for ocaml mem_usage module... Not found.
checking for ocaml lastfm module >= 0.3.0... lastfm needs xmlplaylist curl
checking for ocaml osx-secure-transport module... Not found.
checking for ocaml tsdl-ttf module... Not found.
checking for ocaml tsdl-image module >= 0.3.2... Not found.
checking for ocaml cohttp-lwt-unix module... Not found.
checking for ocaml prometheus-app module... Not found.
checking for ocaml winsvc module... Not found.
* Liquidsoap
   - version           : 2.0.5

 * Supported input formats
   - MP3               : yes
   - AAC               : yes
   - FFmpeg            : yes
   - Flac (native)     : yes
   - Flac (ogg)        : yes
   - Lastfm            : no (requires lastfm)
   - Opus              : yes
   - Speex             : yes
   - Theora            : yes
   - Vorbis            : yes
   - XML playlists     : yes

 * Supported output formats
   - FDK-AAC           : yes
   - FFmpeg            : yes
   - MP3               : yes
   - MP3 (fixed-point) : yes
   - Opus              : yes
   - SPEEX             : yes
   - Theora            : yes
   - Vorbis            : yes

 * Tags
   - charset detection : yes
   - Taglib (ID3 tags) : yes
   - Vorbis            : yes

 * Input / output
   - ALSA              : yes
   - AO                : yes
   - FFmpeg            : yes
   - Icecast/Shoutcast : yes
   - GStreamer         : yes
   - JACK              : yes
   - OSS               : yes
   - Portaudio         : yes
   - Pulseaudio        : yes
   - SRT               : yes

 * Audio manipulation
   - FFmpeg            : yes
   - LADSPA            : yes
   - Lilv              : yes
   - Samplerate        : yes
   - SoundTouch        : yes

 * Video manipulation
   - camlimages        : yes
   - FFmpeg            : yes
   - frei0r            : yes
   - SDL-image         : no (requires tsdl-image)
   - SDL-ttf           : no (requires tsdl-ttf)

 * MIDI manipulation
   - DSSI              : yes

 * Visualization
   - GD                : yes
   - Graphics          : yes
   - SDL               : yes

 * Additional libraries
   - http requests     : no (requires curl)
   - FFmpeg filters    : yes
   - FFmpeg devices    : yes
   - dynlink           : yes
   - inotify           : yes
   - lastfm            : no (requires lastfm)
   - lo                : yes
   - magic             : yes
   - memtrace          : no (requires memtrace)
   - mem_usage         : no (requires mem_usage)
   - SecureTransport   : no (requires osx-secure-transport)
   - ssl               : yes
   - posix-time2       : no (requires posix-time2)
   - windows service   : no (requires winsvc)
   - yojson            : yes

 * Monitoring
   - Prometheus        : no (requires prometheus-app)

it not finding posix-time2 is quite surprising, if anyone has an idea of why please chime in.
I'll update curl and take one last look at packaging the tsdl stuff

@vbgl
Copy link
Contributor

vbgl commented Jun 8, 2022

FWIW, tsdl libraries are available in nixpkgs. See: #175613

@dali99 dali99 marked this pull request as ready for review June 8, 2022 14:23
@Lassulus
Copy link
Member

Lassulus commented Jun 9, 2022

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

5 packages built:
  • google-drive-ocamlfuse
  • libbap
  • liquidsoap
  • python310Packages.bap
  • python39Packages.bap

@Lassulus Lassulus merged commit 6f2f7cc into NixOS:master Jun 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants