Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52dae14f0c76
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 870db5e15d76
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 20, 2019

  1. maintainers: add ggpeti

    ggPeti committed Mar 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    Copy the full SHA
    9fd4d6c View commit details
  2. Copy the full SHA
    12e425c View commit details

Commits on Mar 21, 2019

  1. musly: fix platforms

    Co-Authored-By: ggPeti <ggpeti@gmail.com>
    jtojnar and ggPeti authored Mar 21, 2019
    Copy the full SHA
    e3521e9 View commit details

Commits on Mar 22, 2019

  1. Merge pull request #57389 from ggPeti/master

    musly: init at unstable-2017-04-26
    etu authored Mar 22, 2019
    Copy the full SHA
    870db5e View commit details
Showing with 40 additions and 0 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +33 −0 pkgs/applications/audio/musly/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1770,6 +1770,11 @@
github = "Gerschtli";
name = "Tobias Happ";
};
ggpeti = {
email = "ggpeti@gmail.com";
github = "ggpeti";
name = "Peter Ferenczy";
};
gilligan = {
email = "tobias.pflug@gmail.com";
github = "gilligan";
33 changes: 33 additions & 0 deletions pkgs/applications/audio/musly/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
stdenv.mkDerivation rec {
pname = "musly";
version = "unstable-2017-04-26";
src = fetchFromGitHub {
owner = "dominikschnitzer";
repo = "musly";
rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6";
sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ];
fixupPhase = if stdenv.isDarwin then ''
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib
'' else "";

meta = with stdenv.lib; {
homepage = https://www.musly.org;
description = "A fast and high-quality audio music similarity library written in C/C++";
longDescription = ''
Musly analyzes the the audio signal of music pieces to estimate their similarity.
No meta-data about the music piece is included in the similarity estimation.
To use Musly in your application, have a look at the library documentation
or try the command line application included in the package and start generating
some automatic music playlists right away.
'';
license = licenses.mpl20;
maintainers = with maintainers; [ ggpeti ];
platforms = with platforms; darwin ++ linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -22593,6 +22593,8 @@ in

muse = callPackage ../applications/audio/muse { };

musly = callPackage ../applications/audio/musly { };

mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };

inherit (callPackage ../tools/package-management/nix {