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

Merge master into staging-next

parents aea14e9b 0f6bec72

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -21616,6 +21616,12 @@ 
    name = "Kostas Karachalios";

    githubId = 81346;

  };

  vringar = {

    email = "git@zabka.it";

    github = "vringar";

    name = "Stefan Zabka";

    githubId = 13276717;

  };

  vrthra = {

    email = "rahul@gopinath.org";

    github = "vrthra";

nixos/doc/manual/release-notes/rl-2405.section.md

+8 −0
Original line number Diff line number Diff line
@@ -555,6 +555,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `icu` no longer includes `install-sh` and `mkinstalldirs` in the shared folder.



- The `go-ethereum` package has been updated to v1.14.3. Geth v1.14.0 introduced a brand new live-tracing feature,

  which required a number of breaking internal API changes. If you had your own native tracers implemented before this change,

  the [changelog](https://github.com/ethereum/go-ethereum/blob/master/core/tracing/CHANGELOG.md) contains the necessary steps needed to update your old code for the new APIs.

  Geth v1.14.0 drops support for running pre-merge networks ([#29169](https://github.com/ethereum/go-ethereum/pull/29169)).

  It also stops automatically constructing the pending block ([#28623](https://github.com/ethereum/go-ethereum/pull/28623)),

  removes support for filtering pending logs, switched to using Go v1.22 by default (#28946), which means we've dropped support for Go v1.20.

  See [the 1.14.0 release notes](https://github.com/ethereum/go-ethereum/releases/tag/v1.14.0) for more details.



## Other Notable Changes {#sec-release-24.05-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/programs/screen.nix

+20 −17
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ in 
      package = lib.mkPackageOptionMD pkgs "screen" { };



      screenrc = lib.mkOption {

        type = with lib.types; nullOr lines;

        type = lib.types.lines;

        default = "";

        example = ''

          defscrollback 10000

          startup_message off
@@ -22,20 +23,22 @@ in 
    };

  };



  config = {

  config = lib.mkMerge [

    {

      # TODO: Added in 24.05, remove before 24.11

      assertions = [

        {

        assertion = cfg.screenrc != null -> cfg.enable;

          assertion = cfg.screenrc != "" -> cfg.enable;

          message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true";

        }

      ];

  } // lib.mkIf cfg.enable {

    }

    (lib.mkIf cfg.enable {

      environment.etc.screenrc = {

      enable = cfg.screenrc != null;

        text = cfg.screenrc;

      };

      environment.systemPackages = [ cfg.package ];

      security.pam.services.screen = {};

  };

    })

  ];

}

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

+6 −4
Original line number Diff line number Diff line
@@ -2,20 +2,21 @@ 
, buildGoModule

, fetchFromGitHub

, pkg-config

, alsa-lib

, flac

, stdenv

, alsa-lib

, nix-update-script

}:



buildGoModule rec {

  pname = "go-musicfox";

  version = "4.4.0";

  version = "4.4.1";



  src = fetchFromGitHub {

    owner = "go-musicfox";

    repo = "go-musicfox";

    rev = "v${version}";

    hash = "sha256-11N3dykuEDKAryieNVaPfb3G7E/a4A7Znx9rBvFTHC4=";

    hash = "sha256-pIfQ0ufn8W0opm+N6IPFBPWNxNWMOU7FudPtIFop51c=";

  };



  deleteVendor = true;
@@ -35,8 +36,9 @@ buildGoModule rec { 
  ];



  buildInputs = [

    alsa-lib

    flac

  ] ++ lib.optionals stdenv.isLinux [

    alsa-lib

  ];



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

pkgs/applications/blockchains/go-ethereum/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -9,16 +9,17 @@ let 


in buildGoModule rec {

  pname = "go-ethereum";

  version = "1.13.5";

  version = "1.14.3";



  src = fetchFromGitHub {

    owner = "ethereum";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-UbRsY9fSUYAwPcLfGGDHeqvSsLKUKR+2a93jH5xA9uQ=";

    sha256 = "sha256-h2i/q4gfvqO8SgFxjoIhm4y0icpt+qe0Tq+3W6Ld8KM=";

  };



  vendorHash = "sha256-dOvpOCMxxmcAaticSLVlro1L4crAVJWyvgx/JZZ7buE=";

  proxyVendor = true;

  vendorHash = "sha256-ugoRsxzJjPOS5yPhwqXhMPuThvyqCWvZD7PBnrkm0sQ=";



  doCheck = false;
@@ -32,12 +33,13 @@ in buildGoModule rec { 
  subPackages = [

    "cmd/abidump"

    "cmd/abigen"

    "cmd/blsync"

    "cmd/bootnode"

    "cmd/clef"

    "cmd/devp2p"

    "cmd/era"

    "cmd/ethkey"

    "cmd/evm"

    "cmd/faucet"

    "cmd/geth"

    "cmd/p2psim"

    "cmd/rlpdump"