Unverified Commit bf19e213 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents da9874f9 c5aabbdf

lib/systems/examples.nix

+4 −4
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ rec { 
    config = "mipsel-unknown-linux-gnu";

  } // platforms.fuloong2f_n32;



  loongarch64-linux = {

    config = "loongarch64-unknown-linux-gnu";

  };



  # can execute on 32bit chip

  mips-linux-gnu                = { config = "mips-unknown-linux-gnu";                } // platforms.gcc_mips32r2_o32;

  mipsel-linux-gnu              = { config = "mipsel-unknown-linux-gnu";              } // platforms.gcc_mips32r2_o32;
@@ -139,6 +135,10 @@ rec { 
    libc = "newlib";

  };



  loongarch64-linux = {

    config = "loongarch64-unknown-linux-gnu";

  };



  mmix = {

    config = "mmix-unknown-mmixware";

    libc = "newlib";

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -5866,6 +5866,12 @@ 
      fingerprint = "7FC7 98AB 390E 1646 ED4D  8F1F 797F 6238 68CD 00C2";

    }];

  };

  greg = {

    email = "greg.hellings@gmail.com";

    github = "greg-hellings";

    githubId = 273582;

    name = "greg";

  };

  greizgh = {

    email = "greizgh@ephax.org";

    github = "greizgh";

nixos/modules/system/boot/loader/grub/install-grub.pl

+19 −13
Original line number Diff line number Diff line
@@ -34,23 +34,29 @@ sub getList { 
}



sub readFile {

    my ($fn) = @_; local $/ = undef;

    open FILE, "<$fn" or return undef; my $s = <FILE>; close FILE;

    local $/ = "\n"; chomp $s; return $s;

    my ($fn) = @_;

    # enable slurp mode: read entire file in one go

    local $/ = undef;

    open my $fh, "<$fn" or return undef;

    my $s = <$fh>;

    close $fh;

    # disable slurp mode

    local $/ = "\n";

    chomp $s;

    return $s;

}



sub writeFile {

    my ($fn, $s) = @_;

    open FILE, ">$fn" or die "cannot create $fn: $!\n";

    print FILE $s or die;

    close FILE or die;

    open my $fh, ">$fn" or die "cannot create $fn: $!\n";

    print $fh $s or die "cannot write to $fn: $!\n";

    close $fh or die "cannot close $fn: $!\n";

}



sub runCommand {

    my ($cmd) = @_;

    open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n";

    my @ret = <FILE>;

    close FILE;

    open(my $fh, "-|", @_) or die "Failed to execute: $@_\n";

    my @ret = $fh->getlines();

    close $fh;

    return ($?, @ret);

}
@@ -200,7 +206,7 @@ sub GrubFs { 
                $search = $types{$fsIdentifier} . ' ';



                # Based on the type pull in the identifier from the system

                my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");

                my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]});

                if ($status != 0) {

                    die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";

                }
@@ -213,7 +219,7 @@ sub GrubFs { 


            # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes

            if ($fs->type eq 'btrfs') {

                my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}");

                my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]});

                if ($status != 0) {

                    die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";

                }
@@ -221,7 +227,7 @@ sub GrubFs { 
                if ($#ids > 0) {

                    die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"

                } elsif ($#ids == 0) {

                    my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}");

                    my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]});

                    if ($status != 0) {

                        die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";

                    }

nixos/tests/installer.nix

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ let 
            (docbook-xsl-ns.override {

              withManOptDedupPatch = true;

            })

            kbd.dev

            kmod.dev

            libarchive.dev

            libxml2.bin

pkgs/applications/audio/go-musicfox/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, pkg-config

, alsa-lib

, flac

, nix-update-script

}:



buildGoModule rec {
@@ -38,6 +39,8 @@ buildGoModule rec { 
    flac

  ];



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    description = "Terminal netease cloud music client written in Go";

    homepage = "https://github.com/anhoder/go-musicfox";