From 75a4bdc28c134a961fff11b7a4dfe309d63bf372 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 3 Feb 2021 11:18:43 -0500
Subject: [PATCH] licensor: "Fix" integration test for 2021

* Use latest version from master (as of 2021-02-03)
  * Apply patch from https://github.com/raftario/licensor/pull/28 that
    "fixes" the `license_and_name` test by bumping the year from 2020
    to 2021, until the test implementation can be properly addressed

  * This also includes a security update from
    https://github.com/raftario/licensor/pull/8

  * Instead of adding 2 more patches (one for the test fix, one for the
    security update), using the latest commit from master seems to make
    the most sense for now

  * remove fetchpatch from inputs
---
 pkgs/tools/misc/licensor/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index b7ea30f8d3f..ef708ab9afe 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -1,22 +1,17 @@
-{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "licensor";
-  version = "2.1.0";
+  version = "unstable-2021-02-03";
 
   src = fetchFromGitHub {
     owner = "raftario";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
+    rev = "1897882a708ec6ed65a9569ae0e07d6ea576c652";
+    sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch";
-    sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3";
-  })];
-
-  cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa";
+  cargoSha256 = "1yix40351yasg7mjmz7qwvwh1dq292dv47gy2a3bwkzhcn6whyjf";
 
   meta = with lib; {
     description = "Write licenses to stdout";