Unverified Commit fe965d2c authored by Felix Bargfeldt's avatar Felix Bargfeldt Committed by GitHub
Browse files

carapace-bridge 1.2.7 -> 1.2.9; carapace: 1.3.0 -> 1.3.1; modernize (#404674)

parents f8b96f9c e5509c8f

pkgs/by-name/ca/carapace-bridge/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 
  nix-update-script,

}:



buildGoModule rec {

buildGoModule (finalAttrs: {

  pname = "carapace-bridge";

  version = "1.2.7";

  version = "1.2.9";



  src = fetchFromGitHub {

    owner = "carapace-sh";

    repo = "carapace-bridge";

    tag = "v${version}";

    hash = "sha256-8i516GwXJFEB4VdvsV1KS0q2U9ZbpRBmZxqzTrzYlPk=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-Y69byUUDJJ+nJuZ6lcl+McFtJGYb5zgE8+QTbhoZ9Bc=";

  };



  # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the
@@ -36,9 +36,9 @@ buildGoModule rec { 
  meta = {

    description = "Multi-shell completion bridge for carapace";

    homepage = "https://carapace.sh/";

    changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${version}";

    changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${finalAttrs.version}";

    maintainers = with lib.maintainers; [ famfo ];

    license = lib.licenses.mit;

    mainProgram = "carapace-bridge";

  };

}
 
})

pkgs/shells/carapace/default.nix

+9 −7
Original line number Diff line number Diff line
@@ -4,25 +4,26 @@ 
  fetchFromGitHub,

  testers,

  carapace,

  nix-update-script,

}:



buildGoModule rec {

buildGoModule (finalAttrs: {

  pname = "carapace";

  version = "1.3.0";

  version = "1.3.1";



  src = fetchFromGitHub {

    owner = "carapace-sh";

    repo = "carapace-bin";

    rev = "v${version}";

    hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-VKc4JnezPdbgUIiSOnHIkUCLas//4TMIKiYd71EMamk=";

  };



  vendorHash = "sha256-+jOZ7EhMQZHvu4XToM7L1w2YCKCTOHKzZCOBsulLsH8=";

  vendorHash = "sha256-APJBCUdicKb81gY3ukhMHVgapDl+4tsMdNHEwZbarKE=";



  ldflags = [

    "-s"

    "-w"

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

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

  ];



  subPackages = [ "./cmd/carapace" ];
@@ -33,6 +34,7 @@ buildGoModule rec { 
    GOOS= GOARCH= go generate ./...

  '';



  passthru.updateScript = nix-update-script { };

  passthru.tests.version = testers.testVersion { package = carapace; };



  meta = with lib; {
@@ -42,4 +44,4 @@ buildGoModule rec { 
    license = licenses.mit;

    mainProgram = "carapace";

  };

}
 
})