freeipa,sssd: migrate to by-name (#496259) (d6377c47) · Commits · nix / nixpkgs

pkgs/os-specific/linux/freeipa/default.nix→pkgs/by-name/fr/freeipa/package.nix

+18 −11

Original line number	Diff line number	Diff line
		@@ -6,10 +6,10 @@
		pkg-config,
		autoconf,
		automake,
		kerberos,
		krb5,
		openldap,
		popt,
		sasl,
		cyrus_sasl,
		curl,
		xmlrpc_c,
		ding-libs,
		@@ -22,12 +22,12 @@
		libuuid,
		talloc,
		tevent,
		samba,
		samba4,
		libunistring,
		libverto,
		libpwquality,
		systemd,
		python3,
		python3Packages,
		bind,
		sssd,
		jre,
		@@ -39,7 +39,7 @@
		}:

		let
		pythonInputs = with python3.pkgs; [
		pythonInputs = with python3Packages; [
		distutils
		six
		python-ldap
		@@ -64,13 +64,21 @@ 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 {
		stdenv.mkDerivation (finalAttrs: {
		pname = "freeipa";
		version = "4.12.5";

		src = fetchurl {
		url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
		url = "https://releases.pagure.org/freeipa/freeipa-${finalAttrs.version}.tar.gz";
		hash = "sha256-jvXS9Hx9VGFccFL19HogfH15JVIW7pc3/TY1pOvJglM=";
		};

		@@ -88,7 +96,7 @@ stdenv.mkDerivation rec {
		];

		nativeBuildInputs = [
		python3.pkgs.wrapPython
		python3Packages.wrapPython
		jre
		rhino
		lesscpy
		@@ -107,7 +115,6 @@ stdenv.mkDerivation rec {
		xmlrpc_c
		ding-libs
		p11-kit
		python3
		nspr
		nss
		_389-ds-base
		@@ -170,7 +177,7 @@ stdenv.mkDerivation rec {
		nativeInstallCheckInputs = [
		versionCheckHook
		];
		versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
		versionCheckProgram = "${placeholder "out"}/bin/ipa";
		doInstallCheck = true;

		meta = {
		@@ -191,4 +198,4 @@ stdenv.mkDerivation rec {
		platforms = lib.platforms.linux;
		mainProgram = "ipa";
		};
		}
		})

pkgs/os-specific/linux/sssd/fix-kerberos-version.patch→pkgs/by-name/ss/sssd/fix-kerberos-version.patch

+0 −0

File moved.

View file

pkgs/os-specific/linux/sssd/default.nix→pkgs/by-name/ss/sssd/package.nix

+3 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		p11-kit,
		nss_wrapper,
		ncurses,
		Po4a,
		perlPackages,
		jansson,
		jose,
		docbook_xsl,
		@@ -60,6 +60,8 @@

		let
		docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
		# NOTE: freeipa and sssd need to be built with the same version of python
		inherit (perlPackages) Po4a;
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "sssd";

pkgs/top-level/all-packages.nix

+0 −16

Original line number	Diff line number	Diff line
		@@ -3561,11 +3561,6 @@ with pkgs;
		libsForQt5.callPackage ../tools/networking/globalprotect-openconnect
		{ };

		sssd = callPackage ../os-specific/linux/sssd {
		# NOTE: freeipa and sssd need to be built with the same version of python
		inherit (perlPackages) Po4a;
		};

		buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };

		woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };
		@@ -6351,17 +6346,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 { };

Admin message