public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: use fetchpatch for patch with the correct hash

Browse Source 
the fetchurl failed on hydra sometimes
This commit is contained in:
Robin Gloster 2017-09-02 17:38:35 +02:00 committed by John Ericson
parent b891d75e69
commit 61733ed6cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/systemd/default.nix
View File

@ -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 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
@ -76,9 +76,9 @@ stdenv.mkDerivation rec {
patches = [ patches = [
# TODO: Remove this patch when we have a systemd version # TODO: Remove this patch when we have a systemd version
# with https://github.com/systemd/systemd/pull/6678 # with https://github.com/systemd/systemd/pull/6678
(fetchurl { (fetchpatch {
url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch"; url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";
sha256 = "1y09n176f0389qrfrs3fsxj4hly1y1xfnb52rhbgj34704adp5m1"; sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";
}) })
]; ];