From 06415fe9b03fd6a9adb36bffc8cf0fb62c313692 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:37:45 +0000 Subject: [PATCH 1/2] stripe-cli: 1.5.12 -> 1.7.0 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 13620d164e67..d812cd4b294f 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.12"; + version = "1.7.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; + sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; }; - vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; + vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; subPackages = [ "cmd/stripe" From fdad7052146efeb0e99bcd14419771177af18ffd Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 29 Aug 2021 11:20:13 +0200 Subject: [PATCH 2/2] abuild: init at 3.7.0 --- pkgs/development/tools/abuild/default.nix | 54 +++++++++++++++++++++++ pkgs/tools/admin/stripe-cli/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/abuild/default.nix diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix new file mode 100644 index 000000000000..144ec8be9d4e --- /dev/null +++ b/pkgs/development/tools/abuild/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, openssl +, zlib +, busybox +}: + +stdenv.mkDerivation rec { + pname = "abuild"; + version = "3.7.0"; + + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = pname; + rev = "v${version}"; + sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx"; + }; + + buildInputs = [ + openssl + zlib + busybox + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'chmod 4555' '#chmod 4555' + ''; + + makeFlags = [ + "prefix=${placeholder "out"}" + "CFLAGS=-Wno-error" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + description = "Alpine Linux build tools"; + homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ onny ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index d812cd4b294f..13620d164e67 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.0"; + version = "1.5.12"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; + sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; }; - vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; + vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; subPackages = [ "cmd/stripe" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3597b93ea47d..ec44a26d8f61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13169,6 +13169,8 @@ with pkgs; abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; + abuild = callPackage ../development/tools/abuild { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy {