Unverified Commit fe3c344a authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 3257fe5d 20fea388

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -15156,6 +15156,13 @@ 
    githubId = 158568;

    name = "Matthias C. M. Troffaes";

  };

  mcparland = {

    email = "john@mcpar.land";

    github = "mcpar-land";

    githubId = 55669980;

    name = "John McParland";

    keys = [ { fingerprint = "39D2 171D D733 C718 DD21  285E B326 E14B 05D8 7A4E"; } ];

  };

  McSinyx = {

    email = "cnx@loang.net";

    github = "McSinyx";

pkgs/applications/version-management/git-recent/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation rec {

  pname = "git-recent";

  version = "1.1.1";

  version = "2.0.1";



  src = fetchFromGitHub {

    owner = "paulirish";

    repo = "git-recent";

    rev = "v${version}";

    sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";

    sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo=";

  };



  nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/ca/cargo-3ds/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,17 +6,17 @@ 
}:

rustPlatform.buildRustPackage rec {

  pname = "cargo-3ds";

  version = "0.1.3";

  version = "0.1.4";



  src = fetchFromGitHub {

    owner = "rust3ds";

    repo = "cargo-3ds";

    tag = "v${version}";

    hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90=";

    hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs=";

  cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA=";



  # Integration tests do not run in Nix build environment due to needing to

  # create and build Cargo workspaces.

pkgs/by-name/ca/cargo-hack/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 


rustPlatform.buildRustPackage rec {

  pname = "cargo-hack";

  version = "0.6.35";

  version = "0.6.36";



  src = fetchCrate {

    inherit pname version;

    hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI=";

    hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w=";

  cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4=";



  # some necessary files are absent in the crate version

  doCheck = false;

pkgs/by-name/gi/git-who/package.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  buildGoModule,

}:

buildGoModule rec {

  pname = "git-who";

  version = "0.6";



  src = fetchFromGitHub {

    owner = "sinclairtarget";

    repo = "git-who";

    rev = "v${version}";

    hash = "sha256-/MCvFmZNEVnSrSezTiwH3uWPbh/a7mVxmKduc63E3LA=";

  };



  vendorHash = "sha256-VdQw0mBCALeQfPMjQ4tp3DcLAzmHvW139/COIXSRT0s=";

  # some automated tests require submodule to clone and will fail.

  # see project readme

  doCheck = false;



  meta = {

    description = "Git blame for file trees";

    homepage = "https://github.com/sinclairtarget/git-who";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ mcparland ];

  };

}