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

Merge master into staging-next

parents 13d222c5 4441de75

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -5907,6 +5907,12 @@ 
    githubId = 2512008;

    name = "Even Brenden";

  };

  evey = {

    email = "nix@lubdub.nl";

    github = "lub-dub";

    githubId = 159288204;

    name = "evey";

  };

  evilmav = {

    email = "elenskiy.ilya@gmail.com";

    github = "evilmav";

nixos/modules/system/boot/uki.nix

+8 −8
Original line number Diff line number Diff line
@@ -51,16 +51,16 @@ in 
    else

      "nixos");



    boot.uki.settings = lib.mkOptionDefault {

    boot.uki.settings = {

      UKI = {

        Linux = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";

        Initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";

        Cmdline = "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}";

        Stub = "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub";

        Uname = "${config.boot.kernelPackages.kernel.modDirVersion}";

        OSRelease = "@${config.system.build.etc}/etc/os-release";

        Linux = lib.mkOptionDefault "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";

        Initrd = lib.mkOptionDefault "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";

        Cmdline = lib.mkOptionDefault "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}";

        Stub = lib.mkOptionDefault "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub";

        Uname = lib.mkOptionDefault "${config.boot.kernelPackages.kernel.modDirVersion}";

        OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release";

        # This is needed for cross compiling.

        EFIArch = efiArch;

        EFIArch = lib.mkOptionDefault efiArch;

      };

    };

pkgs/applications/blockchains/btcpayserver/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -6,19 +6,20 @@ 


buildDotnetModule rec {

  pname = "btcpayserver";

  version = "1.11.7";

  version = "1.12.5";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-6DhVsN8VZmQ1lU7imXInL1y4Fu+JFr4R1nFthMHrQQ8=";

    sha256 = "sha256-qlqwIVk8NzfFZlzShfm3nTZWovObWLIKiNGAOCN8i7Y=";

  };



  projectFile = "BTCPayServer/BTCPayServer.csproj";

  nugetDeps = ./deps.nix;



  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

  dotnet-sdk = dotnetCorePackages.sdk_8_0;

  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;



  buildType = if altcoinSupport then "Altcoins-Release" else "Release";

pkgs/applications/blockchains/btcpayserver/deps.nix

+104 −125

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/blockchains/nbxplorer/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -6,19 +6,20 @@ 


buildDotnetModule rec {

  pname = "nbxplorer";

  version = "2.3.66";

  version = "2.5.0";



  src = fetchFromGitHub {

    owner = "dgarage";

    repo = "NBXplorer";

    rev = "v${version}";

    sha256 = "sha256-DcSY2hnzJexsrRw4k57uOBfDkveEvXccN8GDUR/QmKw=";

    sha256 = "sha256-yhOPv8J1unDx61xPc8ktQbIfkp00PPXRlOgdGo2QkB4=";

  };



  projectFile = "NBXplorer/NBXplorer.csproj";

  nugetDeps = ./deps.nix;



  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

  dotnet-sdk = dotnetCorePackages.sdk_8_0;

  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;



  # macOS has a case-insensitive filesystem, so these two can be the same file

  postFixup = ''