Commit 8e3671e4 authored by JuliusFreudenberger's avatar JuliusFreudenberger Committed by github-actions[bot]
Browse files

teleport: move to by-name 

Make teleport built by the by-name structure in package.nix.
The versioned attributes are defined in their own package.nix
in by-name using overrides.
Also change reference in ci/OWNERS

(cherry picked from commit a01b51d0)
parent e302c1fb

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ pkgs/development/interpreters/lfe/ @NixOS/beam 
pkgs/by-name/oc/octodns/ @anthonyroussel



# Teleport

pkgs/servers/teleport   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger

pkgs/by-name/te/teleport*   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger



# Warp-terminal

pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @donteatoreo @johnrtitor

pkgs/servers/teleport/generic.nix→pkgs/by-name/te/teleport/package.nix

+9 −9
Original line number Diff line number Diff line 
{

  lib,

  buildGoModule,

  buildGo123Module,

  rustPlatform,

  fetchFromGitHub,

  fetchpatch,
@@ -15,18 +15,18 @@ 
  rustc,

  stdenv,

  xdg-utils,

  wasm-bindgen-cli,

  wasm-bindgen-cli_0_2_95,

  wasm-pack,

  nixosTests,



  withRdpClient ? true,



  version,

  hash,

  vendorHash,

  version ? "17.4.8",

  hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=",

  vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=",

  extPatches ? [ ],

  cargoHash,

  pnpmHash,

  cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",

  pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=",

}:

let

  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
@@ -84,7 +84,7 @@ let 
      rustc

      rustc.llvmPackages.lld

      rustPlatform.cargoSetupHook

      wasm-bindgen-cli

      wasm-bindgen-cli_0_2_95

      wasm-pack

    ];
@@ -120,7 +120,7 @@ let 
    '';

  };

in

buildGoModule (finalAttrs: {

buildGo123Module (finalAttrs: {

  inherit pname src version;

  inherit vendorHash;

  proxyVendor = true;