From 595b703e43124c3f3ad3d78b2ba5038fb73e3354 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 5 Apr 2023 21:09:14 +0200 Subject: [PATCH 01/10] scalingo: init at 1.28.2 --- pkgs/development/tools/scalingo/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/scalingo/default.nix diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix new file mode 100644 index 000000000000..6188c1900653 --- /dev/null +++ b/pkgs/development/tools/scalingo/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "scalingo"; + version = "1.28.2"; + + src = fetchFromGitHub { + owner = "Scalingo"; + repo = "cli"; + rev = version; + sha256 = "sha256-dMiOGPQ2wodVdB43Sk3GfEFYIU/W2K9DG/4hhVxb1fs="; + }; + + doCheck = false; + + vendorHash = null; + + ldflags = [ + "-w" + "-s" + ]; + + DISABLE_UPDATE_CHECKER = "true"; + + meta = with lib; { + description = "Command Line client for Scalingo PaaS"; + homepage = "https://doc.scalingo.com/platform/cli/start"; + changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md#1282"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ cimm ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15d28c7f6fd1..155a3214e826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16200,6 +16200,8 @@ with pkgs; }; scalafmt = callPackage ../development/tools/scalafmt { }; + scalingo = callPackage ../development/tools/scalingo { }; + scryer-prolog = callPackage ../development/compilers/scryer-prolog { }; sdcc = callPackage ../development/compilers/sdcc { From 3935158cf3f43ac12d17ca889401875d15a764fc Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 29 Apr 2023 11:02:08 +0200 Subject: [PATCH 02/10] Run tests when building --- pkgs/development/tools/scalingo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index 6188c1900653..74e3a4944880 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -11,7 +11,9 @@ buildGoModule rec { sha256 = "sha256-dMiOGPQ2wodVdB43Sk3GfEFYIU/W2K9DG/4hhVxb1fs="; }; - doCheck = false; + preConfigure = '' + export HOME=$TMPDIR + ''; vendorHash = null; From 851287a149b70392a47fe02e8c1c1e198ff119ed Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 29 Apr 2023 22:00:08 +0200 Subject: [PATCH 03/10] Fix DISABLE_UPDATE_CHECKER environment variable --- pkgs/development/tools/scalingo/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index 74e3a4944880..e5da9352812d 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -5,16 +5,12 @@ buildGoModule rec { version = "1.28.2"; src = fetchFromGitHub { - owner = "Scalingo"; + owner = pname; repo = "cli"; rev = version; sha256 = "sha256-dMiOGPQ2wodVdB43Sk3GfEFYIU/W2K9DG/4hhVxb1fs="; }; - preConfigure = '' - export HOME=$TMPDIR - ''; - vendorHash = null; ldflags = [ @@ -22,7 +18,9 @@ buildGoModule rec { "-s" ]; - DISABLE_UPDATE_CHECKER = "true"; + preConfigure = '' + export HOME=$TMPDIR + ''; meta = with lib; { description = "Command Line client for Scalingo PaaS"; From bb1795a9ba2fab6757411567ea720faf4d1df091 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Fri, 2 Jun 2023 17:30:00 +0200 Subject: [PATCH 04/10] Remove anchor from changelog URL --- pkgs/development/tools/scalingo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index e5da9352812d..00cb872a17ed 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Command Line client for Scalingo PaaS"; homepage = "https://doc.scalingo.com/platform/cli/start"; - changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md#1282"; + changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md"; license = licenses.bsdOriginal; maintainers = with maintainers; [ cimm ]; platforms = with lib.platforms; unix; From d610e0094ebe2907e40f84187537033215ef488f Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 7 Jun 2023 16:28:46 +0200 Subject: [PATCH 05/10] scalingo: 1.28.2 -> 1.29.1 --- pkgs/development/tools/scalingo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index 00cb872a17ed..8e9d0f354487 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.28.2"; + version = "1.29.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - sha256 = "sha256-dMiOGPQ2wodVdB43Sk3GfEFYIU/W2K9DG/4hhVxb1fs="; + sha256 = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; }; vendorHash = null; From 7dc5b0d7462f2a9cdebfcf6e65904c4a879bbe39 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 25 Oct 2023 10:37:21 +0200 Subject: [PATCH 06/10] Fix typos in package description --- pkgs/development/tools/scalingo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index 8e9d0f354487..e3ca12c3f0b5 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Command Line client for Scalingo PaaS"; + description = "Command line client for the Scalingo PaaS"; homepage = "https://doc.scalingo.com/platform/cli/start"; changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md"; license = licenses.bsdOriginal; From 1a55bc4b9e23ce00578b7584ad4ad49e220172dc Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 25 Oct 2023 10:39:12 +0200 Subject: [PATCH 07/10] Remove ldflags --- pkgs/development/tools/scalingo/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index e3ca12c3f0b5..bf13e4c1f854 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -13,11 +13,6 @@ buildGoModule rec { vendorHash = null; - ldflags = [ - "-w" - "-s" - ]; - preConfigure = '' export HOME=$TMPDIR ''; From 51053a9a9be537c36a6be1078bbdb30f49638706 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 25 Oct 2023 10:44:19 +0200 Subject: [PATCH 08/10] Update notation --- pkgs/development/tools/scalingo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/development/tools/scalingo/default.nix index bf13e4c1f854..e5dc59a758fa 100644 --- a/pkgs/development/tools/scalingo/default.nix +++ b/pkgs/development/tools/scalingo/default.nix @@ -8,12 +8,12 @@ buildGoModule rec { owner = pname; repo = "cli"; rev = version; - sha256 = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; + hash = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; }; vendorHash = null; - preConfigure = '' + preCheck = '' export HOME=$TMPDIR ''; From cc298ebf7dfc1d3b33c13b60101449955d8346f1 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 25 Oct 2023 10:49:42 +0200 Subject: [PATCH 09/10] Use new packge location convention --- .../scalingo/default.nix => by-name/sc/scalingo/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/scalingo/default.nix => by-name/sc/scalingo/package.nix} (100%) diff --git a/pkgs/development/tools/scalingo/default.nix b/pkgs/by-name/sc/scalingo/package.nix similarity index 100% rename from pkgs/development/tools/scalingo/default.nix rename to pkgs/by-name/sc/scalingo/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fa331b8654d..7f2102cb2dba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17282,8 +17282,6 @@ with pkgs; }; scalafmt = callPackage ../development/tools/scalafmt { }; - scalingo = callPackage ../development/tools/scalingo { }; - scryer-prolog = callPackage ../development/compilers/scryer-prolog { }; sdcc = callPackage ../development/compilers/sdcc { From b7db60adcc1c3a93ab318a26b57fd3ab19f092ad Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Wed, 25 Oct 2023 11:09:31 +0200 Subject: [PATCH 10/10] Remove unused dists binary post install --- pkgs/by-name/sc/scalingo/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index e5dc59a758fa..3b5682846987 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -17,6 +17,10 @@ buildGoModule rec { export HOME=$TMPDIR ''; + postInstall = '' + rm $out/bin/dists + ''; + meta = with lib; { description = "Command line client for the Scalingo PaaS"; homepage = "https://doc.scalingo.com/platform/cli/start";