From 674a99882cf39df329f81efe403a62358955d533 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Sun, 20 Dec 2020 08:24:11 -0800 Subject: [PATCH 1/2] Maintainers: Add rb2k to maintainers list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1b00052948..320b88e02b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7343,6 +7343,12 @@ githubId = 1758708; name = "Răzvan Flavius Panda"; }; + rb2k = { + email = "nix@marc-seeger.com"; + github = "rb2k"; + githubId = 9519; + name = "Marc Seeger"; + }; rbasso = { email = "rbasso@sharpgeeks.net"; github = "rbasso"; From 95c123d1831832af617c1deef15fc3f076f51a09 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Sun, 20 Dec 2020 08:41:06 -0800 Subject: [PATCH 2/2] libsmartcols: init at v2.36.1 --- .../libraries/libsmartcols/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/libsmartcols/default.nix diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix new file mode 100644 index 00000000000..bb3de08cf72 --- /dev/null +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }: + +stdenv.mkDerivation rec { + name = "libsmartcols"; + version = "v2.36.1"; + + nativeBuildInputs = [ autoreconfHook pkgconfig python3 ]; + + src = fetchFromGitHub { + owner = "karelzak"; + repo = "util-linux"; + rev = version; + sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; + }; + + configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ]; + + buildPhase = '' + make libsmartcols.la + ''; + + installTargets = [ "install-am" "install-pkgconfigDATA" ]; + + meta = { + description = "smart column output alignment library"; + homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ rb2k ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3937ae566e6..b69a6b8469a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5174,6 +5174,8 @@ in libcryptui = callPackage ../development/libraries/libcryptui { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; + libsmi = callPackage ../development/libraries/libsmi { }; libgen-cli = callPackage ../tools/misc/libgen-cli { };