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

Commits on Nov 10, 2018

  1. smem: 1.4 -> 1.5 

    Now compatible with Python3
    @c0bw3b
    c0bw3b authored Nov 10, 2018
    Copy the full SHA
    e8776d9 View commit details

  2. Merge pull request #50206 from c0bw3b/pkg/smem 

    smem: 1.4 -> 1.5
    @Mic92
    Mic92 authored Nov 10, 2018
    Copy the full SHA
    e63da35 View commit details
Showing with 8 additions and 13 deletions.
  1. +8 −13 pkgs/os-specific/linux/smem/default.nix
21 changes: 8 additions & 13 deletions pkgs/os-specific/linux/smem/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
{ lib, stdenv, fetchurl, python }:

stdenv.mkDerivation rec {
name = "smem-1.4";
name = "smem-${version}";
version = "1.5";

src = fetchurl {
url = "https://www.selenic.com/smem/download/${name}.tar.gz";
sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f";
url = "https://selenic.com/repo/smem/archive/${version}.tar.bz2";
sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m";
};

buildInputs = [ python ];

buildPhase =
''
gcc -O2 smemcap.c -o smemcap
'';
makeFlags = [ "smemcap" ];

installPhase =
''
mkdir -p $out/bin
cp smem smemcap $out/bin/
mkdir -p $out/share/man/man8
cp smem.8 $out/share/man/man8/
install -Dm555 -t $out/bin/ smem smemcap
install -Dm444 -t $out/share/man/man8/ smem.8
'';

meta = {
homepage = http://www.selenic.com/smem/;
homepage = https://www.selenic.com/smem/;
description = "A memory usage reporting tool that takes shared memory into account";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.eelco ];