Merge branch 'master' into staging

Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
parent 98f2f08b4b 97e376bf9c
commit ad35019501
116 changed files with 1596 additions and 521 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "abcm2ps-${version}";
-  version = "8.13.21";
+  version = "8.13.22";

  src = fetchFromGitHub {
    owner = "leesavide";
    repo = "abcm2ps";
    rev = "v${version}";
-    sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1";
+    sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv";
  };

  prePatch = ''