diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-02 06:02:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 06:02:34 +0000 |
| commit | 0f0010fda33b7082197495df475d02f64d7e5050 (patch) | |
| tree | deee10eaf5f1b24afc73804ae70aec24e6fcf2ce /pkgs/os-specific/linux | |
| parent | ad090ff8671dcb957c0bafef4eba9d527d90d957 (diff) | |
| parent | d2042f91c1ad953825556be3ec2e53cf9a91fc77 (diff) | |
| download | nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar.gz nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar.bz2 nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar.lz nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar.xz nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.tar.zst nixpkgs-0f0010fda33b7082197495df475d02f64d7e5050.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/libtraceevent/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libtracefs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powercap/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 7fc577d0ab0..c81949bf39a 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.6.1"; + version = "1.6.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0="; + sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; # Don't build and install html documentation diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index c4bec662987..3a973b9880d 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s="; + sha256 = "sha256-CmFzonPq91iLflolJaucpPWzb8MCgfuov/OQ6KUD3f4="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/os-specific/linux/powercap/default.nix index 24832e5fdff..96ec83852d9 100644 --- a/pkgs/os-specific/linux/powercap/default.nix +++ b/pkgs/os-specific/linux/powercap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powercap"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "powercap"; repo = "powercap"; rev = "v${version}"; - sha256 = "sha256-VvepbABc7daRE0/sJqsCb+m2my8O3B1ICXywBqsjSO8="; + sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA="; }; nativeBuildInputs = [ cmake ]; |