Skip to content

Commit 2cbbfdb

Browse files
committed
syslinux: migrate Arch Linux patches to new home
1 parent 204dc20 commit 2cbbfdb

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

pkgs/by-name/sy/syslinux/package.nix

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ stdenv.mkDerivation {
3434
url = "https://salsa.debian.org/images-team/syslinux/raw/" + commit + "/debian/patches/" + name;
3535
inherit name hash;
3636
};
37+
archlinuxCommit = "db7884ec80642781edeead3e3bbd883a15b9b3ce";
3738
fetchArchlinuxPatch =
38-
name: commit: hash:
39+
name: hash:
3940
fetchurl {
40-
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/" + commit + "/trunk/" + name;
41+
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/raw/${archlinuxCommit}/${name}";
4142
inherit name hash;
4243
};
4344
in
@@ -46,13 +47,8 @@ stdenv.mkDerivation {
4647
(fetchDebianPatch "0002-gfxboot-menu-label.patch" "fa1349f1"
4748
"sha256-0f6QhM4lJmGflLige4n7AZTodL7vnyAvi5dIedd/Lho="
4849
)
49-
(fetchArchlinuxPatch "0005-gnu-efi-version-compatibility.patch"
50-
"821c3da473d1399d930d5b4a086e46a4179eaa45"
51-
"sha256-hhCVnfbAFWj/R4yh60qsMB87ofW9RznarsByhl6L4tc="
52-
)
53-
(fetchArchlinuxPatch "0025-reproducible-build.patch" "821c3da473d1399d930d5b4a086e46a4179eaa45"
54-
"sha256-mnb291pCSFvDNxY7o4BosJ94ib3BpOGRQIiY8Q3jZmI="
55-
)
50+
(fetchArchlinuxPatch "0005-gnu-efi-version-compatibility.patch" "sha256-hhCVnfbAFWj/R4yh60qsMB87ofW9RznarsByhl6L4tc=")
51+
(fetchArchlinuxPatch "0025-reproducible-build.patch" "sha256-mnb291pCSFvDNxY7o4BosJ94ib3BpOGRQIiY8Q3jZmI=")
5652
(fetchDebianPatch
5753
# mbr.bin: too big (452 > 440)
5854
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414
@@ -73,11 +69,7 @@ stdenv.mkDerivation {
7369
./import-efisetjmp.patch
7470
# Upstream patch: https://www.syslinux.org/archives/2024-February/026903.html
7571
./define-wchar_t.patch
76-
(fetchpatch {
77-
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/raw/db7884ec80642781edeead3e3bbd883a15b9b3ce/0027-use-correct-type-for-size.patch";
78-
name = "0027-use-correct-type-for-size.patch";
79-
hash = "sha256-5nlKwIbXpZEyBrBSq9Zg0D+PRF7/kzEG13WzpwzDpPA=";
80-
})
72+
(fetchArchlinuxPatch "0027-use-correct-type-for-size.patch" "sha256-5nlKwIbXpZEyBrBSq9Zg0D+PRF7/kzEG13WzpwzDpPA=")
8173
# gnu-efi changed their definition to already be a 1-elem array, don't double-ref it.
8274
# https://github.com/ncroxon/gnu-efi/commit/5b74db0e154ffd2fba4bcc254069844f21913988
8375
./fix-longjmp-calls.patch

0 commit comments

Comments
 (0)