From 312506638cd985f4567bc5319f304cb0dbdd611d Mon Sep 17 00:00:00 2001 From: Luna Perego Date: Sun, 30 Jun 2024 22:51:10 +0200 Subject: [PATCH 1/2] maintainers: add husky --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 42c7571ea286..feba9cd3857e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8263,6 +8263,13 @@ githubId = 6109326; name = "David Hummel"; }; + husky = { + email = "husky@husky.sh"; + github = "huskyistaken"; + githubId = 20684258; + name = "Luna Perego"; + keys = [ { fingerprint = "09E4 B981 9B93 5B0C 0B91 1274 0578 7332 9217 08FF"; } ]; + }; huyngo = { email = "huyngo@disroot.org"; github = "Huy-Ngo"; From b6ae22c2417f5b62ecea2dc299352d9527e1de2c Mon Sep 17 00:00:00 2001 From: Luna Perego Date: Sun, 30 Jun 2024 22:51:34 +0200 Subject: [PATCH 2/2] gnomeExtensions.guillotine: package manually --- .../gnome/extensions/guillotine/default.nix | 55 +++++++++++++++++++ .../gnome/extensions/manuallyPackaged.nix | 1 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/guillotine/default.nix diff --git a/pkgs/desktops/gnome/extensions/guillotine/default.nix b/pkgs/desktops/gnome/extensions/guillotine/default.nix new file mode 100644 index 000000000000..947317b1fe93 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/guillotine/default.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchFromGitLab, + glib, +}: +# We package this manually because upstream stopped updating the package to +# extensions.gnome.org. See: +# https://gitlab.com/ente76/guillotine/-/issues/17 +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-shell-extension-guillotine"; + version = "24"; + + src = fetchFromGitLab { + owner = "ente76"; + repo = "guillotine"; + rev = "v${finalAttrs.version}"; + hash = "sha256-eNhK3h9luPGXHR3lPkfu/mUN9+ixma64rbCk0cjF4Fc="; + }; + + nativeBuildInputs = [ glib ]; + + passthru = { + extensionUuid = "guillotine@fopdoodle.net"; + extensionPortalSlug = "guillotine"; + }; + + buildPhase = '' + runHook preBuild + rm schemas/gschemas.compiled + glib-compile-schemas schemas + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions/guillotine@fopdoodle.net + cp -R schemas "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp default.json $out/share/gnome-shell/extensions/guillotine@fopdoodle.net + cp extension.js "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp guillotine-symbolic.svg "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp LICENSE "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp metadata.json "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + cp README.md "$out/share/gnome-shell/extensions/guillotine@fopdoodle.net" + runHook postInstall + ''; + + meta = { + description = "A gnome extension designed for efficiently carrying out executions of commands from a customizable menu"; + homepage = "https://gitlab.com/ente76/guillotine/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ husky ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index fa5d72cb1c49..b1b6e0695b2f 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -6,6 +6,7 @@ "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; + "guillotine@fopdoodle.net" = callPackage ./guillotine { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { };