From fe890091efdc3a1ff8836e90412c2e7648454bb9 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 11 Mar 2023 02:17:36 -0500 Subject: [PATCH 1/2] railway: 2.1.0 -> 3.0.12 --- pkgs/development/tools/railway/default.nix | 26 +++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 43eb79c0e1a4..75d7630ca06d 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -1,27 +1,31 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices +, Security }: -buildGoModule rec { +rustPlatform.buildRustPackage rec { pname = "railway"; - version = "2.1.0"; + version = "3.0.12"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-JpIy8u6L7yOZgTFxFft+vhcat3uPT9EvOXAQOmrpvpc="; + hash = "sha256-2RdB/X62/9HKKax+Y+RYPrLEHsWwzOwzJ1Go930bYN0="; }; - ldflags = [ "-s" "-w" ]; + cargoHash = "sha256-Aozg/Pyo7JlTEXul3MEfGLwbRo/qjogWeAUHzK8xssc="; - vendorHash = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + nativeBuildInputs = [ pkg-config ]; - postInstall = '' - mv $out/bin/cli $out/bin/railway - ''; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + + OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = "Railway CLI"; - homepage = "https://railway.app"; + mainProgram = "railway"; + description = "Railway.app CLI"; + homepage = "https://github.com/railwayapp/cli"; + changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Crafter ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74a03dc791fb..8dfd71f3da30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11483,7 +11483,9 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - railway = callPackage ../development/tools/railway { }; + railway = callPackage ../development/tools/railway { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; quota = if stdenv.isLinux then linuxquota else unixtools.quota; From 0d5846492c862c558de5172012bd3a0dd7af9f11 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 11 Mar 2023 02:20:07 -0500 Subject: [PATCH 2/2] railway: add techknowlogick as maintainer --- pkgs/development/tools/railway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 75d7630ca06d..7cac6d50d66c 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/railwayapp/cli"; changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Crafter ]; + maintainers = with maintainers; [ Crafter techknowlogick ]; }; }