Merge branch 'master' into add-missing-licenses

Conflicts: pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
parent 8915ed06b3 1d4de0d552
commit af8cd3c74e
279 changed files with 12381 additions and 9643 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "scdoc-${version}";
-  version = "1.3.4";
+  version = "1.4.1";

  src = fetchurl {
    url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz";
-    sha256 = "131f6sd4azpc988kwzlrc9c4x98abhfnxr5wpk7i427ha84g89yb";
+    sha256 = "14nabq1hrz5jvilx22yxbqjsd9s4ll0fnl750n1qbyyxw2m6vj9b";
  };

  postPatch = ''