nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 18:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #242282 from K900/unfuzzing

Browse Source 
grub: revert commit that broke reading (some) files on (some) XFS filesystems
This commit is contained in:
K900 2023-07-08 17:21:40 +03:00 committed by GitHub
commit cbeab8c046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/grub/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, runCommand, fetchFromSavannah, flex, bison, python3, autoconf, automake, libtool, bash { lib, stdenv, runCommand, fetchFromSavannah, fetchpatch, flex, bison, python3, autoconf, automake, libtool, bash
, rsync, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , rsync, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
, buildPackages , buildPackages
, nixosTests , nixosTests
@ -83,6 +83,14 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./fix-bash-completion.patch ./fix-bash-completion.patch
./add-hidden-menu-entries.patch ./add-hidden-menu-entries.patch
# Revert upstream commit that breaks reading XFS filesystems
# FIXME: remove when fixed upstream
(fetchpatch {
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ef7850c757fb3dd2462a512cfa0ff19c89fcc0b1";
revert = true;
hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y=";
})
]; ];
postPatch = if kbdcompSupport then '' postPatch = if kbdcompSupport then ''