diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-09 18:41:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 18:41:27 +0000 |
| commit | fcbe48c79793e614092ba278e05d5594995a88e3 (patch) | |
| tree | 91c9cc085dbd2354fc4bb59c9b3e6a1a00313639 /pkgs/tools | |
| parent | 8ae8602bf7529fddeab29867329c21af96600a68 (diff) | |
| parent | 9d358f1f7cb833d60dacf8b52a516ec2a753c533 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/opentabletdriver/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix-update/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/inxi/default.nix | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 486cb50b7f39..dc527f47dd34 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -17,6 +17,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper +, nixosTests , wrapGAppsHook }: @@ -154,6 +155,10 @@ stdenv.mkDerivation rec { dontWrapGApps = true; dontStrip = true; + passthru.tests = { + otd-runs = nixosTests.opentabletdriver; + }; + meta = with lib; { description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/InfinityGhost/OpenTabletDriver"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 0a079c5107f9..5462393517b8 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.9"; + version = "4.10"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4"; + sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; }; postPatch = '' diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 4d9365677ab7..3c420a556523 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-0icQi1HClLMVDOugKckF2J8tEDeMfmW5kgCItJ9n2eo="; + sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 14b14fa9ffd1..5efdc5381747 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -3,7 +3,7 @@ , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode , file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools -, binutils, tree, upower +, binutils, tree, upower, pciutils , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -12,7 +12,7 @@ let "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod - lm_sensors smartmontools binutils tree upower + lm_sensors smartmontools binutils tree upower pciutils ]; recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms |