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

Merge staging-next into staging

parents 47e57e29 97013232

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

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ In addition to numerous new and upgraded packages, this release has the followin 
  - `services.openssh.ciphers` to `services.openssh.settings.Ciphers`

  - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`



- `netbox` was updated to 3.4. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's [breaking changes](https://github.com/netbox-community/netbox/releases/tag/v3.4.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.

- `netbox` was updated to 3.5. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's breaking changes [for 3.4.0](https://github.com/netbox-community/netbox/releases/tag/v3.4.0) and [for 3.5.0](https://github.com/netbox-community/netbox/releases/tag/v3.5.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.



- `services.netbox` now support RFC42-style options, through `services.netbox.settings`.

pkgs/applications/misc/flowtime/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


stdenv.mkDerivation rec {

  pname = "flowtime";

  version = "3.0";

  version = "3.1";



  src = fetchFromGitHub {

    owner = "Diego-Ivan";

    repo = "Flowtime";

    rev = "v${version}";

    hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I=";

    hash = "sha256-aXGdHFj9P8+33VuR8YBi+YYN/vBn94drmtKzNDc4SAY=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/jetbrains-toolbox/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
}:

let

  pname = "jetbrains-toolbox";

  version = "1.27.3.14493";

  version = "1.28.0.15158";



  src = fetchzip {

    url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";

    sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";

    sha256 = "sha256-IHs3tQtFXGS9xa5lKwSEWvp8aNffrCjNcoVE4tGX9ak=";

    stripRoot = false;

  };

pkgs/applications/networking/cluster/kn/default.nix

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


buildGoModule rec {

  pname = "kn";

  version = "1.7.0";

  version = "1.10.0";



  src = fetchFromGitHub {

    owner = "knative";

    repo = "client";

    rev = "knative-v${version}";

    sha256 = "sha256-rcjAdujiK6urn14eG27Lnq/6g+O0n2KmrL7k8A5ONjg=";

    sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0=";

  };



  vendorSha256 = null;

  vendorHash = null;



  subPackages = [ "cmd/kn" ];

pkgs/applications/networking/cluster/rke/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "rke";

  version = "1.4.4";

  version = "1.4.5";



  src = fetchFromGitHub {

    owner = "rancher";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-2qqEpH3Lkd7Ok+KBcRpRWiaUp0kN6j0YGURsX/qe3No=";

    hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";

  };



  vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";