Merge branch 'master' into staging-next

There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
parent bc238b8df5 f188bad6ea
commit 985d1ac425
111 changed files with 1767 additions and 1313 deletions
@@ -1,13 +1,13 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
  pname = "nixpkgs-fmt";
-  version = "0.2.0";
+  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0sa0263pkpi423f1rdyg90axw9sdmgj8ma1mza0v46qzkwynwgh3";
+    sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1";
  };

  cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa";