From e8776d9a5f1bdc153080c5bcac6f7ce53f3477e0 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 10 Nov 2018 20:11:54 +0100 Subject: smem: 1.4 -> 1.5 Now compatible with Python3 --- pkgs/os-specific/linux/smem/default.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index ede8d425f12..de12b3719af 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -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 ]; -- cgit 1.4.1