Merge master into staging-next (4be61016) · Commits · nix / nixpkgs

maintainers/scripts/luarocks-packages.csv

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ funnyfiles.nvim,,,,,,mrcjkb
		fzf-lua,,,,,,mrcjkb
		fzy,,,,,,mrcjkb
		gitsigns.nvim,https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec,,,,5.1,
		grug-far.nvim,,,,,,teto
		haskell-tools.nvim,,,,,,mrcjkb
		http,,,,0.3-0,,vcunat
		image.nvim,,,,,,teto

pkgs/applications/editors/vim/plugins/generated.nix

+0 −13

Original line number	Diff line number	Diff line
		@@ -5438,19 +5438,6 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		grug-far-nvim = buildVimPlugin {
		pname = "grug-far.nvim";
		version = "2025-04-08";
		src = fetchFromGitHub {
		owner = "MagicDuck";
		repo = "grug-far.nvim";
		rev = "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9";
		sha256 = "04z8d5vh4z26d3rpf8ab78q434zsvg6h1fb7hhkd3mqk8wlv0zyw";
		};
		meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
		meta.hydraPlatforms = [ ];
		};

		gruvbox = buildVimPlugin {
		pname = "gruvbox";
		version = "2023-08-14";

pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ let
		luarocksPackageNames = [
		"fidget-nvim"
		"gitsigns-nvim"
		"grug-far-nvim"
		"image-nvim"
		"lsp-progress-nvim"
		"lualine-nvim"

pkgs/applications/editors/vim/plugins/vim-plugin-names

+0 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,6 @@ https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
		https://github.com/liuchengxu/graphviz.vim/,,
		https://github.com/cbochs/grapple.nvim/,HEAD,
		https://github.com/blazkowolf/gruber-darker.nvim/,,
		https://github.com/MagicDuck/grug-far.nvim/,,
		https://github.com/morhetz/gruvbox/,,
		https://github.com/luisiacc/gruvbox-baby/,HEAD,
		https://github.com/gruvbox-community/gruvbox/,,gruvbox-community

pkgs/applications/science/astronomy/stellarium/default.nix

+17 −18

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		lib,
		stdenv,
		fetchFromGitHub,
		fetchpatch,
		cmake,
		perl,
		wrapGAppsHook3,
		@@ -24,33 +23,32 @@
		testers,
		xvfb-run,
		gitUpdater,
		md4c,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "stellarium";
		version = "24.4";
		version = "25.1";

		src = fetchFromGitHub {
		owner = "Stellarium";
		repo = "stellarium";
		rev = "v${finalAttrs.version}";
		hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA=";
		hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs=";
		};

		patches = [
		# Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025
		(fetchpatch {
		url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch";
		hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A=";
		})
		];

		postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
		postPatch =
		''
		substituteInPlace CMakeLists.txt \
		--replace-fail 'CPMAddPackage(NAME md4c' \
		'CPMFindPackage(NAME md4c'
		''
		+ lib.optionalString stdenv.hostPlatform.isDarwin ''
		substituteInPlace CMakeLists.txt \
		--replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
		--replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
		'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
		substituteInPlace src/CMakeLists.txt \
		--replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
		--replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
		'';

		nativeBuildInputs = [
		@@ -74,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
		indilib
		libnova
		exiv2
		md4c
		nlopt
		]
		++ lib.optionals stdenv.hostPlatform.isLinux [

Admin message