diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-09 07:41:38 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-09 07:41:38 +0000 |
| commit | a448357dc62b26c95c3df84a156656e54aaf58b1 (patch) | |
| tree | f12d66a0b81f2fbaa70db89b516a66bddc1b838c /pkgs/os-specific/linux | |
| parent | 06fa8674984e8ab637a29b91bdaa11dc5cbacb80 (diff) | |
| parent | 0e07efa3c53b588dcd2efca8fafb35c779869d4e (diff) | |
| download | nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.gz nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.bz2 nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.lz nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.xz nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.tar.zst nixlib-a448357dc62b26c95c3df84a156656e54aaf58b1.zip | |
Merge branch 'master' into staging
* master: (71 commits) xen: enable parallel building spice: 0.13.3 -> 0.14.0 powerline-rs: 0.1.7 -> 0.1.8 (#41736) xidlehook: 0.4.6 -> 0.4.8 (#41094) serf: update scons patch, enable kerberos on darwin firefox-bin: Add ffmpeg to lib path firefox-beta-bin: 61.0b10 -> 61.0b12 firefox-devedition-bin: 61.0b10 -> 61.0b12 wireguard-go: assign yegortimoshenko as maintainer wireguard-go: 0.0.20180519 -> 0.0.20180531 zfs: Fix "zfs-sync" for modern systemd nixos/memcached: added simple set/get test jenkins: 2.89.4 -> 2.107.3 (#41618) focuswriter: 1.6.12 -> 1.6.13 (#41567) ne: 3.0.1 -> 3.1.1 (#41536) libpqxx: 6.2.3 -> 6.2.4 (#41547) mate.mate-applets: 1.20.1 -> 1.20.2 (#41546) mate.mate-themes: 3.22.16 -> 3.22.17 (#41541) nixos/munge: run munge as user munge instead of root. (#41509) pstoedit: 3.71 -> 3.73 (#41528) ...
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powerstat/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 413ac3efbe54..d4b3f374c5bc 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel, libelf }: +{ stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; }; - buildInputs = [ libelf ]; + buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 2d4d8f8266f7..5408c4237ec4 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.16"; + version = "0.02.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m"; + sha256 = "1lxzrvwlf6h35i0d8v1yj1ka63i9i0yvv3adhy3pa3fl8arpvycs"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' |