diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-05-05 17:31:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-05-05 17:31:58 +0200 |
| commit | 93947b281226d5d89a39073b10caaf6c906070aa (patch) | |
| tree | d55f8944fd90a3dd0d86e0f495f3d0bbdf795060 /pkgs/tools/misc/ethtool/default.nix | |
| parent | 5dc079ed333c755fe000f2b86e97bf11f6f069a4 (diff) | |
| parent | 100509c030faf7cca1582c5a7197b8d3a815d600 (diff) | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/tools/misc/ethtool/default.nix')
| -rw-r--r-- | pkgs/tools/misc/ethtool/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index eb1911170beb6..72590420e1a1f 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -9,23 +9,13 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.1"; + version = "6.7"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; + sha256 = "sha256-w65SawHOTY32x5SrFw3kpBBNER6o2Ns/H9fCX8uQVhk="; }; - patches = [ - # Patch that fixes build with musl libc - # NOTE remove on next release, since it is applied in upstream - (fetchpatch { - name = "Fix-build-with-musl-libc.patch"; - url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; - sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; |