From 61733ed6ccde3427016720f2e0cd191d3d95152c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 2 Sep 2017 17:38:35 +0200 Subject: [PATCH] systemd: use fetchpatch for patch with the correct hash the fetchurl failed on hydra sometimes --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 06e7204f45a2..fdd5ada19cba 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp @@ -76,9 +76,9 @@ stdenv.mkDerivation rec { patches = [ # TODO: Remove this patch when we have a systemd version # with https://github.com/systemd/systemd/pull/6678 - (fetchurl { + (fetchpatch { url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch"; - sha256 = "1y09n176f0389qrfrs3fsxj4hly1y1xfnb52rhbgj34704adp5m1"; + sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8"; }) ];