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: 688d1fa4073b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d449e60555f0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 5, 2020

  1. hwloc: 2.1.0 -> 2.2.0

    @r-ryantm
    r-ryantm committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    174f61b View commit details

Commits on Apr 6, 2020

  1. Merge pull request #84396 from r-ryantm/auto-update/hwloc 

    hwloc: 2.1.0 -> 2.2.0
    @markuskowa
    markuskowa authored Apr 6, 2020

    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
    d449e60 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/hwloc/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/hwloc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with stdenv.lib;

let
version = "2.1.0";
version = "2.2.0";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";

@@ -16,7 +16,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
sha256 = "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr";
sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f";
};

configureFlags = [
@@ -80,7 +80,7 @@ in stdenv.mkDerivation {

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