Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs

Shea Levy 57e0febd 025770fd

+15 -11
+5 -4
pkgs/os-specific/linux/batman-adv/alfred.nix
··· 1 - { stdenv, fetchurl, pkgconfig, gpsd }: 2 3 let 4 - ver = "2014.4.0"; 5 in 6 stdenv.mkDerivation rec { 7 name = "alfred-${ver}"; 8 9 src = fetchurl { 10 url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; 11 - sha256 = "99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034"; 12 }; 13 14 - buildInputs = [ pkgconfig gpsd ]; 15 16 preBuild = '' 17 makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
··· 1 + { stdenv, fetchurl, pkgconfig, gpsd, libcap }: 2 3 let 4 + ver = "2015.2"; 5 in 6 stdenv.mkDerivation rec { 7 name = "alfred-${ver}"; 8 9 src = fetchurl { 10 url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; 11 + sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s"; 12 }; 13 14 + nativeBuildInputs = [ pkgconfig ]; 15 + buildInputs = [ gpsd libcap ]; 16 17 preBuild = '' 18 makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
+7 -4
pkgs/os-specific/linux/batman-adv/batctl.nix
··· 1 - {stdenv, fetchurl}: 2 3 let 4 - ver = "2014.4.0"; 5 in 6 stdenv.mkDerivation rec { 7 name = "batctl-${ver}"; 8 9 src = fetchurl { 10 url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; 11 - sha256 = "4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c"; 12 }; 13 14 preBuild = '' 15 - makeFlags=PREFIX=$out 16 ''; 17 18 meta = {
··· 1 + { stdenv, fetchurl, pkgconfig, libnl }: 2 3 let 4 + ver = "2015.2"; 5 in 6 stdenv.mkDerivation rec { 7 name = "batctl-${ver}"; 8 9 src = fetchurl { 10 url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; 11 + sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi"; 12 }; 13 14 + nativeBuildInputs = [ pkgconfig ]; 15 + buildInputs = [ libnl ]; 16 + 17 preBuild = '' 18 + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" 19 ''; 20 21 meta = {
+3 -3
pkgs/os-specific/linux/batman-adv/default.nix
··· 1 { stdenv, fetchurl, kernel }: 2 3 - assert stdenv.lib.versionOlder kernel.version "3.17"; 4 5 - let base = "batman-adv-2014.4.0"; in 6 7 stdenv.mkDerivation rec { 8 name = "${base}-${kernel.version}"; 9 10 src = fetchurl { 11 url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; 12 - sha256 = "757b9ddd346680f6fd87dc28fde6da0ddc0423a65fbc88fdbaa7b247fed2c1a8"; 13 }; 14 15 preBuild = ''
··· 1 { stdenv, fetchurl, kernel }: 2 3 + #assert stdenv.lib.versionOlder kernel.version "3.17"; 4 5 + let base = "batman-adv-2015.2"; in 6 7 stdenv.mkDerivation rec { 8 name = "${base}-${kernel.version}"; 9 10 src = fetchurl { 11 url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; 12 + sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6"; 13 }; 14 15 preBuild = ''