Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
parent 98df4f6351 5b0398dc36
commit ded9a4b1aa
368 changed files with 5460 additions and 6226 deletions
@@ -15,11 +15,11 @@ let
  runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
 in stdenv.mkDerivation rec {
  name = "insomnia-${version}";
-  version = "5.16.6";
+  version = "6.0.2";

  src = fetchurl {
    url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1acad6gjrldd87nnv2hw558lzwy4c4ijh9jwjxnhz61jmdqvbmxw";
+    sha256 = "18xspbaal945bmrwjnsz1sjba53040wxrzvig40nnclwj8h671ms";
  };

  nativeBuildInputs = [ makeWrapper dpkg ];