From 1ba24058af6b7911f9b824798c62c434ff863c4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 15:48:26 -0700 Subject: praat: 6.0.38 -> 6.0.40 (#40836) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/praat/versions. These checks were done: - built on NixOS - /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40/bin/praat passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 6.0.40 with grep in /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40 - directory tree listing: https://gist.github.com/48461f433362d4c7c4143942011a22d6 - du listing: https://gist.github.com/621b0b6d55906c1ba560361af3d25bcb --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index ada12eefaf7e..8d49c49f0c6c 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.38"; + version = "6.0.40"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; + sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x"; }; configurePhase = '' -- cgit 1.4.1 From 691e8e64c449925b59c577379f879943495ff287 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 19:52:28 -0700 Subject: csound: 6.10.0 -> 6.11.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/csound/versions. These checks were done: - built on NixOS - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csound passed the binary check. - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csbeats passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csdebugger had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/atsa had a zero exit code or showed the expected version - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csanalyze passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cvanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/dnoise had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/envext had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extractor had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/hetro had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/mixer had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvanal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvlook had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_export had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_import had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scale had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sndinfo had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/srconv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/src_conv had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sdif2ad had a zero exit code or showed the expected version - /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scsort passed the binary check. - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extract had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cs had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csb64enc had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/makecsd had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scot had a zero exit code or showed the expected version - 4 of 31 passed binary check by having a zero exit code. - 0 of 31 passed binary check by having the new version present in output. - found 6.11.0 with grep in /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0 - directory tree listing: https://gist.github.com/a9a7303309eb2e6e6ce70fc3f368e8af - du listing: https://gist.github.com/c8d61a997a4e56d47eab852cdae66f01 --- pkgs/applications/audio/csound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 191074eba27a..c8ac0a938efa 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.10.0"; + version = "6.11.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n"; + sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp -- cgit 1.4.1 From 80bfd2f371d64d0d81c0820166f98f49a5501988 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 May 2018 15:44:50 +0800 Subject: musescore: 2.1.0 -> 2.2.1 Fixes #29519 --- pkgs/applications/audio/musescore/default.nix | 46 +++++++-------------------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 34 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index f56ca009f1e0..7ed9021e3e09 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,59 +1,37 @@ -{ stdenv, fetchzip, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.1.0"; + version = "2.2.1"; - src = fetchzip { - url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls"; + src = fetchFromGitHub { + owner = "musescore"; + repo = "MuseScore"; + rev = "v${version}"; + sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs"; }; - hardeningDisable = [ "relro" "bindnow" ]; - - makeFlags = [ - "PREFIX=$(out)" - ]; - cmakeFlags = [ - "-DAEOLUS=OFF" - "-DZERBERUS=ON" - "-DOSC=ON=ON" - "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error - "-DOCR=OFF" # Not necessary without OMR - "-DSOUNDFONT3=ON" - "-DHAS_AUDIOFILE=ON" - "-DBUILD_JACK=ON" - ]; - - preBuild = '' - make lrelease - ''; - - postBuild = '' - make manpages - ''; + ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qtbase qtdeclarative qtscript qtsvg qttools - qtwebkit qtxmlpatterns #tesseract + portaudio portmidi # tesseract + qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns ]; meta = with stdenv.lib; { description = "Music notation and composition software"; homepage = https://musescore.org/; license = licenses.gpl2; + maintainers = with maintainers; [ vandenoever ]; platforms = platforms.linux; - maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acb4e4f7294..cdc4ed881e00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17096,6 +17096,7 @@ with pkgs; else null; }; + # TODO: we should probably merge these 2 musescore = if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } -- cgit 1.4.1