From 7826c54c05592429ec912dced39ce64dd8c4aff8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 31 Jul 2022 12:47:31 +0200 Subject: [PATCH 1/2] libosmocore: 1.6.0 -> 1.7.0 --- pkgs/applications/misc/libosmocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 2b825705b006..0cab21519cf2 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; + hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; }; propagatedBuildInputs = [ From 9a59b1b0fed320fef681f0f3a19590b39c8d840c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 31 Jul 2022 12:48:06 +0200 Subject: [PATCH 2/2] libosmocore: fix version in pkg-config file All osmocon packets look for a file ".tarball-version", when generating pkg-config files, which is absent in the git sources. This results in an UNKNOWN version in the pkg-config, which confuses configure of other osmocom packages, when checking the version. --- pkgs/applications/misc/libosmocore/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 0cab21519cf2..a3de388a52ab 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; }; + postPatch = '' + echo "${version}" > .tarball-version + ''; + propagatedBuildInputs = [ talloc ];