Merge pull request #120791 from mweinelt/babeld

babeld: 1.9.2 -> 1.10
This commit is contained in:
Luke Granger-Brown 2021-05-03 10:00:12 +01:00 committed by GitHub
commit 4b42da3d85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions

View file

@ -32,6 +32,8 @@ in
{
meta.maintainers = with maintainers; [ hexa ];
###### interface
options = {

View file

@ -1,33 +1,25 @@
{ lib, stdenv, fetchurl, fetchpatch, nixosTests }:
{ lib, stdenv, fetchurl, nixosTests }:
stdenv.mkDerivation rec {
pname = "babeld";
version = "1.9.2";
version = "1.10";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${pname}-${version}.tar.gz";
sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm";
url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz";
sha256 = "1sld5bbig2pkcr4zrdpvfzifc6a3lc8i8kdzk5ryjh166844mxd5";
};
patches = [
(fetchpatch {
# Skip kernel_setup_interface when `skip-kernel-setup` is enabled.
url = "https://github.com/jech/babeld/commit/f9698a5616842467ad08a5f9ed3d6fcfa2dd2898.patch";
sha256 = "00kj2jxsfq0pjk5wrkslyvkww57makxlwa4fd82g7g9hrgahpqwr";
})
];
preBuild = ''
makeFlags="PREFIX=$out ETCDIR=$out/etc"
'';
passthru.tests.babeld = nixosTests.babeld;
meta = {
homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
meta = with lib; {
homepage = "http://www.irif.fr/~jch/software/babel/";
description = "Loop-avoiding distance-vector routing protocol";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fpletz ];
platforms = with lib.platforms; linux;
license = licenses.mit;
maintainers = with maintainers; [ fpletz hexa ];
platforms = platforms.linux;
};
}