From 50407869b42414d2f1bd811a032c31e82d5cf84f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Dec 2020 22:05:40 +0000 Subject: [PATCH 1/2] maintainers: add TredwellGit --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a80ec598ea6a..8555e3786c37 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9095,6 +9095,12 @@ githubId = 10110; name = "Travis B. Hartwell"; }; + TredwellGit = { + email = "tredwell@tutanota.com"; + github = "TredwellGit"; + githubId = 61860346; + name = "Tredwell"; + }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; From 72f29cde3be75394ab0e2e0b895ca8328b76bd69 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 16 Dec 2020 08:25:53 +0000 Subject: [PATCH 2/2] inih: init at r52 --- pkgs/development/libraries/inih/default.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/inih/default.nix diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix new file mode 100644 index 000000000000..62de607f7d43 --- /dev/null +++ b/pkgs/development/libraries/inih/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "inih"; + version = "r52"; + + src = fetchFromGitHub { + owner = "benhoyt"; + repo = pname; + rev = version; + sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; + }; + + nativeBuildInputs = [ meson ninja ]; + + mesonFlags = [ + "-Ddefault_library=shared" + "-Ddistro_install=true" + "-Dwith_INIReader=true" + ]; + + meta = with stdenv.lib; { + description = "Simple .INI file parser in C, good for embedded systems"; + homepage = "https://github.com/benhoyt/inih"; + changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ TredwellGit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d922b97860a3..54ee09d4d328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13588,6 +13588,8 @@ in indilib = callPackage ../development/libraries/indilib { }; + inih = callPackage ../development/libraries/inih { }; + iniparser = callPackage ../development/libraries/iniparser { }; intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };