Merge master into staging-next

2021-04-08 12:06:16 +00:00
parent 9f7f61b07f 5db7e33f1d
commit bf6abedefb
40 changed files with 508 additions and 310 deletions
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "cutter-1.04";
+  pname = "tcp-cutter";
+  version = "1.04";

  src = fetchurl {
-    url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz";
+    url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz";
    sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv";
  };