Unverified Commit ec4d5b0a authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #315551 from anthonyroussel/update/goss 

goss,dgoss: 0.4.6 -> 0.4.7
parents 966c80ea 63674265

pkgs/by-name/dg/dgoss/package.nix

+15 −16
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, resholve

, bash

, coreutils

, goss

, which

{

  bash,

  coreutils,

  gnused,

  goss,

  lib,

  resholve,

  which,

}:



resholve.mkDerivation rec {

  pname = "dgoss";

  version = "0.4.6";



  src = fetchFromGitHub {

    owner = "goss-org";

    repo = "goss";

    rev = "refs/tags/v${version}";

    hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";

  };

  version = goss.version;

  src = goss.src;



  dontConfigure = true;

  dontBuild = true;
@@ -30,7 +25,11 @@ resholve.mkDerivation rec { 
    default = {

      scripts = [ "bin/dgoss" ];

      interpreter = "${bash}/bin/bash";

      inputs = [ coreutils which ];

      inputs = [

        coreutils

        gnused

        which

      ];

      keep = {

        "$CONTAINER_RUNTIME" = true;

      };

pkgs/by-name/go/goss/package.nix

+4 −6
Original line number Diff line number Diff line
@@ -14,25 +14,23 @@ 


buildGoModule rec {

  pname = "goss";



  # Don't forget to update dgoss to the same version.

  version = "0.4.6";

  version = "0.4.7";



  src = fetchFromGitHub {

    owner = "goss-org";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";

    hash = "sha256-KP0i+ePmkx43MdokVQO3CvTsdIFO7rCWLd8vJVC9Qf0=";

  };



  vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs=";

  vendorHash = "sha256-VLIDAlLO6COGDKDN12bYIBluFVgqPEmm8QRfSNPfLJY=";



  CGO_ENABLED = 0;



  ldflags = [

    "-s"

    "-w"

    "-X main.version=v${version}"

    "-X github.com/goss-org/goss/util.Version=v${version}"

  ];



  nativeBuildInputs = [ makeWrapper ];