Skip to content

Commit 96a43aa

Browse files
xen: 4.20.1 -> 4.20.2 (NixOS#461356)
2 parents 2feff92 + 69e3980 commit 96a43aa

1 file changed

Lines changed: 7 additions & 46 deletions

File tree

pkgs/by-name/xe/xen/package.nix

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
lib,
33
stdenv,
44
testers,
5-
fetchgit,
5+
fetchFromGitHub,
66
fetchpatch,
77
replaceVars,
88

@@ -173,7 +173,7 @@ in
173173

174174
stdenv.mkDerivation (finalAttrs: {
175175
pname = "xen";
176-
version = "4.20.1";
176+
version = "4.20.2";
177177

178178
# This attribute can be overriden to correct the file paths in
179179
# `passthru` when building an unstable Xen.
@@ -191,46 +191,6 @@ stdenv.mkDerivation (finalAttrs: {
191191
url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1";
192192
hash = "sha256-LH+68kxH/gxdyh45kYCPxKwk+9cztLrScpC2pCNQV2M=";
193193
})
194-
195-
# XSA 472
196-
(fetchpatch {
197-
url = "https://xenbits.xen.org/xsa/xsa472-1.patch";
198-
hash = "sha256-6k/X7KFno9uBG0mUtJxl7TMavaRs2Xlj9JlW9ai6p0k=";
199-
})
200-
(fetchpatch {
201-
url = "https://xenbits.xen.org/xsa/xsa472-2.patch";
202-
hash = "sha256-BisdztU9Wa5nIGmHo4IikqYPHdEhBehHaNqj1IuBe6I=";
203-
})
204-
(fetchpatch {
205-
url = "https://xenbits.xen.org/xsa/xsa472-3.patch";
206-
hash = "sha256-rikOofQeuLNMBkdQS3xzmwh7BlgMOTMSsQcAOEzNOso=";
207-
})
208-
209-
# XSA 473
210-
(fetchpatch {
211-
url = "https://xenbits.xen.org/xsa/xsa473-1.patch";
212-
hash = "sha256-594tTalWcGJSLj3++4QB/ADkHH1qJNrdvg7FG6kOuB8=";
213-
})
214-
(fetchpatch {
215-
url = "https://xenbits.xen.org/xsa/xsa473-2.patch";
216-
hash = "sha256-tGuIGxJFBXbckIruSUeTyrM6GabdIj6Pr3cVxeDvNNY=";
217-
})
218-
219-
# XSA 475
220-
(fetchpatch {
221-
url = "https://xenbits.xen.org/xsa/xsa475-1.patch";
222-
hash = "sha256-Bzvtr12g+7+M9jY9Nt2jd41CwYTL+h2fuwzJFsxroio=";
223-
})
224-
(fetchpatch {
225-
url = "https://xenbits.xen.org/xsa/xsa475-2.patch";
226-
hash = "sha256-7MKtDAJpihpfcBK+hyBFGCP6gHWs2cdgTks8B439b2s=";
227-
})
228-
229-
# XSA 476
230-
(fetchpatch {
231-
url = "https://xenbits.xen.org/xsa/xsa476-4.20.patch";
232-
hash = "sha256-nZUHcMr9RpQqrazG+RtTw+/s1gzqN1D565RuQjuALTQ=";
233-
})
234194
];
235195

236196
outputs = [
@@ -241,10 +201,11 @@ stdenv.mkDerivation (finalAttrs: {
241201
"boot"
242202
];
243203

244-
src = fetchgit {
245-
url = "https://xenbits.xenproject.org/git-http/xen.git";
246-
rev = "08f043965a7b1047aabd6d81da6b031465f2d797";
247-
hash = "sha256-a4dIJBY5aeznXPoI8nSipMgimmww7ejoQ1GE28Gq13o=";
204+
src = fetchFromGitHub {
205+
owner = "xen-project";
206+
repo = "xen";
207+
tag = "RELEASE-4.20.2";
208+
hash = "sha256-ZDPjsEAEH5bW0156MVvOKUeqg+mwdce0GFdUTBH39Qc=";
248209
};
249210

250211
strictDeps = true;

0 commit comments

Comments
 (0)