summary refs log tree commit diff
path: root/pkgs/os-specific/linux/iproute
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-26 08:17:14 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-26 08:19:17 +0100
commit336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 (patch)
tree8812d7fef1d0ed89d4507279511f35e2c050097c /pkgs/os-specific/linux/iproute
parent309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff)
downloadnixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.gz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.bz2
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.lz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.xz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.zst
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.zip
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index a9fcf455ee4..b3de7ceedaa 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -5,19 +5,19 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg";
+    sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2";
   };
 
   preConfigure = ''
     # Don't try to create /var/lib/arpd:
     sed -e '/ARPDDIR/d' -i Makefile
-    # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out:
+    # TODO: Drop temporary version fix for 5.9 once 5.10 is out:
     substituteInPlace include/version.h \
-      --replace "v5.7.0-77-gb687d1067169" "5.8.0"
+      --replace "5.8.0" "${version}"
   '';
 
   outputs = [ "out" "dev" ];