From 016a436059667c68a886639fa6b77e27e9a2bd85 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Fri, 19 Jan 2024 18:16:29 +0100 Subject: libyang: move to by-name; 2.1.128 -> 2.1.148 --- pkgs/by-name/li/libyang/package.nix | 57 ++++++++++++++++++++++++++ pkgs/development/libraries/libyang/default.nix | 57 -------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 57 insertions(+), 59 deletions(-) create mode 100644 pkgs/by-name/li/libyang/package.nix delete mode 100644 pkgs/development/libraries/libyang/default.nix diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix new file mode 100644 index 000000000000..6e3e3d841e64 --- /dev/null +++ b/pkgs/by-name/li/libyang/package.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub + +# build time +, cmake +, pkg-config + +# run time +, pcre2 + +# update script +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libyang"; + version = "2.1.148"; + + src = fetchFromGitHub { + owner = "CESNET"; + repo = "libyang"; + rev = "v${version}"; + hash = "sha256-uYZJo8lUv6tq0MRRJvbTS/8t1eZNGqcMb5k5sVCwMJM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + pcre2 + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "YANG data modelling language parser and toolkit"; + longDescription = '' + libyang is a YANG data modelling language parser and toolkit written (and + providing API) in C. The library is used e.g. in libnetconf2, Netopeer2, + sysrepo or FRRouting projects. + ''; + homepage = "https://github.com/CESNET/libyang"; + license = with licenses; [ bsd3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ woffs ]; + }; +} diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix deleted file mode 100644 index d220bcee1e6e..000000000000 --- a/pkgs/development/libraries/libyang/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub - -# build time -, cmake -, pkg-config - -# run time -, pcre2 - -# update script -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "libyang"; - version = "2.1.128"; - - src = fetchFromGitHub { - owner = "CESNET"; - repo = "libyang"; - rev = "v${version}"; - sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - pcre2 - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "YANG data modelling language parser and toolkit"; - longDescription = '' - libyang is a YANG data modelling language parser and toolkit written (and - providing API) in C. The library is used e.g. in libnetconf2, Netopeer2, - sysrepo or FRRouting projects. - ''; - homepage = "https://github.com/CESNET/libyang"; - license = with licenses; [ bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ woffs ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e80a598bfca..4582b6cbd74e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23765,8 +23765,6 @@ with pkgs; yas = callPackage ../development/libraries/yas { }; - libyang = callPackage ../development/libraries/libyang { }; - libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; -- cgit 1.4.1