Merge pull request #9184 from magnetophon/ardour-master

ardour: 4.0 -> 4.1

goibhniu 6cfff02b bfa187de

+9 -8
+9 -8
pkgs/applications/audio/ardour/default.nix
··· 1 - { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw 1 + { stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw 2 2 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 3 3 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf 4 4 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile ··· 15 15 # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. 16 16 17 17 # Version to build. 18 - tag = "4.0"; 18 + tag = "4.1"; 19 19 20 20 # Version info that is built into the binary. Keep in sync with 'tag'. The 21 21 # last 8 digits is a (fake) commit id. 22 - revision = "4.0-e1aa66cb3f"; 22 + revision = "4.1-fe672c8"; 23 23 24 24 in 25 25 26 26 stdenv.mkDerivation rec { 27 27 name = "ardour-${tag}"; 28 28 29 - src = fetchgit { 30 - url = git://git.ardour.org/ardour/ardour.git; 31 - rev = "e1aa66cb3f"; 32 - sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; 29 + src = fetchFromGitHub { 30 + owner = "Ardour"; 31 + repo = "ardour"; 32 + rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7"; 33 + sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f"; 33 34 }; 34 35 35 - buildInputs = 36 + buildInputs = 36 37 [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc 37 38 glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo 38 39 libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate