diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/by-name/fr/freeipa/package.nix similarity index 94% rename from pkgs/os-specific/linux/freeipa/default.nix rename to pkgs/by-name/fr/freeipa/package.nix index d6a25e26aa24..fa66da6d8212 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/by-name/fr/freeipa/package.nix @@ -6,10 +6,10 @@ pkg-config, autoconf, automake, - kerberos, + krb5, openldap, popt, - sasl, + cyrus_sasl, curl, xmlrpc_c, ding-libs, @@ -22,7 +22,7 @@ libuuid, talloc, tevent, - samba, + samba4, libunistring, libverto, libpwquality, @@ -64,6 +64,14 @@ let samba ifaddr ]; + # NOTE: freeipa and sssd need to be built with the same version of python + kerberos = krb5.override { + withVerto = true; + }; + sasl = cyrus_sasl; + samba = samba4.override { + enableLDAP = true; + }; in stdenv.mkDerivation rec { pname = "freeipa"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1cbd4ffd8f..3b83791cffa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6362,17 +6362,6 @@ with pkgs; fmt = fmt_12; - freeipa = callPackage ../os-specific/linux/freeipa { - # NOTE: freeipa and sssd need to be built with the same version of python - kerberos = krb5.override { - withVerto = true; - }; - sasl = cyrus_sasl; - samba = samba4.override { - enableLDAP = true; - }; - }; - fontconfig = callPackage ../development/libraries/fontconfig { }; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };