Merge pull request #5046 from abbradar/checksum-fixes

Checksum fixes

pkgs/applications/audio/praat/default.nix

@@ -1,11 +1,12 @@
 { stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
 
+let version = "5401"; in
 stdenv.mkDerivation {
-  name = "praat-5365";
+  name = "praat-${version}";
 
   src = fetchurl {
-    url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz;
+    url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz";
-    sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq";
+    sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3";
   };
 
   configurePhase = ''

pkgs/applications/misc/eaglemode/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
+librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }:
 
 stdenv.mkDerivation rec {
-  name = "eaglemode-0.85.0";
+  name = "eaglemode-0.86.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
-    sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc";
+    sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
   };
 
   buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
-    librsvg glib gtk libXxf86vm libXext poppler ];
+    librsvg glib gtk libXxf86vm libXext poppler xineLib ];
 
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.

pkgs/applications/misc/gosmore/default.nix

@@ -1,34 +1,30 @@
-a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} :  
+{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :
-let 
-  fetchsvn = a.fetchsvn;
 
-  buildInputs = with a; [
+let
-    libxml2 gtk curl pkgconfig
+  version = "30811";
-  ];
 in
-rec {
+stdenv.mkDerivation {
+  name = "gosmore-r${version}";
   src = fetchsvn {
     url = http://svn.openstreetmap.org/applications/rendering/gosmore;
-    sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm";
+    sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj";
-    rev = "24178";
+    rev = "${version}";
-  } + "/";
+  };
 
-  inherit buildInputs;
+  buildInputs = [ libxml2 gtk curl ];
-  configureFlags = [];
 
-  /* doConfigure should be removed if not needed */
+  nativeBuildInputs = [ pkgconfig ];
-  phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
 
-  fixCurlIncludes = a.fullDepEntry ''
+  prePatch = ''
     sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
-  '' ["minInit" "doUnpack"];
+  '';
       
-  name = "gosmore-r21657";
+  meta = with stdenv.lib; {
-  meta = {
     description = "Open Street Map viewer";
-    maintainers = [
+    homepage = http://sourceforge.net/projects/gosmore/;
-      a.lib.maintainers.raskin
+    maintainers = with maintainers; [
+      raskin
     ];
-    platforms = a.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/networking/mailreaders/mutt/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, which, perl, automake, autoconf
+{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook
 , sslSupport ? true
 , imapSupport ? true
 , headerCache ? true
@@ -14,6 +14,7 @@
 assert headerCache -> gdbm != null;
 assert sslSupport -> openssl != null;
 assert saslSupport -> cyrus_sasl != null;
+assert gpgmeSupport -> gpgme != null;
 
 let
   version = "1.5.23";
@@ -26,15 +27,14 @@ stdenv.mkDerivation rec {
     sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
   };
 
-  buildInputs = [
+  buildInputs = with stdenv.lib;
-    ncurses which perl
+    [ ncurses which perl ]
-    (if headerCache then gdbm else null)
+    ++ optional headerCache gdbm
-    (if sslSupport then openssl else null)
+    ++ optional sslSupport openssl
-    (if saslSupport then cyrus_sasl else null)
+    ++ optional saslSupport cyrus_sasl
-    (if gpgmeSupport then gpgme else null)
+    ++ optional gpgmeSupport gpgme;
-  ]
+
-  ++ (stdenv.lib.optionals withSidebar [automake autoconf])
+  nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook;
-  ;
 
   configureFlags = [
     "--with-mailpath=" "--enable-smtp"

pkgs/games/beret/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = https://gitorious.org/beret/beret/archive-tarball/ae029777;
     name = "beret-1.2.0.tar.gz";
-    sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx";
+    sha256 = "14283p27y7g8dq9is7n8zlfslv370pia414frp18722279ps6gqp";
   };
 
   installPhase = ''

pkgs/top-level/all-packages.nix

@@ -9787,9 +9787,7 @@ let
     libpng = libpng12;
   };
 
-  gosmore = builderDefsPackage ../applications/misc/gosmore {
+  gosmore = callPackage ../applications/misc/gosmore { };
-    inherit fetchsvn curl pkgconfig libxml2 gtk;
-  };
 
   gpsbabel = callPackage ../applications/misc/gpsbabel { };
 
@@ -10222,7 +10220,6 @@ let
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
     withSidebar = true;
-    automake = automake113x;
   };
 
   namecoin = callPackage ../applications/misc/namecoin { };