From 807940a3524861f54b936e8753d6210412344ae1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Jul 2019 16:56:30 -0500 Subject: [PATCH 1/2] powerstat: 0.02.18 -> 0.02.19 --- pkgs/os-specific/linux/powerstat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index d25ac0139b7..df5f08323c8 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.18"; + version = "0.02.19"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "1glryfmq9h7h8hsasg5ffl9vrcbjkkq3xqdxmbdhxmn137w7vgm5"; + sha256 = "0yh6l2mx5gfdgrfx406hxbi03c12cgi29pwlzgdfrpz6zs2icaw5"; }; - installFlags = [ "DESTDIR=$(out)" ]; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; postInstall = '' mv $out/usr/* $out rm -r $out/usr From e9c3787793b9ea8f782456016d64f9b1324664f0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 13 Jul 2019 12:14:05 -0400 Subject: [PATCH 2/2] powerstat: pname --- pkgs/os-specific/linux/powerstat/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index df5f08323c8..88134da46a1 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -1,17 +1,21 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "powerstat-${version}"; + pname = "powerstat"; version = "0.02.19"; + src = fetchurl { - url = "https://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; + url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; sha256 = "0yh6l2mx5gfdgrfx406hxbi03c12cgi29pwlzgdfrpz6zs2icaw5"; }; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + postInstall = '' mv $out/usr/* $out rm -r $out/usr ''; + meta = with lib; { description = "Laptop power measuring tool"; homepage = https://kernel.ubuntu.com/~cking/powerstat/;