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
base: 5f6ba36fd289
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Copy the full SHA
    5f33f33 View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history