From daa9e53e2698bc900ce866706649b5aa8b2472b8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:30:42 +0300 Subject: [PATCH 1/5] beret: fix checksum --- pkgs/games/beret/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index a92fe4d7c672..a3ffaf0df623 100644 --- a/pkgs/games/beret/default.nix +++ b/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 = '' From bddffb705fa16cd7949c5985b3b9999fd88d3bb6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:30:59 +0300 Subject: [PATCH 2/5] gosmore: update, fix checksum --- pkgs/applications/misc/gosmore/default.nix | 38 ++++++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e93e2be85e38..ea72dc032695 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,34 +1,30 @@ -a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} : -let - fetchsvn = a.fetchsvn; +{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : - buildInputs = with a; [ - libxml2 gtk curl pkgconfig - ]; +let + version = "30811"; in -rec { +stdenv.mkDerivation { + name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm"; - rev = "24178"; - } + "/"; + sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj"; + rev = "${version}"; + }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ libxml2 gtk curl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"]; + nativeBuildInputs = [ pkgconfig ]; - fixCurlIncludes = a.fullDepEntry '' + prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} - '' ["minInit" "doUnpack"]; + ''; - name = "gosmore-r21657"; - meta = { + meta = with stdenv.lib; { description = "Open Street Map viewer"; - maintainers = [ - a.lib.maintainers.raskin + homepage = http://sourceforge.net/projects/gosmore/; + maintainers = with maintainers; [ + raskin ]; - platforms = a.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea48c5b28e18..3fc9ee5746b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9800,9 +9800,7 @@ let libpng = libpng12; }; - gosmore = builderDefsPackage ../applications/misc/gosmore { - inherit fetchsvn curl pkgconfig libxml2 gtk; - }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = callPackage ../applications/misc/gpsbabel { }; From a2efa84ccb1b515de24b578219a65f6c66539e6f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:31:09 +0300 Subject: [PATCH 3/5] praat: update, fix checksum --- pkgs/applications/audio/praat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 86c68d087b77..354a3e43616d 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/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; - sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; + url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; + sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3"; }; configurePhase = '' From a726dd7697df2f190d0f513b710a04476a66cb33 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 17:36:47 +0300 Subject: [PATCH 4/5] eaglemode: update and fix 404 --- pkgs/applications/misc/eaglemode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index ea9383a6e10f..9d9b22abcb19 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/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. From 9c658343dd2a6bc27e6e98c4c255fb44561151ca Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 18:02:41 +0300 Subject: [PATCH 5/5] mutt-with-sidebar: simplify, fix checksum --- .../networking/mailreaders/mutt/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4091876cbe3c..7c60864b486c 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/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 = [ - ncurses which perl - (if headerCache then gdbm else null) - (if sslSupport then openssl else null) - (if saslSupport then cyrus_sasl else null) - (if gpgmeSupport then gpgme else null) - ] - ++ (stdenv.lib.optionals withSidebar [automake autoconf]) - ; + buildInputs = with stdenv.lib; + [ ncurses which perl ] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + + nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook; configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patches = [] ++ (stdenv.lib.optional withSidebar (fetchurl { url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; - sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w"; + sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz"; })); meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fc9ee5746b5..ac8834062e57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10227,7 +10227,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 { };