diff options
author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/misc/solfege/default.nix | |
parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
download | nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/misc/solfege/default.nix')
-rw-r--r-- | pkgs/misc/solfege/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 0449f72c997..b40ebe84bcb 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "solfege-3.22.0"; + name = "solfege-3.22.2"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "10klrhdb1n67xd4bndk6z6idyf0pvwz7hcdg9ibalms7ywl3b23x"; + sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; buildInputs = [ pkgconfig python pygtk gettext texinfo @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders" ''; - meta = { + meta = with stdenv.lib; { description = "Ear training program"; homepage = http://www.solfege.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } |