Unverified Commit 83f409d7 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 71e949e7 5be6db6b

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -20122,6 +20122,12 @@ 
    githubId = 69053978;

    name = "rogarb";

  };

  RoGreat = {

    email = "roguegreat@gmail.com";

    github = "RoGreat";

    githubId = 64620440;

    name = "RoGreat";

  };

  rohanssrao = {

    email = "rohanssrao@gmail.com";

    github = "rohanssrao";

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

+23 −22
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ use warnings; 
use Class::Struct;

use XML::LibXML;

use File::Basename;

use File::Path;

use File::Path qw(make_path);

use File::stat;

use File::Copy;

use File::Copy::Recursive qw(rcopy pathrm);
@@ -37,7 +37,8 @@ sub readFile { 
    my ($fn) = @_;

    # enable slurp mode: read entire file in one go

    local $/ = undef;

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

    open my $fh, "<", $fn

        or return;

    my $s = <$fh>;

    close $fh;

    # disable slurp mode
@@ -48,7 +49,7 @@ sub readFile { 


sub writeFile {

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

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

    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";

}
@@ -98,7 +99,7 @@ $ENV{'PATH'} = get("path"); 


print STDERR "updating GRUB 2 menu...\n";



mkpath("$bootPath/grub", 0, 0700);

make_path("$bootPath/grub", {  mode => 0700 });



# Discover whether the bootPath is on the same filesystem as / and

# /nix/store.  If not, then all kernels and initrds must be copied to
@@ -438,7 +439,7 @@ $conf .= "$extraConfig\n"; 
$conf .= "\n";



my %copied;

mkpath("$bootPath/kernels", 0, 0755) if $copyKernels;

make_path("$bootPath/kernels", { mode => 0755 }) if $copyKernels;



sub copyToKernelsDir {

    my ($path) = @_;
@@ -471,7 +472,7 @@ sub addEntry { 
        my $systemName = basename(Cwd::abs_path("$path"));

        my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets";



        mkpath(dirname($initrdSecretsPath), 0, 0755);

        make_path(dirname($initrdSecretsPath), { mode => 0755 });

        my $oldUmask = umask;

        # Make sure initrd is not world readable (won't work if /boot is FAT)

        umask 0137;
@@ -690,17 +691,17 @@ struct(GrubState => { 
# because it is read line-by-line.

sub readGrubState {

    my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () );

    open FILE, "<$bootPath/grub/state" or return $defaultGrubState;

    open my $fh, "<", "$bootPath/grub/state" or return $defaultGrubState;

    local $/ = "\n";

    my $name = <FILE>;

    my $name = <$fh>;

    chomp($name);

    my $version = <FILE>;

    my $version = <$fh>;

    chomp($version);

    my $efi = <FILE>;

    my $efi = <$fh>;

    chomp($efi);

    my $devices = <FILE>;

    my $devices = <$fh>;

    chomp($devices);

    my $efiMountPoint = <FILE>;

    my $efiMountPoint = <$fh>;

    chomp($efiMountPoint);

    # Historically, arguments in the state file were one per each line, but that

    # gets really messy when newlines are involved, structured arguments
@@ -708,7 +709,7 @@ sub readGrubState { 
    # when we need to remove a setting in the future. Thus, the 6th line is a JSON

    # object that can store structured data, with named keys, and all new state

    # should go in there.

    my $jsonStateLine = <FILE>;

    my $jsonStateLine = <$fh>;

    # For historical reasons we do not check the values above for un-definedness

    # (that is, when the state file has too few lines and EOF is reached),

    # because the above come from the first version of this logic and are thus
@@ -720,7 +721,7 @@ sub readGrubState { 
    }

    my %jsonState = %{decode_json($jsonStateLine)};

    my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : ();

    close FILE;

    close $fh;

    my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs );

    return $grubState

}
@@ -787,18 +788,18 @@ if ($requireNewInstall != 0) { 
    my $stateFile = "$bootPath/grub/state";

    my $stateFileTmp = $stateFile . ".tmp";



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

    print FILE get("fullName"), "\n" or die;

    print FILE get("fullVersion"), "\n" or die;

    print FILE $efiTarget, "\n" or die;

    print FILE join( ",", @deviceTargets ), "\n" or die;

    print FILE $efiSysMountPoint, "\n" or die;

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

    print $fh get("fullName"), "\n" or die;

    print $fh get("fullVersion"), "\n" or die;

    print $fh $efiTarget, "\n" or die;

    print $fh join( ",", @deviceTargets ), "\n" or die;

    print $fh $efiSysMountPoint, "\n" or die;

    my %jsonState = (

        extraGrubInstallArgs => \@extraGrubInstallArgs

    );

    my $jsonStateLine = encode_json(\%jsonState);

    print FILE $jsonStateLine, "\n" or die;

    close FILE or die;

    print $fh $jsonStateLine, "\n" or die;

    close $fh or die;



    # Atomically switch to the new state file

    rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n";

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json

+5 −5
Original line number Diff line number Diff line 
{

  "version": "2.61.28",

  "version": "2.63.32",

  "linux-x64": {

    "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=",

    "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=",

    "binaries": [

      ".debugger/createdump",

      ".debugger/vsdbg",
@@ -11,7 +11,7 @@ 
    ]

  },

  "linux-arm64": {

    "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=",

    "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=",

    "binaries": [

      ".debugger/createdump",

      ".debugger/vsdbg",
@@ -21,7 +21,7 @@ 
    ]

  },

  "darwin-x64": {

    "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=",

    "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=",

    "binaries": [

      ".debugger/x86_64/createdump",

      ".debugger/x86_64/vsdbg",
@@ -31,7 +31,7 @@ 
    ]

  },

  "darwin-arm64": {

    "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=",

    "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=",

    "binaries": [

      ".debugger/arm64/createdump",

      ".debugger/arm64/vsdbg",

pkgs/by-name/b3/b3sum/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 


rustPlatform.buildRustPackage rec {

  pname = "b3sum";

  version = "1.5.5";

  version = "1.6.0";



  src = fetchCrate {

    inherit version pname;

    hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE=";

    hash = "sha256-nsixj/zskHNIkv/qiD1DvrjeqkzVuN76tH+vCLGvPW8=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE=";

  cargoHash = "sha256-HAbL/3StlK+VlonoviB2hFxCj7oyG93ReUytE3pFOMQ=";



  meta = {

    description = "BLAKE3 cryptographic hash function";

pkgs/by-name/ci/civo/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


buildGoModule rec {

  pname = "civo";

  version = "1.1.95";

  version = "1.1.97";



  src = fetchFromGitHub {

    owner = "civo";

    repo = "cli";

    rev = "v${version}";

    hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw=";

    hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs=";

  };



  vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc=";

  vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ=";



  nativeBuildInputs = [ installShellFiles ];