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

Commits on Jan 28, 2018

  1. hwloc: 1.11.8 -> 1.11.9

    @fpletz
    fpletz committed Jan 28, 2018
    Copy the full SHA
    8417649 View commit details

  2. nixos/powerManagement: remove duplicate definition 

    When not set just use the kernel default. `nixos-generate-config` will pick
a reasonable default.

cc #34350
    @fpletz
    fpletz committed Jan 28, 2018
    Copy the full SHA
    36103e9 View commit details
Showing with 4 additions and 9 deletions.
  1. +0 −3 nixos/modules/config/power-management.nix
  2. +4 −6 pkgs/development/libraries/hwloc/default.nix
3 changes: 0 additions & 3 deletions nixos/modules/config/power-management.nix
View file
Original file line number Diff line number Diff line change
@@ -69,9 +69,6 @@ in

config = mkIf cfg.enable {

# Leftover for old setups, should be set by nixos-generate-config now
powerManagement.cpuFreqGovernor = mkOptionDefault "ondemand";

systemd.targets.post-resume = {
description = "Post-Resume Actions";
requires = [ "post-resume.service" ];
10 changes: 4 additions & 6 deletions pkgs/development/libraries/hwloc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,13 @@
with stdenv.lib;

stdenv.mkDerivation rec {
name = "hwloc-1.11.8";
name = "hwloc-1.11.9";

src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc";
sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr";
};

hardeningDisable = [ "format" ];

configureFlags = [
"--localstatedir=/var"
];
@@ -75,8 +73,8 @@ stdenv.mkDerivation rec {

# http://www.open-mpi.org/projects/hwloc/license.php
license = licenses.bsd3;
homepage = http://www.open-mpi.org/projects/hwloc/;
maintainers = [ ];
homepage = https://www.open-mpi.org/projects/hwloc/;
maintainers = with maintainers; [ fpletz ];
platforms = platforms.all;
};
}