Merge master into staging-next

2020-04-22 17:20:20 +02:00
parent 23be4a8b4d 95f82e2a45
commit 8374a2a0ee
90 changed files with 2867 additions and 1360 deletions
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -6,7 +6,7 @@
  , fetchpatch

  , writeText
-
+  , nixosTests
  , useOperatingSystemEtc ? true

 }:
@@ -179,6 +179,7 @@ let

    passthru = {
      shellPath = "/bin/fish";
+      tests.nixos = nixosTests.fish;
    };
  };

--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, lib, fetchurl, fetchpatch, readline }:
+{ stdenv, lib, fetchurl, readline }:

 stdenv.mkDerivation rec {
  pname = "oil";
-  version = "0.7.0";
+  version = "0.8.pre4";

  src = fetchurl {
    url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3";
+    sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh";
  };

  postPatch = ''