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

nixos/tests/all-tests.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ in {
		loki = handleTest ./loki.nix {};
		luks = handleTest ./luks.nix {};
		lvm2 = handleTest ./lvm2 {};
		lxd = handleTest ./lxd {};
		lxd = pkgs.recurseIntoAttrs (handleTest ./lxd {});
		lxd-image-server = handleTest ./lxd-image-server.nix {};
		#logstash = handleTest ./logstash.nix {};
		lorri = handleTest ./lorri/default.nix {};

nixos/tests/dolibarr.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
		# Now, we have installed the machine, let's verify we still have the right configuration.
		assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
		# We do not want any redirect now as we have installed the machine.
		machine.succeed('curl -f -X POST http://localhost')
		machine.succeed('curl -f -X GET http://localhost')
		# Test authentication to the webservice.
		parser = TokenParser()
		parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))

pkgs/applications/editors/emacs/default.nix

+12 −32

Original line number	Diff line number	Diff line
		@@ -4,6 +4,14 @@ lib.makeScope pkgs.newScope (self:
		let
		gconf = pkgs.gnome2.GConf;
		inherit (self) callPackage;
		inheritedArgs = {
		inherit gconf;

		inherit (pkgs.darwin) sigtool;
		inherit (pkgs.darwin.apple_sdk.frameworks)
		AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
		QuartzCore WebKit;
		};
		in {
		sources = import ./sources.nix {
		inherit lib;
		@@ -12,14 +20,7 @@ lib.makeScope pkgs.newScope (self:
		fetchFromSavannah;
		};

		emacs28 = callPackage (self.sources.emacs28) {
		inherit gconf;

		inherit (pkgs.darwin) sigtool;
		inherit (pkgs.darwin.apple_sdk.frameworks)
		AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
		QuartzCore WebKit;
		};
		emacs28 = callPackage (self.sources.emacs28) inheritedArgs;

		emacs28-gtk2 = self.emacs28.override {
		withGTK2 = true;
		@@ -33,14 +34,7 @@ lib.makeScope pkgs.newScope (self:
		noGui = true;
		});

		emacs29 = callPackage (self.sources.emacs29) {
		inherit gconf;

		inherit (pkgs.darwin) sigtool;
		inherit (pkgs.darwin.apple_sdk.frameworks)
		AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
		QuartzCore WebKit;
		};
		emacs29 = callPackage (self.sources.emacs29) inheritedArgs;

		emacs29-gtk3 = self.emacs29.override {
		withGTK3 = true;
		@@ -54,21 +48,7 @@ lib.makeScope pkgs.newScope (self:
		withPgtk = true;
		};

		emacs28-macport = callPackage (self.sources.emacs28-macport) {
		inherit gconf;
		emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;

		inherit (pkgs.darwin) sigtool;
		inherit (pkgs.darwin.apple_sdk.frameworks)
		AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
		QuartzCore WebKit;
		};

		emacs29-macport = callPackage (self.sources.emacs29-macport) {
		inherit gconf;

		inherit (pkgs.darwin) sigtool;
		inherit (pkgs.darwin.apple_sdk.frameworks)
		AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
		QuartzCore WebKit;
		};
		emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
		})

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,13 @@ let
		(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
		});

		typst-mode = super.typst-mode.overrideAttrs (attrs: {
		postPatch = attrs.postPatch or "" + ''
		substituteInPlace typst-mode.el \
		--replace 'typst-executable-location "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"'
		'';
		});

		vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
		nativeBuildInputs =
		(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];

pkgs/applications/editors/emacs/sources.nix

+57 −64

Original line number	Diff line number	Diff line
		@@ -4,7 +4,22 @@
		}:

		let
		metaFor = variant: version: rev: {
		mkArgs = { pname, version, variant, rev, hash }: {
		inherit pname version variant;

		src = {
		"mainline" = (fetchFromSavannah {
		repo = "emacs";
		inherit rev hash;
		});
		"macport" = (fetchFromBitbucket {
		owner = "mituharu";
		repo = "emacs-mac";
		inherit rev hash;
		});
		}.${variant};

		meta = {
		homepage = {
		"mainline" = "https://www.gnu.org/software/emacs/";
		"macport" = "https://bitbucket.org/mituharu/emacs-mac/";
		@@ -49,60 +64,38 @@ let
		}.${variant};
		mainProgram = "emacs";
		};
		};
		in
		{
		emacs28 = import ./generic.nix {
		emacs28 = import ./generic.nix (mkArgs {
		pname = "emacs";
		version = "28.2";
		variant = "mainline";
		src = fetchFromSavannah {
		repo = "emacs";
		rev = "28.2";
		hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
		};

		meta = metaFor "mainline" "28.2" "28.2";
		};
		});

		emacs29 = import ./generic.nix {
		emacs29 = import ./generic.nix (mkArgs {
		pname = "emacs";
		version = "29.1";
		variant = "mainline";
		src = fetchFromSavannah {
		repo = "emacs";
		rev = "29.1";
		hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
		};
		});

		meta = metaFor "mainline" "29.1" "29.1";
		};

		emacs28-macport = import ./generic.nix {
		emacs28-macport = import ./generic.nix (mkArgs {
		pname = "emacs-mac";
		version = "28.2";
		variant = "macport";
		src = fetchFromBitbucket {
		owner = "mituharu";
		repo = "emacs-mac";
		rev = "emacs-28.2-mac-9.1";
		hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
		};

		meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1";
		};
		});

		emacs29-macport = import ./generic.nix {
		emacs29-macport = import ./generic.nix (mkArgs {
		pname = "emacs-mac";
		version = "29.1";
		variant = "macport";

		src = fetchFromBitbucket {
		owner = "mituharu";
		repo = "emacs-mac";
		rev = "emacs-29.1-mac-10.0";
		hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";
		};

		meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0";
		};
		});
		}

Admin message