Merge master into staging-next

2021-02-09 06:16:02 +00:00
parent e95bf38429 50d34017c2
commit 30dddce5e8
101 changed files with 477 additions and 686 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "samurai";
-  version = "1.1";
+  version = "1.2";

  src = fetchFromGitHub {
    owner = "michaelforney";
    repo = pname;
    rev = version;
-    sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz";
+    sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
  };

  makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];