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

.github/workflows/check-nix-format.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -85,5 +85,6 @@ jobs:
		echo "Some new/changed Nix files are not properly formatted"
		echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:"
		echo "nixfmt ${unformattedFiles[*]@Q}"
		echo "If you're having trouble, please ping @NixOS/nix-formatting"
		exit 1
		fi

nixos/tests/pantheon.nix

+5 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
		{
		imports = [ ./common/user-account.nix ];

		# Workaround ".gala-wrapped invoked oom-killer"
		virtualisation.memorySize = 2047;

		services.xserver.enable = true;
		services.xserver.desktopManager.pantheon.enable = true;

		@@ -83,10 +86,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
		machine.wait_for_window("io.elementary.calendar")

		with subtest("Open system settings"):
		machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'")
		machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.settings >&2 &'")
		# Wait for all plugins to be loaded before we check if the window is still there.
		machine.sleep(5)
		machine.wait_for_window("io.elementary.switchboard")
		machine.wait_for_window("io.elementary.settings")

		with subtest("Open elementary terminal"):
		machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ let
		in
		melpaBuild {
		pname = "lsp-bridge";
		version = "0-unstable-2024-08-12";
		version = "0-unstable-2024-08-17";

		src = fetchFromGitHub {
		owner = "manateelazycat";
		repo = "lsp-bridge";
		rev = "658f08ee51c193f52a0e9723b190e5f6eef77ab7";
		hash = "sha256-ksKvekDKYdlJULRmALudfduYe1TkW3aG2uBeKdHOokQ=";
		rev = "fe7a0729f9f46a0713b7049d20b25bb78d93f68f";
		hash = "sha256-lbtg1n72xNePs1DNpjy6Hvg4OhACk9vSfVwFffkeb0I=";
		};

		patches = [

pkgs/by-name/co/composefs/package.nix

+9 −25

Original line number	Diff line number	Diff line
		@@ -3,13 +3,13 @@
		, fetchFromGitHub
		, fetchpatch

		, autoreconfHook
		, meson
		, ninja
		, go-md2man
		, pkg-config
		, openssl
		, fuse3
		, libcap
		, libseccomp
		, python3
		, which
		, valgrind
		@@ -25,43 +25,28 @@
		}:
		stdenv.mkDerivation (finalAttrs: {
		pname = "composefs";
		version = "1.0.4";
		version = "1.0.5";

		src = fetchFromGitHub {
		owner = "containers";
		repo = "composefs";
		rev = "v${finalAttrs.version}";
		hash = "sha256-ekUFLZGWTsiJZFv3nHoxuV057zoOtWBIkt+VdtzlaU4=";
		hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw=";
		};

		strictDeps = true;
		outputs = [ "out" "lib" "dev" ];

		patches = [
		# fixes composefs-info tests, remove in next release
		# https://github.com/containers/composefs/pull/291
		(fetchpatch {
		url = "https://github.com/containers/composefs/commit/f7465b3a57935d96451b392b07aa3a1dafb56e7b.patch";
		hash = "sha256-OO3IfqLf3dQGjEgKx3Bo630KALmLAWwgdACuyZm2Ujc=";
		})
		];

		postPatch = lib.optionalString installExperimentalTools ''
		sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am
		sed -i "s/install : false/install : true/g" tools/meson.build
		'';

		configureFlags = [
		(lib.enableFeature true "man")
		(lib.enableFeature enableValgrindCheck "valgrind-test")
		];

		nativeBuildInputs = [ autoreconfHook go-md2man pkg-config ];
		nativeBuildInputs = [ meson ninja go-md2man pkg-config ];
		buildInputs = [ openssl ]
		++ lib.optional fuseSupport fuse3
		++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) (
		[
		libcap
		libseccomp
		]
		);

		@@ -71,11 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
		++ lib.optional fuseSupport fuse3
		++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [ erofs-utils fsverity-utils ];

		mesonCheckFlags = lib.optionals enableValgrindCheck "--setup=valgrind";

		preCheck = ''
		patchShebangs --build tests/dir tests/.sh
		substituteInPlace tests/*.sh \
		--replace-quiet " /tmp" " $TMPDIR" \
		--replace-quiet " /var/tmp" " $TMPDIR"
		patchShebangs --build ../tests/dir ../tests/.sh
		'';

		passthru = {

pkgs/by-name/fi/files-cli/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,16 +7,16 @@

		buildGoModule rec {
		pname = "files-cli";
		version = "2.13.107";
		version = "2.13.122";

		src = fetchFromGitHub {
		repo = "files-cli";
		owner = "files-com";
		rev = "v${version}";
		hash = "sha256-fZp27mFnZi10kMHHNxvPL3E30jFCF6SOvuSo1whgmJ4=";
		hash = "sha256-5F1ETivnflf27nseSTQ4xv1LkJKKC3oa+Ao20jUW1BQ=";
		};

		vendorHash = "sha256-Cz8QP95guBTOWr8Fr9fej/K3WiNCKx5BjPRuwiQWNzM=";
		vendorHash = "sha256-4uFUo47m1jdKIhPgDE5R4Hb+HQslsDu16QNb4IDTwMg=";

		ldflags = [
		"-s"

Admin message