From 9fd4d6cbcb87c50be5b95062bb5d0bb0665952c7 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Wed, 20 Mar 2019 13:26:45 +0100 Subject: [PATCH 1/3] maintainers: add ggpeti --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d794dc84fc..a89a70aee07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; From 12e425c17b25b991c60cf190c888bbe2bf632d49 Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Wed, 20 Mar 2019 13:27:13 +0100 Subject: [PATCH 2/3] musly: init at unstable-2017-04-26 --- pkgs/applications/audio/musly/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/musly/default.nix diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix new file mode 100644 index 00000000000..cb61214b51d --- /dev/null +++ b/pkgs/applications/audio/musly/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90daabcf890..0dddd5598e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22577,6 +22577,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 { From e3521e9d8fc539742d66bae48914f47ca160975d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 21 Mar 2019 10:17:42 +0100 Subject: [PATCH 3/3] musly: fix platforms Co-Authored-By: ggPeti --- pkgs/applications/audio/musly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index cb61214b51d..47370d4bc2f 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; maintainers = with maintainers; [ ggpeti ]; - platforms = with platforms; [ darwin linux ]; + platforms = with platforms; darwin ++ linux; }; }