Merge master into staging-next

2020-06-08 12:06:12 +02:00
parent b59847b848 b56c66e7e8
commit dc33419285
125 changed files with 958 additions and 653 deletions
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "hactool";
  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "SciresM";
    repo = "hactool";
-    rev = "1.4.0";
+    rev = version;
    sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d";
  };