Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnomeExtensions.taskwhisperer: init at v11 #35066

Merged
merged 1 commit into from Feb 20, 2018
Merged

gnomeExtensions.taskwhisperer: init at v11 #35066

merged 1 commit into from Feb 20, 2018

Conversation

jonafato
Copy link
Contributor

Motivation for this change

Add the TaskWhisperer GNOME Shell extension.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Feb 17, 2018
jtojnar
jtojnar requested changes Feb 17, 2018
View reviewed changes
pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix Outdated
sha256 = "1g1301rwnfg5jci78bjpmgxrn78ra80m1zp2inhfsm8jssr1i426";
};

propagatedBuildInputs = [ taskwarrior ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to propagate it? It will not add your environment, it means it will be added as a buildInput to packages depending on this. Just the sed replacement will be enough to keep it in nix store, though.

pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix Outdated
uuid = "taskwhisperer-extension@infinicode.de";

installPhase = ''
sed -i "s,\['task',\['${taskwarrior}/bin/task',g" taskService.js
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are additional mentions of task binary in the extra/* files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also it would be better to use patch and substituteAll – it makes it easier to track if the replacement is necessary. See for example

nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix

Lines 18 to 24 in f2fd4a5

patches = [
(substituteAll {
src = ./fix-paths.patch;
mencoder = "${mplayer}/bin/mencoder";
mplayer = "${mplayer}/bin/mplayer";
})
];

pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix Outdated
cp -r icons $out/share/gnome-shell/extensions/${uuid}
cp -r locale $out/share/gnome-shell/extensions/${uuid}
cp -r schemas $out/share/gnome-shell/extensions/${uuid}
cp -r translation $out/share/gnome-shell/extensions/${uuid}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably is not needed for installation (https://extensions.gnome.org/extension-data/taskwhisperer-extension%40infinicode.de.v10.shell-extension.zip). Ugh, they should just provide a makefile.

@jonafato jonafato force-pushed the gnome-shell-extension-taskwhisperer-11 branch from c50c774 to 58385e8 Compare February 18, 2018 04:07
@jonafato
Copy link
Contributor Author

@jtojnar Thanks for the review. PR updated.

@jtojnar jtojnar mentioned this pull request Feb 19, 2018
Closed
jtojnar
jtojnar requested changes Feb 19, 2018
View reviewed changes
pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix Outdated
cp -r schemas $out/share/gnome-shell/extensions/${uuid}
cp metadata.json $out/share/gnome-shell/extensions/${uuid}
cp settings.ui $out/share/gnome-shell/extensions/${uuid}
'';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stylesheet.css is missing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@jonafato
gnomeExtensions.taskwhisperer: init at v11
05d9196 
Add the TaskWhisperer GNOME Shell extension.
@jonafato jonafato force-pushed the gnome-shell-extension-taskwhisperer-11 branch from 58385e8 to 05d9196 Compare February 19, 2018 15:55
@jtojnar jtojnar merged commit 17421d6 into NixOS:master Feb 20, 2018
@jtojnar
Copy link
Contributor

jtojnar commented Feb 20, 2018

Thanks.

@jonafato jonafato deleted the gnome-shell-extension-taskwhisperer-11 branch February 20, 2018 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar requested changes

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jonafato @jtojnar @GrahamcOfBorg