Unverified Commit ed31b3c9 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #320375 from mweinelt/age-1.2.0

age: 1.1.1 -> 1.2.0
parents 175c0dc3 41c0c024
Loading
Loading
Loading
Loading
+4 −23
Original line number Diff line number Diff line
@@ -2,36 +2,16 @@

buildGoModule rec {
  pname = "age";
  version = "1.1.1";
  vendorHash = "sha256-MumPdRTz840+hoisJ7ADgBhyK3n8P6URobbRJYDFkDY=";
  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "FiloSottile";
    repo = "age";
    rev = "v${version}";
    sha256 = "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw=";
    hash = "sha256-O0NKDPvr+6ZupakPIpnGgDcdfG3nWR1pvVE+3KkYurY=";
  };

  # Worked with the upstream to change the way test vectors were sourced from
  # another repo at test run time, so we can run test without network access.
  # https://github.com/FiloSottile/age/pull/476
  #
  # Changes landed after v1.1.1, so we'll patch this one until next release.
  patches = [
    # Revert "all: temporarily disable testscript tests"
    (fetchpatch {
      name = "0001-revert-temporarily-disabled-testscript-tests.patch";
      url = "https://github.com/FiloSottile/age/commit/5471e05672de168766f5f11453fd324c53c264e5.patch";
      sha256 = "sha256-F3oDhRWJqqcF9MDDWPeO9V/wUGXkmUXY87wgokUIoOk=";
    })

    # age: depend on c2sp.org/CCTV/age for TestVectors
    (fetchpatch {
      name = "0002-depend-on-c2sp_cctv_age__TestVectors.patch";
      url = "https://github.com/FiloSottile/age/commit/edf7388f7731b274b055dcab3ec4006cc4961b68.patch";
      sha256 = "sha256-CloCj/uF3cqTeCfRkV6TeYiovuDQXm1ZIklREWAot1E=";
    })
  ];
  vendorHash = "sha256-5We4OYoexzzSF1AkxuGCUwuYJ3Wra+T6mCcT4XYgzhU=";

  ldflags = [
    "-s" "-w" "-X main.Version=${version}"
@@ -59,6 +39,7 @@ buildGoModule rec {
  ];

  meta = with lib; {
    changelog = "https://github.com/FiloSottile/age/releases/tag/v${version}";
    homepage = "https://age-encryption.org/";
    description = "Modern encryption tool with small explicit keys";
    license = licenses.bsd3;