Merge master into staging-next

2020-02-07 19:27:52 +01:00
parent 38cf6eac19 4506f4ae47
commit 30f0909e3a
101 changed files with 5975 additions and 5435 deletions
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "janet";
-  version = "1.6.0";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "janet-lang";
    repo = pname;
    rev = "v${version}";
-    sha256 = "044pqwbpdyn7afij68wxks8drb84kmj31c8ziqsfm5msi2al0rw2";
+    sha256 = "1z7r4ddgwxgxy1pp36p2wchcmzjqfyki3a4kicnr23ldflqv9ycc";
  };

  nativeBuildInputs = [ meson ninja ];