Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5aa576026179
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0213ccf6243a
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 1, 2019

  1. caffeine-ng: do not run tests 

    There are no tests anyway. Not finding the tests results in build
failures if using Python 3.
    @marzipankaiser
    marzipankaiser committed Sep 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marzipankaiser Marcial Gaißert
    GPG key ID: B629036BE399EEE9
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fc78d8e View commit details

  2. caffeine-ng: use python3 

    Using python3 is recommended by upstream.
    @marzipankaiser
    marzipankaiser committed Sep 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marzipankaiser Marcial Gaißert
    GPG key ID: B629036BE399EEE9
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    85c084d View commit details

Commits on Sep 4, 2019

  1. caffeine-ng: remove unneeded dependencies setuptools, wheel

    @marzipankaiser
    marzipankaiser committed Sep 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marzipankaiser Marcial Gaißert
    GPG key ID: B629036BE399EEE9
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cdf8247 View commit details

Commits on Sep 5, 2019

  1. caffeine-ng: move setuptools_scm dependency to buildInputs 

    setuptools_scm is only needed during build, not whilst using the package.
    @marzipankaiser
    marzipankaiser committed Sep 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marzipankaiser Marcial Gaißert
    GPG key ID: B629036BE399EEE9
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d64cdba View commit details

  2. Merge pull request #67894 from marzipankaiser/caffeine-ng 

    caffeine-ng: use python3 and some other improvements
    @flokli
    flokli authored Sep 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0213ccf View commit details
Showing with 11 additions and 6 deletions.
  1. +11 −6 pkgs/tools/X11/caffeine-ng/default.nix
17 changes: 11 additions & 6 deletions pkgs/tools/X11/caffeine-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
pythonPackages, wrapGAppsHook
python3Packages, wrapGAppsHook
}:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "caffeine-ng";
version = "3.4.2";

src = pythonPackages.fetchPypi{
src = python3Packages.fetchPypi{
inherit pname version;
sha256="05k8smjlfjcccgmp8qi04l7106k46fs4p8fl5bdqqjwv6pwl7y4w";
};

nativeBuildInputs = [ wrapGAppsHook glib ];
buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 ];
pythonPath = with pythonPackages; [
buildInputs = [
gdk-pixbuf gobject-introspection libnotify gtk3
python3Packages.setuptools_scm
];
pythonPath = with python3Packages; [
dbus-python docopt ewmh pygobject3 pyxdg
setproctitle setuptools setuptools_scm wheel
setproctitle
];

doCheck = false; # There are no tests.

postBuild = ''
mkdir -p $out/share
cp -r share $out/