From 1c2e5e194f786095373bc6667cf90fb419d89e11 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Wed, 28 May 2025 00:47:04 +0200 Subject: [PATCH] bird2: switch from fetching tarball to fetchFromGitLab To my understanding it's current best practice to fetch from a project's git repo and not use tarballs to avoid situations where the tarball isn't as expected. Since this change seems to be trivial for bird i've implemented it here. --- pkgs/by-name/bi/bird2/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index 4fd22de7de28..080045ffcaa3 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/pkgs/by-name/bi/bird2/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, + autoreconfHook, flex, bison, readline, @@ -13,15 +14,20 @@ stdenv.mkDerivation rec { pname = "bird"; version = "2.17.1"; - src = fetchurl { - url = "https://bird.network.cz/download/bird-${version}.tar.gz"; - hash = "sha256-v9cY36WWgZs4AWiHgyElFLRnFjMprsm7zQ+j3uA+EOk="; + src = fetchFromGitLab { + domain = "gitlab.nic.cz"; + owner = "labs"; + repo = "bird"; + rev = "v${version}"; + hash = "sha256-9Zg3UmNEW+Q26PMj3Z1XDbPFC5vatX8i7RQSUlKXlwg="; }; nativeBuildInputs = [ + autoreconfHook flex bison ]; + buildInputs = [ readline libssh