From ff3b8efe4f80607c57cc7fdd69046e1899a46d4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Apr 2019 23:04:34 -0700 Subject: tlp: 1.1 -> 1.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tlp/versions --- pkgs/tools/misc/tlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 39d3ea1c2086..4a8193ba68bb 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "01bhb9hdsck1g2s5jvafr3ywml9k2qz7x2cf42a3z8g5d23pdfpy"; + sha256 = "1msldl6y8fpvxa9p87lv3hvgxwk2vpiahqmapq485ihdjkshc558"; }; makeFlags = [ "DESTDIR=$(out)" -- cgit 1.4.1 From 88aad172ab150b9f0de0c92332e2c3920e66fe98 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 3 Apr 2019 03:11:20 -0400 Subject: tlp: cleanup makeFlags * TLP_TLIP should be share/tlp * set TLP_FLIB * use placeholder --- pkgs/tools/misc/tlp/default.nix | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 4a8193ba68bb..e9743153b773 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -17,25 +17,28 @@ in stdenv.mkDerivation rec { version = "1.2.1"; src = fetchFromGitHub { - owner = "linrunner"; - repo = "TLP"; - rev = "${version}"; - sha256 = "1msldl6y8fpvxa9p87lv3hvgxwk2vpiahqmapq485ihdjkshc558"; - }; + owner = "linrunner"; + repo = "TLP"; + rev = version; + sha256 = "1msldl6y8fpvxa9p87lv3hvgxwk2vpiahqmapq485ihdjkshc558"; + }; + + outRef = placeholder "out"; - makeFlags = [ "DESTDIR=$(out)" - "TLP_SBIN=$(out)/bin" - "TLP_BIN=$(out)/bin" - "TLP_TLIB=$(out)/share/tlp-pm" - "TLP_PLIB=$(out)/lib/pm-utils" - "TLP_ULIB=$(out)/lib/udev" - "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d" - "TLP_SHCPL=$(out)/share/bash-completion/completions" - "TLP_MAN=$(out)/share/man" + makeFlags = [ + "DESTDIR=${outRef}" + "TLP_SBIN=${outRef}/bin" + "TLP_BIN=${outRef}/bin" + "TLP_TLIB=${outRef}/share/tlp" + "TLP_FLIB=${outRef}/share/tlp/func.d" + "TLP_ULIB=${outRef}/lib/udev" + "TLP_NMDSP=${outRef}/etc/NetworkManager/dispatcher.d" + "TLP_SHCPL=${outRef}/share/bash-completion/completions" + "TLP_MAN=${outRef}/share/man" + "TLP_META=${outRef}/share/metainfo" - "TLP_NO_INIT=1" - "TLP_NO_PMUTILS=1" - ]; + "TLP_NO_INIT=1" + ]; nativeBuildInputs = [ makeWrapper file ]; -- cgit 1.4.1 From c1c03ae211da631ee1786fb8ae95ab50864449aa Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 3 Apr 2019 03:11:41 -0400 Subject: tlp: enable tests --- pkgs/tools/misc/tlp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index e9743153b773..2cdb8aff472e 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill , hdparm, ethtool, inetutils , kmod, pciutils, smartmontools , x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux +, checkbashisms, shellcheck , enableRDW ? false, networkmanager }: @@ -46,6 +47,14 @@ in stdenv.mkDerivation rec { installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + checkInputs = [ + checkbashisms + shellcheck + ]; + + doCheck = true; + checkTarget = [ "checkall" ]; + postInstall = '' cp -r $out/$out/* $out rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) -- cgit 1.4.1