[PATCH, WIP] new variable: redshift

[PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]

How could anyone live without this? I am disappoint.. I couldn't try it
on bare metal yet and the drm and randr methods fail in qemu. Maybe
someone can test it? Thanks?

Flo

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..c0ef4bc 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,28 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("lobdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis "Redshift adjusts the color temperature of your screen according to your surroundings.")
+    (description "This may help your eyes hurt less if you are working in front of the screen at night.")
+    (license license:gpl3)))

[-- Attachment #2: redshift.patch --]
[-- Type: application/octet-stream, Size: 1246 bytes --]

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..c0ef4bc 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,28 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("lobdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis "Redshift adjusts the color temperature of your screen according to your surroundings.")
+    (description "This may help your eyes hurt less if you are working in front of the screen at night.")
+    (license license:gpl3)))

Re: [PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 11/24/2015 09:28 AM, Florian Paul Schmidt wrote:
> How could anyone live without this? I am disappoint.. I couldn't
> try it on bare metal yet and the drm and randr methods fail in
> qemu. Maybe someone can test it? Thanks?
> 

Um, how did this happen?

> +       ("lobdrm" ,libdrm)

No idea :) Will send an updated diff later..

Flo


- -- 
https://fps.io
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJWVCabAAoJEA5f4Coltk8ZP9AH/0aE9AMXkvSSi4COnVMgdJ8X
+3B0GlpEel5iSRfYCKjgLQhUM19R81hkstacMOytew+11FTRJDU1C1AcDQpYY29S
oS2QKrEQdxCdQnIiD0+/KE6LcM3E8k6W5vIrY66rsdCGTc+YB4NRCMDuy4TxUVDq
EvVgb17UveUtUeKphevQTIr6BO84PaAnHt5/VjWEBPB9Hdtiz8nucN48IriOfM4k
Yg7gRev1uf5da37OrtUINCcA8UT2WjQ8B/TuxbZewb/s4Rvw8ZzicTm90v0PQ+WH
HlyFRybNmR/mCoVzyFuCGc/iRAeUr/g8K3rSN9QohX+nWvEeSjgc+09FPOebYgY=
=kDHQ
-----END PGP SIGNATURE-----

Re: [PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

Updated

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..2b07ea5 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,28 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("libdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis "Redshift adjusts the color temperature of your screen according to your surroundings.")
+    (description "This may help your eyes hurt less if you are working in front of the screen at night.")
+    (license license:gpl3)))

[-- Attachment #2: redshift.patch --]
[-- Type: application/octet-stream, Size: 1246 bytes --]

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..2b07ea5 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,28 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("libdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis "Redshift adjusts the color temperature of your screen according to your surroundings.")
+    (description "This may help your eyes hurt less if you are working in front of the screen at night.")
+    (license license:gpl3)))

Re: [PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

[-- Attachment #1: Type: text/plain, Size: 1288 bytes --]

Updated to make lint happy

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..6a84e8c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,33 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("libdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis
+     "Adjusts the color temperature of your screen
+ according to your surroundings")
+    (description
+     "This may help your eyes hurt less if you are working
+in front of the screen at night.")
+    (license license:gpl3)))

[-- Attachment #2: redshift.patch --]
[-- Type: application/octet-stream, Size: 1260 bytes --]

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..6a84e8c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,33 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("intltool" ,intltool)
+       ("libdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis
+     "Adjusts the color temperature of your screen
+ according to your surroundings")
+    (description
+     "This may help your eyes hurt less if you are working
+in front of the screen at night.")
+    (license license:gpl3)))

Re: [PATCH, WIP] new variable: redshift

[Jeff Mickey]

Don't know what others think, but we should probably also package
redshift-gtk if we're gonna include redshift. Mine has a bug where icons
don't show up so I didn't push it, but see here for what I use locally:

https://github.com/codemac/guix-pkgs/blob/master/src/codemac/packages/redshift.scm

  //  codemac
  
* Florian Paul Schmidt <mista.tapas@gmx.net> [2015-11-24 01:23]:
> Updated to make lint happy
>
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index 4b5308c..6a84e8c 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -655,3 +655,33 @@ use it as well.")
>       "The xf86-input-wacom driver is the wacom-specific X11 input driver for
>  the X.Org X Server version 1.7 and later (X11R7.5 or later).")
>      (license license:x11)))
> +
> +(define-public redshift
> +  (package
> +    (name "redshift")
> +    (version "1.10")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri
> +        "https://github.com/jonls/redshift/releases/download/v1.10/redshift-1.10.tar.xz")
> +       (sha256
> +        (base32
> +         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("intltool" ,intltool)
> +       ("libdrm" ,libdrm)
> +       ("libx11" ,libx11)
> +       ("libxcb" ,libxcb)
> +       ("geoclue" ,geoclue)))
> +    (home-page "https://github.com/jonls/redshift")
> +    (synopsis
> +     "Adjusts the color temperature of your screen
> + according to your surroundings")
> +    (description
> +     "This may help your eyes hurt less if you are working
> +in front of the screen at night.")
> +    (license license:gpl3)))

Re: [PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

On 11/24/2015 04:59 PM, Jeff Mickey wrote:
> Don't know what others think, but we should probably also package 
> redshift-gtk if we're gonna include redshift. Mine has a bug where
>  icons don't show up so I didn't push it, but see here for what I 
> use locally:
> 
> https://github.com/codemac/guix-pkgs/blob/master/src/codemac/packages/redshift.scm


Yours looks cleaner than mine, so go ahead. I personally have
no interest in the gtk package. And excuse the broken email. Thunderbird
insists on messing it up..

Flo


-- 
https://fps.io

Re: [PATCH, WIP] new variable: redshift

[Ludovic Courtès]

Jeff Mickey <j@codemac.net> skribis:

> Don't know what others think, but we should probably also package
> redshift-gtk if we're gonna include redshift. Mine has a bug where icons
> don't show up so I didn't push it, but see here for what I use locally:
>
> https://github.com/codemac/guix-pkgs/blob/master/src/codemac/packages/redshift.scm

Using ‘glib-or-gtk-build-system’ may fix the icon issue.  Could you try
that?

You’re welcome to submit redshift-gtk separately!

Ludo’.

Re: [PATCH, WIP] new variable: redshift

[Ludovic Courtès]

Jeff Mickey <j@codemac.net> skribis:

> Don't know what others think, but we should probably also package
> redshift-gtk if we're gonna include redshift. Mine has a bug where icons
> don't show up so I didn't push it, but see here for what I use locally:
>
> https://github.com/codemac/guix-pkgs/blob/master/src/codemac/packages/redshift.scm

I see your redshift package is also slightly more elaborate.  Would you
like to submit it (or Florian can incorporate the differences)?  Here
are some comments:

> +    (synopsis
> +     "Adjusts the color temperature of your screen
> + according to your surroundings")

Rather “Adjust your screen's color temperature”.

> +    (description
> +     "This may help your eyes hurt less if you are working
> +in front of the screen at night.")

What about:

  “Redshift adjust your screen's color temperature according to your
  environment.  This may help make your eyes hurt less, for instance
  when working in front of the screen at night.”

?

> +    (license license:gpl3)))

The source file headers carry the “or later” clause, so this should be
‘gplv3+’.

Thanks in advance!

Ludo’.

Re: [PATCH, WIP] new variable: redshift

[Andreas Enge]

On Wed, Nov 25, 2015 at 01:47:46PM +0100, Ludovic Courtès wrote:
>   “Redshift adjust your screen's color temperature

"Redshift adjusts the color temperature of your screen...".

Andreas

Re: [PATCH, WIP] new variable: redshift

[Florian Paul Schmidt]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 11/25/2015 01:47 PM, Ludovic Courtès wrote:

> I see your redshift package is also slightly more elaborate.  Would
> you like to submit it (or Florian can incorporate the differences)?
> Here are some comments:
> 
>> +    (synopsis +     "Adjusts the color temperature of your
>> screen + according to your surroundings")
> 
> Rather “Adjust your screen's color temperature”.
> 
>> +    (description +     "This may help your eyes hurt less if you
>> are working +in front of the screen at night.")
> 
> What about:
> 
> “Redshift adjust your screen's color temperature according to your 
> environment.  This may help make your eyes hurt less, for instance 
> when working in front of the screen at night.”

Sure. I stuck to the text from the github project's README.md. Might
not be the best decision :)

> 
> ?
> 
>> +    (license license:gpl3)))
> 
> The source file headers carry the “or later” clause, so this should
> be ‘gplv3+’.

OK, I must have missed that since I just looked in the original
COPYING file.

If Jeff wants to submit his version that's super cool. Less work for
me. I'm lazy..

Flo





- -- 
https://fps.io
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJWVeixAAoJEA5f4Coltk8Z7y4H/0sCFEV309VgF6YEEEN1VxSJ
zUOO97OuWpmS6gOxJq82rrKJvnce2J2nJrLQZ1imE1Wc5jMoCrLsl27HKnMCawyM
vgRPeuyx2O2D3EDCXXhljK+Q5Y867a7GnMLIx8UxdWxrMvvEjlj+bboh7Uryl6cd
qBNoXqN4t0y/MsAHwWPrxO467vkjlbG/FLsrdMQwKAXSkhZTnae4CKrpFbJhfFkX
e7Bf+dn35D+Yvj6lR4MC2sfFoNYif0d3DRJXXnRDj6YqUGVCcWac59ezBvMf2GHD
d8kDXAa6HOA4PipsQ54lDFSdNqcYbg+Fx/MqxxgfZm8hIub3LNbd8esJQ35ZP8E=
=6gZP
-----END PGP SIGNATURE-----

Re: [PATCH, WIP, v2] new variable: redshift

[Florian Paul Schmidt]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

On 11/24/2015 09:28 AM, Florian Paul Schmidt wrote:
> How could anyone live without this? I am disappoint.. I couldn't try it
> on bare metal yet and the drm and randr methods fail in qemu. Maybe
> someone can test it? Thanks?

Version 2 of the patch. lint is happy. Some recomended changes
included.. Tested locally.

I wanted to try the --rounds=3 option, but since it was already built I
was at a loss about how to make it run a few rounds..

Flo

-- 
https://fps.io

[-- Attachment #2: 0001-gnu-Add-redshift.patch --]
[-- Type: text/plain, Size: 2024 bytes --]

From f35546e7679e39f5f9cd790c1a9cb27e7b7825b1 Mon Sep 17 00:00:00 2001
From: Florian Paul Schmidt <mista.tapas@gmx.net>
Date: Thu, 10 Dec 2015 08:57:57 +0100
Subject: [PATCH] gnu: Add redshift

* gnu/packages/xdisorg.scm (redshift): New variable.
---
 gnu/packages/xdisorg.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4b5308c..798e6ff 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -655,3 +655,40 @@ use it as well.")
      "The xf86-input-wacom driver is the wacom-specific X11 input driver for
 the X.Org X Server version 1.7 and later (X11R7.5 or later).")
     (license license:x11)))
+
+(define-public redshift
+  (package
+    (name "redshift")
+    (version "1.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://github.com/jonls/redshift/"
+                       "releases/download/v" version
+                       "/redshift-" version ".tar.xz"))
+       (sha256
+        (base32
+         "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("libdrm" ,libdrm)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("libxxf86vm", libxxf86vm)
+       ("geoclue" ,geoclue)))
+    (home-page "https://github.com/jonls/redshift")
+    (synopsis
+     "Adjusts your screen's color temperature
+according to your surroundings")
+    (description
+     "Redshift adjusts the color temperature according to the
+position of the sun.  A different color temperature is set during night and
+daytime.  During twilight and early morning, the color temperature transitions
+smoothly from night to daytime temperature to allow your eyes to slowly
+adapt.  At night the color temperature should be set to match the lamps in your
+room.")
+    (license license:gpl3+)))
-- 
2.6.3

Re: [PATCH, WIP, v2] new variable: redshift

[Ludovic Courtès]

Florian Paul Schmidt <mista.tapas@gmx.net> skribis:

> I wanted to try the --rounds=3 option, but since it was already built I
> was at a loss about how to make it run a few rounds..

‘--check’ can be used in that case.  I did --rounds=3 though and it
passes.  :-)

> From f35546e7679e39f5f9cd790c1a9cb27e7b7825b1 Mon Sep 17 00:00:00 2001
> From: Florian Paul Schmidt <mista.tapas@gmx.net>
> Date: Thu, 10 Dec 2015 08:57:57 +0100
> Subject: [PATCH] gnu: Add redshift
>
> * gnu/packages/xdisorg.scm (redshift): New variable.

[...]

> +       ("geoclue" ,geoclue)))

This doesn’t work; instead one has to pass GLib to get Geoclue2 support,
which is what I did.

However, I found out that Geoclue2 seems to be broken on GuixSD:

--8<---------------cut here---------------start------------->8---
Dec 14 00:28:39 localhost dbus[435]: [system] Activating service name='org.freedesktop.GeoClue2' (using servicehelper)
Dec 14 00:28:39 localhost dbus[435]: [system] Successfully activated service 'org.freedesktop.GeoClue2'
Dec 14 00:28:39 localhost dbus[435]: [system] Rejected send message, 1 matched rules; type="method_call", sender=":1.74" (uid=993 pid=24166 comm="/gnu/store/sidpj3m8aarbvhflzvhgmp43gkmcx55z-geoclu") interface="org.freedesktop.DBus.Properties" member="GetAll" error name="(unset)" requested_reply="0" destination="org.freedesktop.DBus" (bus)
--8<---------------cut here---------------end--------------->8---

Ideas?

In the meantime, one can work around it by using:

  redshift -l LATITUDE:LONGITUDE

> +    (synopsis
> +     "Adjusts your screen's color temperature
> +according to your surroundings")

I’ve made this one line and slightly shorter…

> +    (description
> +     "Redshift adjusts the color temperature according to the
> +position of the sun.  A different color temperature is set during night and
> +daytime.  During twilight and early morning, the color temperature transitions
> +smoothly from night to daytime temperature to allow your eyes to slowly
> +adapt.  At night the color temperature should be set to match the lamps in your
> +room.")

… and reflowed this paragraph.

I also added a copyright line for you, and pushed.

Thanks!

Ludo’.