Merge pull request #5817 from fpletz/batman-updates

batman-adv: Update packages & add alfred
This commit is contained in:
viric 2015-01-18 00:21:22 +01:00
commit d2c4421d74
4 changed files with 34 additions and 5 deletions

View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pkgconfig, gpsd }:
let
ver = "2014.4.0";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034";
};
buildInputs = [ pkgconfig gpsd ];
preBuild = ''
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
'';
meta = {
homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
};
}

View File

@ -1,14 +1,14 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
let let
ver = "2013.4.0"; ver = "2014.4.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "batctl-${ver}"; name = "batctl-${ver}";
src = fetchurl { src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "0k6b695h38m92a8wn5gvb3z746m3fm0ygv58yyn163adcsvf7sjd"; sha256 = "4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c";
}; };
preBuild = '' preBuild = ''

View File

@ -2,14 +2,14 @@
assert stdenv.lib.versionOlder kernel.version "3.17"; assert stdenv.lib.versionOlder kernel.version "3.17";
let base = "batman-adv-2014.3.0"; in let base = "batman-adv-2014.4.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${base}-${kernel.version}"; name = "${base}-${kernel.version}";
src = fetchurl { src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
sha1 = "wh3if8v4wfwskvzwqsjsyr929krzfmsx"; sha256 = "757b9ddd346680f6fd87dc28fde6da0ddc0423a65fbc88fdbaa7b247fed2c1a8";
}; };
preBuild = '' preBuild = ''
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

View File

@ -8137,6 +8137,8 @@ let
acpitool = callPackage ../os-specific/linux/acpitool { }; acpitool = callPackage ../os-specific/linux/acpitool { };
alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
alienfx = callPackage ../os-specific/linux/alienfx { }; alienfx = callPackage ../os-specific/linux/alienfx { };
alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaLib = callPackage ../os-specific/linux/alsa-lib { };