From 70ad3289543b37637a4bdd9c9a81291f3f4188c8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 30 Oct 2024 18:59:29 +0800 Subject: [PATCH 1/4] _389_ds_base: move to by-name --- .../389/default.nix => by-name/_3/_389_ds_base/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/ldap/389/default.nix => by-name/_3/_389_ds_base/package.nix} (100%) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/by-name/_3/_389_ds_base/package.nix similarity index 100% rename from pkgs/servers/ldap/389/default.nix rename to pkgs/by-name/_3/_389_ds_base/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082c351099b5..86984a92d17a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23894,8 +23894,6 @@ with pkgs; ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { }; - _5etools = callPackage ../servers/web-apps/5etools { }; adguardhome = callPackage ../servers/adguardhome { }; From 41769b4f0d3d459249f8239b21fa9fce2b3c69b3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 30 Oct 2024 18:59:59 +0800 Subject: [PATCH 2/4] _389_ds_base: nixfmt --- pkgs/by-name/_3/_389_ds_base/package.nix | 164 ++++++++++++----------- 1 file changed, 86 insertions(+), 78 deletions(-) diff --git a/pkgs/by-name/_3/_389_ds_base/package.nix b/pkgs/by-name/_3/_389_ds_base/package.nix index e8cfaa1f1ca6..5dd713e08655 100644 --- a/pkgs/by-name/_3/_389_ds_base/package.nix +++ b/pkgs/by-name/_3/_389_ds_base/package.nix @@ -1,38 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoconf -, automake -, cargo -, libtool -, pkg-config -, cracklib -, lmdb -, json_c -, linux-pam -, libevent -, libxcrypt -, nspr -, nss -, openldap -, withOpenldap ? true -, db -, withBdb ? true -, cyrus_sasl -, icu -, net-snmp -, withNetSnmp ? true -, krb5 -, pcre2 -, python3 -, rustPlatform -, rustc -, openssl -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, zlib -, rsync -, withCockpit ? true -, withAsan ? false +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + cargo, + libtool, + pkg-config, + cracklib, + lmdb, + json_c, + linux-pam, + libevent, + libxcrypt, + nspr, + nss, + openldap, + withOpenldap ? true, + db, + withBdb ? true, + cyrus_sasl, + icu, + net-snmp, + withNetSnmp ? true, + krb5, + pcre2, + python3, + rustPlatform, + rustc, + openssl, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + systemd, + zlib, + rsync, + withCockpit ? true, + withAsan ? false, }: stdenv.mkDerivation rec { @@ -61,29 +63,29 @@ stdenv.mkDerivation rec { python3 cargo rustc - ] - ++ lib.optional withCockpit rsync; + ] ++ lib.optional withCockpit rsync; - buildInputs = [ - cracklib - lmdb - json_c - linux-pam - libevent - libxcrypt - nspr - nss - cyrus_sasl - icu - krb5 - pcre2 - openssl - zlib - ] - ++ lib.optional withSystemd systemd - ++ lib.optional withOpenldap openldap - ++ lib.optional withBdb db - ++ lib.optional withNetSnmp net-snmp; + buildInputs = + [ + cracklib + lmdb + json_c + linux-pam + libevent + libxcrypt + nspr + nss + cyrus_sasl + icu + krb5 + pcre2 + openssl + zlib + ] + ++ lib.optional withSystemd systemd + ++ lib.optional withOpenldap openldap + ++ lib.optional withBdb db + ++ lib.optional withNetSnmp net-snmp; postPatch = '' patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py @@ -98,27 +100,33 @@ stdenv.mkDerivation rec { tar -xzf ${cargoDeps} -C ./vendor --strip-components=1 ''; - configureFlags = [ - "--enable-rust-offline" - "--enable-autobind" - ] - ++ lib.optionals withSystemd [ - "--with-systemd" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - ] ++ lib.optionals withOpenldap [ - "--with-openldap" - ] ++ lib.optionals withBdb [ - "--with-db-inc=${lib.getDev db}/include" - "--with-db-lib=${lib.getLib db}/lib" - ] ++ lib.optionals withNetSnmp [ - "--with-netsnmp-inc=${lib.getDev net-snmp}/include" - "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" - ] ++ lib.optionals (!withCockpit) [ - "--disable-cockpit" - ] ++ lib.optionals withAsan [ - "--enable-asan" - "--enable-debug" - ]; + configureFlags = + [ + "--enable-rust-offline" + "--enable-autobind" + ] + ++ lib.optionals withSystemd [ + "--with-systemd" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + ] + ++ lib.optionals withOpenldap [ + "--with-openldap" + ] + ++ lib.optionals withBdb [ + "--with-db-inc=${lib.getDev db}/include" + "--with-db-lib=${lib.getLib db}/lib" + ] + ++ lib.optionals withNetSnmp [ + "--with-netsnmp-inc=${lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" + ] + ++ lib.optionals (!withCockpit) [ + "--disable-cockpit" + ] + ++ lib.optionals withAsan [ + "--enable-asan" + "--enable-debug" + ]; enableParallelBuilding = true; # Disable parallel builds as those lack some dependencies: From 5ac19f8437327468c8cb92ec5749d68feb6a4c03 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 30 Oct 2024 19:01:31 +0800 Subject: [PATCH 3/4] _389_ds_base: add passthru.updateScript --- pkgs/by-name/_3/_389_ds_base/package.nix | 29 +++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/_3/_389_ds_base/package.nix b/pkgs/by-name/_3/_389_ds_base/package.nix index 5dd713e08655..5114d8630e16 100644 --- a/pkgs/by-name/_3/_389_ds_base/package.nix +++ b/pkgs/by-name/_3/_389_ds_base/package.nix @@ -35,23 +35,24 @@ rsync, withCockpit ? true, withAsan ? false, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "389-ds-base"; version = "2.4.6"; src = fetchFromGitHub { owner = "389ds"; - repo = pname; - rev = "${pname}-${version}"; + repo = "389-ds-base"; + rev = "389-ds-base-${finalAttrs.version}"; hash = "sha256-+FTCzEyQY71TCkj8HMnSkrnQtxjHxOmtYhfZEAYOLis="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = "${src.name}/src"; - name = "${pname}-${version}"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/src"; + name = "389-ds-base-${finalAttrs.version}"; hash = "sha256-2Ng268tfbMRU3Uyo5ljSS/HxPnw1abvGjcczo25HyVk="; }; @@ -97,7 +98,7 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p ./vendor - tar -xzf ${cargoDeps} -C ./vendor --strip-components=1 + tar -xzf ${finalAttrs.cargoDeps} -C ./vendor --strip-components=1 ''; configureFlags = @@ -141,13 +142,15 @@ stdenv.mkDerivation rec { "localstatedir=${placeholder "TMPDIR"}" ]; - passthru.version = version; + passthru.version = finalAttrs.version; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://www.port389.org/"; description = "Enterprise-class Open Source LDAP server for Linux"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ners ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ners ]; }; -} +}) From a8405a6ad54f3b54a70c2c9375e25abb6a45851e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 30 Oct 2024 19:10:20 +0800 Subject: [PATCH 4/4] _389_ds_base: 2.4.6 -> 3.1.1 --- .../by-name/_3/{_389_ds_base => _389-ds-base}/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename pkgs/by-name/_3/{_389_ds_base => _389-ds-base}/package.nix (94%) diff --git a/pkgs/by-name/_3/_389_ds_base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix similarity index 94% rename from pkgs/by-name/_3/_389_ds_base/package.nix rename to pkgs/by-name/_3/_389-ds-base/package.nix index 5114d8630e16..062714febed1 100644 --- a/pkgs/by-name/_3/_389_ds_base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -38,22 +38,22 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs:{ +stdenv.mkDerivation (finalAttrs: { pname = "389-ds-base"; - version = "2.4.6"; + version = "3.1.1"; src = fetchFromGitHub { owner = "389ds"; repo = "389-ds-base"; rev = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-+FTCzEyQY71TCkj8HMnSkrnQtxjHxOmtYhfZEAYOLis="; + hash = "sha256-ouWJB5DbAtcLKyFngmxBRObXC6RFA+GXfvOEFk88Zu0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/src"; name = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-2Ng268tfbMRU3Uyo5ljSS/HxPnw1abvGjcczo25HyVk="; + hash = "sha256-nBYuVijF50K3JlEo2py0ephDwlnAhbxeNA4vvC9rEV0="; }; nativeBuildInputs = [