Merge pull request #313416 from bobby285271/upd/pantheon-tweaks (e967f2f9) · Commits · nix / nixpkgs

nixos/doc/manual/release-notes/rl-2111.section.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ In addition to numerous new and upgraded packages, this release has the followin

		- [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable).

		- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).
		- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as `programs.pantheon-tweaks`.

		- [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support.

nixos/modules/module-list.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,6 @@
		./programs/oblogout.nix
		./programs/oddjobd.nix
		./programs/openvpn3.nix
		./programs/pantheon-tweaks.nix
		./programs/partition-manager.nix
		./programs/plotinus.nix
		./programs/pqos-wrapper.nix

nixos/modules/programs/pantheon-tweaks.nix

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, ... }:

		{
		meta = {
		maintainers = lib.teams.pantheon.members;
		};

		###### interface
		options = {
		programs.pantheon-tweaks.enable = lib.mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon";
		};

		###### implementation
		config = lib.mkIf config.programs.pantheon-tweaks.enable {
		services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ];
		};
		}

nixos/modules/rename.nix

+6 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ in
		(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
		(mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] ''
		pantheon-tweaks is no longer a switchboard plugin but an independent app,
		adding the package to environment.systemPackages is sufficient.
		'')
		(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
		(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
		"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))

pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix→pkgs/by-name/pa/pantheon-tweaks/package.nix

+10 −10

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		, pkg-config
		, python3
		, vala
		, wrapGAppsHook3
		, gtk3
		, libgee
		, pantheon
		@@ -14,25 +15,22 @@

		stdenv.mkDerivation rec {
		pname = "pantheon-tweaks";
		version = "1.1.2";
		version = "2.0.1";

		src = fetchFromGitHub {
		owner = "pantheon-tweaks";
		repo = pname;
		rev = version;
		sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ=";
		hash = "sha256-P3eM+xgsAMvqr2mIEjkQSjhxvQAwtSNItxAUcjO3ciY=";
		};

		patches = [
		./fix-paths.patch
		];

		nativeBuildInputs = [
		meson
		ninja
		pkg-config
		python3
		vala
		wrapGAppsHook3
		];

		buildInputs = [
		@@ -42,12 +40,14 @@ stdenv.mkDerivation rec {
		elementary-files # settings schemas
		elementary-terminal # settings schemas
		granite
		switchboard
		]);

		postPatch = ''
		chmod +x meson/post_install.py
		patchShebangs meson/post_install.py

		substituteInPlace src/Settings/ThemeSettings.vala \
		--replace-fail "/usr/share/" "/run/current-system/sw/share/"
		'';

		passthru = {
		@@ -55,15 +55,15 @@ stdenv.mkDerivation rec {
		};

		meta = with lib; {
		description = "Unofficial system settings panel for Pantheon";
		description = "Unofficial system customization app for Pantheon";
		longDescription = ''
		Unofficial system settings panel for Pantheon
		Unofficial system customization app for Pantheon
		that lets you easily and safely customise your desktop's appearance.
		Use programs.pantheon-tweaks.enable to add this to your switchboard.
		'';
		homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks";
		license = licenses.gpl3Plus;
		platforms = platforms.linux;
		maintainers = teams.pantheon.members;
		mainProgram = "pantheon-tweaks";
		};
		}

Admin message