Merge master into staging-nixos (95aa4536) · Commits · nix / nixpkgs

pkgs/applications/editors/vim/plugins/utils/vim-utils.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -218,6 +218,8 @@ let
		paths = allGrammars;
		};

		allAndOptPluginNames = map (plugin: plugin.pname) (allPlugins ++ opt);

		packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" (
		if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins
		);
		@@ -234,8 +236,8 @@ let

		assert
		(
		builtins.elem vimPlugins.nvim-treesitter (opt ++ allPlugins)
		&& builtins.elem vimPlugins.nvim-treesitter-legacy (opt ++ allPlugins)
		builtins.elem "nvim-treesitter" allAndOptPluginNames
		&& builtins.elem "nvim-treesitter-legacy" allAndOptPluginNames
		)
		-> throw "You cannot include two different versions of nvim-treesitter, perhaps you included a legacy plugin together with a new one?";

pkgs/by-name/fi/firebase-tools/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,17 +11,17 @@

		buildNpmPackage rec {
		pname = "firebase-tools";
		version = "15.14.0";
		version = "15.15.0";
		nodejs = nodejs_22;

		src = fetchFromGitHub {
		owner = "firebase";
		repo = "firebase-tools";
		tag = "v${version}";
		hash = "sha256-0jkeO8S47kxxnBLwaaeoc5QJobZpZjTR85kgkCZyIiQ=";
		hash = "sha256-lY52YRT+DIV8DTIEtquRuB6Q6TY0mi4I4+E+o1usQrM=";
		};

		npmDepsHash = "sha256-T2tB+kOYYdt048Y6ONrRDWUd4OLJGdOd59LdNIhVLMQ=";
		npmDepsHash = "sha256-7XYgjoKEHXi26utNECCjqaDXoWYcyblt7rGgklWbmX8=";

		# No more package-lock.json in upstream src
		postPatch = ''

pkgs/by-name/it/itgmania/package.nix

+13 −87

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchFromGitHub,
		cmake,
		nasm,
		pkg-config,
		copyDesktopItems,
		alsa-lib,
		glew,
		glib,
		gtk3,
		libmad,
		libogg,
		libpulseaudio,
		libusb-compat-0_1,
		libvorbis,
		libxtst,
		udev,
		symlinkJoin,
		makeWrapper,
		makeDesktopItem,
		itgmaniaPackages,
		extraPackages ? [ ],
		}:
		let
		unwrapped = itgmaniaPackages.itgmania-unwrapped;
		in
		symlinkJoin {
		inherit (unwrapped) pname version meta;

		stdenv.mkDerivation (finalAttrs: {
		pname = "itgmania";
		version = "1.2.0";
		paths = [ unwrapped ] ++ extraPackages;

		src = fetchFromGitHub {
		owner = "itgmania";
		repo = "itgmania";
		tag = "v${finalAttrs.version}";
		fetchSubmodules = true;
		hash = "sha256-RkV/OIDudt2XemhaFRY7IA5o7Q2w+j01tauD7KpzYpA=";
		};
		nativeBuildInputs = [ makeWrapper ];

		nativeBuildInputs = [
		cmake
		nasm
		pkg-config
		makeWrapper
		copyDesktopItems
		];

		buildInputs = [
		alsa-lib
		glew
		glib
		gtk3
		libmad
		libogg
		libpulseaudio
		libusb-compat-0_1
		libvorbis
		libxtst
		udev
		];

		cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-DWITH_MINIMAID=off" ];

		postInstall = ''
		postBuild = ''
		makeWrapper $out/itgmania/itgmania $out/bin/itgmania \
		--chdir $out/itgmania

		mkdir -p $out/share/icons/hicolor/scalable/apps/
		ln -s $out/itgmania/Data/logo.svg $out/share/icons/hicolor/scalable/apps/itgmania.svg
		'';

		desktopItems = [
		(makeDesktopItem {
		name = "itgmania";
		desktopName = "ITGmania";
		genericName = "Rhythm and dance game";
		tryExec = "itgmania";
		exec = "itgmania";
		terminal = false;
		icon = "itgmania";
		type = "Application";
		comment = "A cross-platform rhythm video game.";
		categories = [
		"Game"
		"ArcadeGame"
		];
		})
		];

		meta = {
		homepage = "https://www.itgmania.com/";
		description = "Fork of StepMania 5.1, improved for the post-ITG community";
		platforms = lib.platforms.linux;
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [
		ftsimas
		maxwell-lt
		];
		mainProgram = "itgmania";
		};
		})
		passthru.unwrapped = unwrapped;
		}

pkgs/by-name/it/itgmania/packages.nix

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		{ lib, newScope }:
		lib.makeScope newScope (self: {
		itgmania-unwrapped = self.callPackage ./unwrapped.nix { };
		# Themes
		arrowcloud-theme = self.callPackage ./themes/arrowcloud-theme.nix { };
		digital-dance = self.callPackage ./themes/digital-dance.nix { };
		itg2-sm5 = self.callPackage ./themes/itg2-sm5.nix { };
		itg3encore = self.callPackage ./themes/itg3encore.nix { };
		zmod-simply-love = self.callPackage ./themes/zmod-simply-love.nix { };
		})

pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchFromGitHub,
		nix-update-script,
		}:
		stdenv.mkDerivation (finalAttrs: {
		pname = "arrowcloud-theme";
		version = "20260328";

		src = fetchFromGitHub {
		owner = "Arrow-Cloud";
		repo = "theme";
		tag = "v${finalAttrs.version}";
		hash = "sha256-9BND3IUIc5uMBxzw+Pn/59jBKBK/xGWrOIgcIYIQvgk=";
		};

		postInstall = ''
		mkdir -p "$out/itgmania/Themes/Arrow Cloud"
		mv * "$out/itgmania/Themes/Arrow Cloud"
		'';

		passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };

		meta = {
		description = "Arrow Cloud's fork of Zmod";
		homepage = "https://github.com/Arrow-Cloud/theme";
		license = lib.licenses.gpl3Plus;
		maintainers = with lib.maintainers; [ ungeskriptet ];
		};
		})