Unverified Commit 3a60f9bf authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #258943 from techknowlogick/bump-teleport 

teleport_11: 11.3.10 -> 11.3.25, teleport_12: 12.4.7 -> 12.4.20, teleport_13: init at 13.4.1, teleport_14: init at 14.0.1
parents 05c36949 8de9bf91

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

+3 −0
Original line number Diff line number Diff line
@@ -418,3 +418,6 @@ The module update takes care of the new config syntax and the data itself (user 
  `virtualisation.fileSystems = lib.mkForce { };`.



- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`.



- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14).

pkgs/servers/teleport/11/default.nix

+10 −4
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ../generic.nix ({

  version = "11.3.10";

  hash = "sha256-h7G+VPVG+swBo0VHDIQiCDPhsK7MHfkF8/Bagh/KzCg=";

  vendorHash = "sha256-GB024L8c8YRNUySZEPB5HEXss1wcT1gUxM4wUoB4zpQ=";

  yarnHash = "sha256-6qaXHFMhlAhDo6drjUfvgQHgpMbeO8+Y1MZXVCHfelE=";

  version = "11.3.25";

  hash = "sha256-KIbRn90BUJp8Uc8GMHuIMMSn5tJQbxzE0ntngx1ELaE=";

  vendorHash = "sha256-hjMv/H4dlinlv3ku7i1km2/b+6uCdbznHtVOMIjDlUc=";

  yarnHash = "sha256-hip0WQVZpx2qfVDmEy4nk4UFYEjX1Xhj8HsIIQ8PF1Y=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-GJfUyiYQwcDTMqt+iik3mFI0f6mu13RJ2XuoDzlg9sU=";

    };

  };

  extPatches = [

    # https://github.com/NixOS/nixpkgs/issues/120738

    ../tsh.patch

    # https://github.com/NixOS/nixpkgs/issues/132652

    ../test.patch

  ];

} // builtins.removeAttrs args [ "callPackage" ])

pkgs/servers/teleport/12/default.nix

+10 −4
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ../generic.nix ({

  version = "12.4.7";

  hash = "sha256-Ut+IOLEfRNWmI0G4CPm76SEvhYdAbwtHDSsc+tcGDqA=";

  vendorHash = "sha256-GZmMjIyYNQ6dr8jvB9TjFjnK5iY5FFH/54Qhfp1/ZYY=";

  yarnHash = "sha256-bcozPAIWUWSiANEd98veBtWMvf1EfE6CCBxZhCHOQ7k=";

  version = "12.4.20";

  hash = "sha256-Qz+JOS4YPj2865Fkj7eVJMdilHMOGbTD179bQ5wHY7A=";

  vendorHash = "sha256-cS8ylLujgp9Is+D2JjoK4yGgWRCVRyRw3NPQAAuE2vY=";

  yarnHash = "sha256-tOdT7X8jM+tl1GZ7lBN2aW8KRiVW/zWK9fZIU7CSHVE=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";

    };

  };

  extPatches = [

    # https://github.com/NixOS/nixpkgs/issues/120738

    ../tsh.patch

    # https://github.com/NixOS/nixpkgs/issues/132652

    ../test.patch

  ];

} // builtins.removeAttrs args [ "callPackage" ])

pkgs/servers/teleport/13/Cargo.lock

0 → 100644
+1937 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/servers/teleport/13/default.nix

0 → 100644
+19 −0
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ../generic.nix ({

  version = "13.4.1";

  hash = "sha256-wgSaek4eq5Jx9SZFenvdRSU1wEtfJHzTz9GdczzUU2w=";

  vendorHash = "sha256-DesT18nV/SxOsKCC+Nt0hgtH7CRtRL0B5FQhE1J148I=";

  yarnHash = "sha256-iyMcP9L6dwBhN8JL9eSVEzsXI2EOjfyxjF9Dm4Gs04s=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";

    };

  };

  extPatches = [

    # https://github.com/NixOS/nixpkgs/issues/120738

    ../tsh.patch

    # https://github.com/NixOS/nixpkgs/issues/132652

    ../test.patch

  ];

} // builtins.removeAttrs args [ "callPackage" ])