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: 5f6ba36fd289
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a74e7092b076
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 9, 2020

  1. thermald: also install thermal-conf.xml into $out 

    Otherwise you get errors like this when running `thermald.service` from
the `services.thermald` module:

```
[WARN]22 CPUID levels; family:model:stepping 0x6:8e:a (6:142:10)
[WARN]Polling mode is enabled: 4
[WARN]sensor id 10 : No temp sysfs for reading raw temp
I/O warning : failed to load external entity "/nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml"
[WARN]error: could not parse file /nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml
[WARN]sysfs open failed
I/O warning : failed to load external entity "/nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml"
[WARN]error: could not parse file /nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml
I/O warning : failed to load external entity "/nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml"
[WARN]error: could not parse file /nix/store/7d7cfc1949g7n7ywx47a0dsfz3b3rix5-thermald-1.9.1/etc/thermald/thermal-conf.xml
```

(cherry picked from commit 9fc8856)
    @Ma27
    Ma27 committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5f33f33 View commit details

  2. gitAndTools.tig: 2.5.0 -> 2.5.1 

    https://github.com/jonas/tig/releases/tag/tig-2.5.1
(cherry picked from commit a3eaf6c)
    @Ma27
    Ma27 committed Apr 9, 2020
    Copy the full SHA
    a74e709 View commit details
Showing with 8 additions and 12 deletions.
  1. +3 −11 pkgs/applications/version-management/git-and-tools/tig/default.nix
  2. +5 −1 pkgs/tools/system/thermald/default.nix
14 changes: 3 additions & 11 deletions pkgs/applications/version-management/git-and-tools/tig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, fetchpatch
{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
}:

stdenv.mkDerivation rec {
pname = "tig";
version = "2.5.0";
version = "2.5.1";

src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf";
sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b";
};

nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
@@ -25,14 +25,6 @@ stdenv.mkDerivation rec {
rm -f contrib/config.make-*
'';

patches = [
# Fix memory leak. Remove with the next release
(fetchpatch {
url = "https://github.com/jonas/tig/commit/6202c6032f17438a2facb23f02e330b9d0566d9d.patch";
sha256 = "15zn8hw9y7bqa1np4mj0qnm2z86nif7qwh7wc4vgy2rwxdil85bd";
})
];

enableParallelBuilding = true;

installPhase = ''
6 changes: 5 additions & 1 deletion pkgs/tools/system/thermald/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
];
];

postInstall = ''
cp ./data/thermal-conf.xml $out/etc/thermald/
'';

meta = with stdenv.lib; {
description = "Thermal Daemon";