From fdafb70453ac17e139015f549176bbf90f52b4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 3 Jun 2018 20:46:01 +0200 Subject: [PATCH 1/3] Add myself as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4f28823f0c24..e11e7edcc691 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -58,6 +58,11 @@ github = "DamienCassou"; name = "Damien Cassou"; }; + das_j = { + email = "janne@hess.ooo"; + github = "dasJ"; + name = "Janne Heß"; + }; DerGuteMoritz = { email = "moritz@twoticketsplease.de"; github = "DerGuteMoritz"; From c1419f0e63ea885ba374608d721aa16d44a83c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 3 Jun 2018 20:46:40 +0200 Subject: [PATCH 2/3] Add myself as maintainer for dnsdist See Mic92's comment at #38658 --- pkgs/servers/dns/dnsdist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 7369713dc86a..772292b0a57e 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -30,5 +30,6 @@ description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; license = licenses.gpl2; + maintainers = with maintainers; [ das_j ]; }; } From f569a0a684f07dcdf41bd398cc881caaa20c9f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 3 Jun 2018 20:48:17 +0200 Subject: [PATCH 3/3] schema2ldif: Init at 1.3 --- pkgs/tools/text/schema2ldif/default.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/text/schema2ldif/default.nix diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix new file mode 100644 index 000000000000..699d2d28b82b --- /dev/null +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { + name = "schema2ldif-${version}"; + version = "1.3"; + + src = fetchurl { + url = "https://repos.fusiondirectory.org/sources/schema2ldif/schema2ldif-${version}.tar.gz"; + sha256 = "00cd9xx9g0mnnfn5lvay3vg166z84jla0ya1x34ljdc8bflxsr9a"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + + cp bin/{schema2ldif,ldap-schema-manager} $out/bin + gzip -c man/schema2ldif.1 > $out/share/man/man1/schema2ldif.1.gz + gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz + + wrapProgram $out/bin/schema2ldif \ + --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}" + ''; + + meta = with stdenv.lib; { + description = "Utilities to manage schema in .schema and .ldif format"; + homepage = "https://www.fusiondirectory.org/schema2ldif-project-and-components/"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc8bd0773769..f5616b5f57bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4911,6 +4911,8 @@ with pkgs; sharutils = callPackage ../tools/archivers/sharutils { }; + schema2ldif = callPackage ../tools/text/schema2ldif { }; + shocco = callPackage ../tools/text/shocco { }; shotwell = callPackage ../applications/graphics/shotwell { };