Merge pull request #142037 from rhoriguchi/gnomeExtensions (34462eb0) · Commits · nix / nixpkgs

pkgs/desktops/gnome/extensions/collisions.json

+4 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,10 @@
		"unredirect@vaina.lt",
		"unredirect@aunetx"
		],
		"floating-dock": [
		"floatingDock@sun.wxg@gmail.com",
		"floating-dock@nandoferreira_prof@hotmail.com"
		],
		"extension-list": [
		"extension-list@tu.berry",
		"screen-lock@garciabaameiro.com"

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		{ lib, stdenv
		, fetchFromGitHub
		, glib
		, gettext
		, sassc
		}:

		stdenv.mkDerivation rec {
		pname = "gnome-shell-extension-dash-to-dock";
		version = "unstable-2021-10-03";

		# temporarily switched to commit hash because GNOME 40 version is not released yet.
		src = fetchFromGitHub {
		owner = "micheleg";
		repo = "dash-to-dock";
		rev = "9605dd69fe86d4f92416299c3f62605e75827dd3";
		sha256 = "0vrkiq5z2f11gqlfyis2rsnp6j25hwsp24s21vr55qkzkfszsigg";
		};

		nativeBuildInputs = [
		glib
		gettext
		sassc
		];

		makeFlags = [
		"INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
		];

		passthru = {
		extensionUuid = "dash-to-dock@micxgx.gmail.com";
		extensionPortalSlug = "dash-to-dock";
		};

		meta = with lib; {
		description = "A dock for the Gnome Shell";
		homepage = "https://micheleg.github.io/dash-to-dock/";
		license = licenses.gpl2;
		maintainers = with maintainers; [ eperuffo jtojnar ];
		};
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,10 @@
		# the upstream repository's sources.
		super: super // {

		"dash-to-dock@micxgx.gmail.com" = super."dash-to-dock@micxgx.gmail.com".overrideAttrs (old: {
		meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ];
		});

		"display-brightness-ddcutil@themightydeity.github.com" = super."display-brightness-ddcutil@themightydeity.github.com".overrideAttrs (old: {
		# Has a hard-coded path to a run-time dependency
		# https://github.com/NixOS/nixpkgs/issues/136111

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@
		"extension-list@tu.berry" = "extension-list";
		"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug

		"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
		"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";

		# ############################################################################
		# These are conflicts for 3.38 extensions. They will very probably come back

+51 −40

File changed.

Preview size limit exceeded, changes collapsed.