Merge master into staging-next

2019-06-23 15:38:41 +02:00
parent 3e4b15f0c4 ba7e7aed08
commit dafee3d91a
99 changed files with 629 additions and 364 deletions
@@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "pstoedit-3.73";
+  name = "pstoedit-3.74";

  src = fetchurl {
    url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
-    sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd";
+    sha256 = "034rcrsi69vyh01rcqh7jy3bw4la4m6jl4niav4c6wrs9bx44cim";
  };

  #