Merge master into staging-next (87100a80) · Commits · nix / nixpkgs

nixos/modules/services/web-apps/drupal.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -51,10 +51,10 @@ let
		'';

		postInstall = ''
		ln -s ${cfg.filesDir} $out/share/php/drupal/sites/default/files
		ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/drupal/sites/default/settings.php
		ln -s ${cfg.modulesDir} $out/share/php/drupal/modules
		ln -s ${cfg.themesDir} $out/share/php/drupal/themes
		ln -s ${cfg.filesDir} $out/share/php/${cfg.package.pname}/sites/default/files
		ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/${cfg.package.pname}/sites/default/settings.php
		ln -s ${cfg.modulesDir} $out/share/php/${cfg.package.pname}/modules
		ln -s ${cfg.themesDir} $out/share/php/${cfg.package.pname}/themes
		'';
		});

		@@ -387,7 +387,7 @@ in

		if [ ! -d "${cfg.stateDir}/sites" ]; then
		echo "Preparing sites directory..."
		cp -r "${cfg.package}/share/php/drupal/sites" "${cfg.stateDir}"
		cp -r "${cfg.package}/share/php/${cfg.package.pname}/sites" "${cfg.stateDir}"
		fi

		if [ ! -d "${cfg.filesDir}" ]; then
		@@ -397,7 +397,7 @@ in
		fi

		settings_file="${cfg.stateDir}/sites/default/settings.php"
		default_settings="${cfg.package}/share/php/drupal/sites/default/default.settings.php"
		default_settings="${cfg.package}/share/php/${cfg.package.pname}/sites/default/default.settings.php"

		if [ ! -f "$settings_file" ]; then
		echo "Preparing settings.php for ${hostName}..."
		@@ -434,7 +434,7 @@ in
		enable = true;
		virtualHosts = mapAttrs (hostName: cfg: {
		serverName = mkDefault hostName;
		root = "${pkg hostName cfg}/share/php/drupal";
		root = "${pkg hostName cfg}/share/php/${cfg.package.pname}";
		extraConfig = ''
		index index.php;
		'';
		@@ -535,7 +535,7 @@ in
		hostName: cfg:
		(nameValuePair hostName {
		extraConfig = ''
		root * ${pkg hostName cfg}/share/php/drupal
		root * ${pkg hostName cfg}/share/php/${cfg.package.pname}
		file_server

		encode zstd gzip

pkgs/by-name/az/aztfexport/package.nix

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		{
		lib,
		buildGoModule,
		fetchFromGitHub,
		nix-update-script,
		versionCheckHook,
		}:
		buildGoModule (finalAttrs: {
		pname = "aztfexport";
		version = "0.18.0";

		src = fetchFromGitHub {
		owner = "Azure";
		repo = "aztfexport";
		tag = "v${finalAttrs.version}";
		hash = "sha256-j6WdQvbxmHOMEfCvnFDxr9ZNOZg0BIOC6u1nw+n3hA0=";
		};

		vendorHash = "sha256-qb4/sUjtfw/USITTLSuB2fXWR2mAuAcvbawrNA/ilRo=";

		ldflags = [
		"-s"
		"-X main.version=${finalAttrs.version}"
		];

		passthru.updateScript = nix-update-script { };

		nativeInstallCheckInputs = [
		versionCheckHook
		];

		doInstallCheck = true;

		meta = {
		description = "Tool to bring existing Azure resources under Terraform's management";
		homepage = "https://github.com/Azure/aztfexport";
		changelog = "https://github.com/Azure/aztfexport/releases/tag/v${finalAttrs.version}";
		license = lib.licenses.mpl20;
		maintainers = [ lib.maintainers.john-rodewald ];
		mainProgram = "aztfexport";
		};
		})

pkgs/by-name/bi/bigpemu/package.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ let
		};
		in
		buildFHSEnv {
		name = "bigpemu";
		pname = "bigpemu";
		version = bigpemu-unwrapped.version;
		targetPkgs = pkgs: [
		glui

pkgs/by-name/ch/chawan/package.nix

+2 −6

Original line number	Diff line number	Diff line
		@@ -14,19 +14,15 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "chawan";
		version = "0.3.2";
		version = "0.3.3";

		src = fetchFromSourcehut {
		owner = "~bptato";
		repo = "chawan";
		tag = "v${finalAttrs.version}";
		hash = "sha256-JPFQsu5vLSesgpbX79Z5e0GGFIsC4PUJuZQS8a5Oq2c=";
		hash = "sha256-GVDh94pgdMlwHMyqtT8q2yM+rwioodBYQfA+AOZ/CsU=";
		};

		env.NIX_CFLAGS_COMPILE = toString (
		lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
		);

		nativeBuildInputs = [
		makeBinaryWrapper
		nim

pkgs/by-name/fe/ferron/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -10,13 +10,13 @@

		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "ferron";
		version = "2.3.2";
		version = "2.4.1";

		src = fetchFromGitHub {
		owner = "ferronweb";
		repo = "ferron";
		tag = finalAttrs.version;
		hash = "sha256-va9OUI2jQiJ3K/Cq3Wrh7RmMST3dBJLB5REcqp7WRP0=";
		hash = "sha256-darDJYPh0x1o1NHeXK2gyp48Zppbs2ovTXN/xX71eag=";
		};

		# ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md
		@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
		--replace-fail '#![doc = include_str!("../../README.md")]' ""
		'';

		cargoHash = "sha256-cOkZ8WVcgfIrwEBAGN/U3qp9VZl5S78Bmrpe4nxn994=";
		cargoHash = "sha256-YJ4Ur/4IUiupVE2gZyn0IAYwpIppVKB0hWtmc5Ue7jQ=";

		nativeBuildInputs = [
		pkg-config