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

Commits on Mar 2, 2017

  1. lkl: Broken on i686

    dezgeg committed Mar 2, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    ed0dd35 View commit details
  2. eztrace: add missing dependency

    (cherry picked from commit 83462da)
    rnhmjoj authored and dezgeg committed Mar 2, 2017
    Copy the full SHA
    78d80da View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/applications/virtualization/lkl/default.nix
  2. +2 −2 pkgs/development/tools/profiling/EZTrace/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/lkl/default.nix
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
platforms = platforms.linux; # Darwin probably works too but I haven't tested it
platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};
4 changes: 2 additions & 2 deletions pkgs/development/tools/profiling/EZTrace/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, libelf, gfortran, zlib, binutils }:
{ stdenv, fetchurl, autoconf, libelf, libiberty, gfortran, zlib, binutils }:

stdenv.mkDerivation rec {
version = "1.0.6";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
export ac_cv_func_malloc_0_nonnull=yes
'';

buildInputs = [ autoconf libelf gfortran zlib binutils ];
buildInputs = [ autoconf libelf libiberty gfortran zlib binutils ];

meta = {
description = "Tool that aims at generating automatically execution trace from HPC programs";