From 5a4bdba25b982b421fc3fcea9cd20d58cf6fa834 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 12:09:08 +0200
Subject: [PATCH 01/31] Flexget: 2.14.9 -> 2.14.18

---
 pkgs/applications/networking/flexget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 87c7bddab6f..2ba5213bcc5 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -40,7 +40,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q";
+    sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9";
   };
 
   postPatch = ''

From ea1b4c7a9689067d9fde159de8ecc577f3635500 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 12:10:33 +0200
Subject: [PATCH 02/31] Flexget: 2.14.9 -> 2.14.18

---
 pkgs/applications/networking/flexget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 2ba5213bcc5..53ee46e2060 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,7 +36,7 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.14.9";
+  version = "2.14.18";
 
   src = fetchPypi {
     inherit pname version;

From c10d616ee5d4ff88691d870f7bc65395da42a609 Mon Sep 17 00:00:00 2001
From: hyper_ch <gitlab.com@sjau.ch>
Date: Fri, 24 Aug 2018 13:17:51 +0200
Subject: [PATCH 03/31] Plex: 1.13.4 -> 1.13.5

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 6f7f9e74ec5..88a8d0e8707 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.13.4.5271";
-    vsnHash = "200287a06";
-    sha256 = "c8aa459f680ad9db92f285dae2f3dcffbf082324e1b7ea2f356bdbe745fe6b8e";
+    version = "1.13.5.5291";
+    vsnHash = "6fa5e50a8";
+    sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx";
   };
 
 in stdenv.mkDerivation rec {

From a66cd66f796dfa638b0f22e02cf17092d06df10a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 11:50:10 -0700
Subject: [PATCH 04/31] clipgrab: 3.6.8 -> 3.6.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions.
---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 031202ad646..96e0bb04031 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.6.8";
+  version = "3.6.9";
 
   src = fetchurl {
-    sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p";
+    sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From e56f668bfd992190a8057cd8930a5aa5e2ca420e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 12:54:44 -0700
Subject: [PATCH 05/31] charybdis: 4.1 -> 4.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/charybdis/versions.
---
 pkgs/servers/irc/charybdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index 332372830d6..dc053f4581c 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-4.1";
+  name = "charybdis-4.1.1";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw";
+    sha256 = "0wvssc8b1xq6svcqrwxrpc1ga8ip0sksv73wwbk8na0pmysdvpg0";
   };
 
   postPatch = ''

From df126e2adf8b43a62a2dd8ee598002438afcf88e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 16:54:21 -0700
Subject: [PATCH 06/31] maven: 3.5.3 -> 3.5.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions.
---
 .../development/tools/build-managers/apache-maven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 19ca5b9c078..455cd0a3fe8 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.5.3"; in
+let version = "3.5.4"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "0244mpziz4rw35x2cahsqlxpnygvi6qpll16g4kx87db7wvmcadm";
+    sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f";
   };
 
   buildInputs = [ makeWrapper ];

From d73fd699529aadd0c38931eceefa4c83f108fc34 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 25 Aug 2018 15:26:52 +0300
Subject: [PATCH 07/31] iwd: 0.4 -> 0.7

---
 nixos/modules/services/networking/iwd.nix |  9 +--------
 pkgs/os-specific/linux/iwd/default.nix    | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index cfc536fc5b5..eb03d2e1d63 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -20,14 +20,7 @@ in {
 
     services.dbus.packages = [ pkgs.iwd ];
 
-    systemd.services.iwd = {
-      description = "Wireless daemon";
-      before = [ "network.target" ];
-      wants = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
-    };
+    systemd.packages = [ pkgs.iwd ];
 
     systemd.tmpfiles.rules = [
       "d /var/lib/iwd 0700 root root -"
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 833609f9fc2..79179f3fcbb 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }:
+{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }:
 
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.7";
-     sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7";
+     rev = "0.9";
+     sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.4";
+  version = "0.7";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs";
+    sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab";
   };
 
   nativeBuildInputs = [
@@ -35,8 +35,9 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-dbus-datadir=$(out)/etc/"
-    "--localstatedir=/var"
-    "--disable-systemd-service"
+    "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
+    "--with-systemd-unitdir=$(out)/lib/systemd/system/"
+    "--localstatedir=/var/"
   ];
 
   postUnpack = ''
@@ -55,6 +56,11 @@ in stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
+  postFixup = ''
+    substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
+                      --replace /bin/false ${coreutils}/bin/false
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     description = "Wireless daemon for Linux";

From 0905ed85189e22c01a9f047e434fb962da106f37 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 26 Aug 2018 10:51:10 +0300
Subject: [PATCH 08/31] tokei: 7.0.3 -> 8.0.0

---
 pkgs/development/tools/misc/tokei/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 0059c10afe0..831a9ec6278 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "7.0.3";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "Aaronepower";
     repo = "tokei";
     rev = "v${version}";
-    sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza";
+    sha256 = "1sfwmjlvjrd8r0ynnayw7g3514mfiky2j30byphaagdw4jkxbd7c";
   };
 
-  cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv";
+  cargoSha256 = "0v29gych757h7vv5jsg7rpl705gpqn0ya8ai53582qd2cc6yz4c3";
 
   meta = with stdenv.lib; {
     description = "Count code, quickly";

From a04cf8fdb7f0cfe8876c7a4d9a63c312ce2a407a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Aug 2018 12:18:28 +0200
Subject: [PATCH 09/31] konversation: 1.7.4 -> 1.7.5

---
 .../networking/irc/konversation/default.nix           | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index c41b6116b29..ccee78a64da 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -30,13 +30,13 @@
 
 let
   pname = "konversation";
-  version = "1.7.4";
+  version = "1.7.5";
 in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
+    sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
   };
 
   buildInputs = [
@@ -70,13 +70,6 @@ in mkDerivation rec {
     kdoctools
   ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
-      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
-    })
-  ];
-
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];

From cd8bcb5f9f02557a04781679fc450c8e6cf08a68 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 13:07:32 +0200
Subject: [PATCH 10/31] ceph: fix build, 12.2.2 -> 12.2.7

Since 772eef91686974b7710081a9a77e5c0e287c25e8, Boost
doesn't support by python by default, which broke ceph.

Also bump to 12.2.7, the latest release of ceph 12.
---
 pkgs/tools/filesystems/ceph/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 0f712853f24..ef3e36ff627 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "12.2.2";
+  version = "12.2.7";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00";
+    sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl";
   };
 
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a25ec7c561..410c1a3fe7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1706,7 +1706,9 @@ with pkgs;
   nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
 
   libceph = ceph.lib;
-  ceph = callPackage ../tools/filesystems/ceph { boost = boost165; };
+  ceph = callPackage ../tools/filesystems/ceph {
+    boost = boost166.override { enablePython = true; };
+  };
   ceph-dev = ceph;
 
   certmgr = callPackage ../tools/security/certmgr { };

From d41409cd8f381d55b690a71c4a250cec4b9e0176 Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sun, 26 Aug 2018 13:13:18 +0200
Subject: [PATCH 11/31] mixxx: 2.0.0 -> 2.1.3

---
 pkgs/applications/audio/mixxx/default.nix | 30 ++++++++---------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 60a0695ffec..746e306d377 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,34 +1,24 @@
-{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
+{ stdenv, fetchFromGitHub, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
-, taglib, vampSDK
+, taglib, upower, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
-  version = "2.0.0";
+  version = "2.1.3";
 
-  src = fetchurl {
-    url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz";
-    sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
+  src = fetchFromGitHub {
+    owner = "mixxxdj";
+    repo = "mixxx";
+    rev = "release-${version}";
+    sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
-      sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
-    })
-    (fetchpatch {
-      url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
-      name = "sqlite.patch";
-      sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
-    })
- ];
-
   buildInputs = [
     chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
-    rubberband scons sqlite taglib vampSDK
+    rubberband scons sqlite taglib upower vampSDK
   ];
 
   sconsFlags = [
@@ -56,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.aszlig maintainers.goibhniu ];
+    maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ];
     platforms = platforms.linux;
   };
 }

From a44469d7b66815fcadd628e07ae86e6b7bc7f26b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 13:38:58 +0200
Subject: [PATCH 12/31] nixos/tests/netdata: fix non-deterministic failure

The test sporadically failed on hydra when a request was made
before the service was actually listening on its port.
Explicitly wait for the port to open.
---
 nixos/tests/netdata.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index eb45db6f04c..9bd147968e4 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -20,6 +20,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     $netdata->waitForUnit("netdata.service");
 
+    # wait for the service to listen before sending a request
+    $netdata->waitForOpenPort(19999);
+
     # check if the netdata main page loads.
     $netdata->succeed("curl --fail http://localhost:19999/");
 

From ec334d38d258f677c249e4f757a9a159ba6cb569 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sun, 26 Aug 2018 12:04:05 +0100
Subject: [PATCH 13/31] qtwebengine: Fix inputs on aarch64

A mistake in the previous commit meant that ffmpeg wasn't added to the
propagatedBuildInputs on aarch64.
---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 622c0554967..aae15c62d73 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -134,7 +134,7 @@ EOF
     harfbuzz icu
 
     libevent
-  ] ++ optionals stdenv.hostPlatform.isArm [
+  ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
     ffmpeg
   ] ++ optionals (!stdenv.isDarwin) [
     dbus zlib minizip snappy nss protobuf jsoncpp

From f021702d212c6f78225fd2ed3a08d7ce669731f1 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 14:15:15 +0200
Subject: [PATCH 14/31] nixos/tests/networking: fix routes tests

The output format of `ip route` changed, it now explicitly
shows "proto static" for static routes.
---
 nixos/tests/networking.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index cd5d537a3be..76ece1ea3e6 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -552,15 +552,15 @@ let
 
       testScript = ''
         my $targetIPv4Table = <<'END';
-        10.0.0.0/16 scope link mtu 1500 
+        10.0.0.0/16 proto static scope link mtu 1500 
         192.168.1.0/24 proto kernel scope link src 192.168.1.2 
-        192.168.2.0/24 via 192.168.1.1 
+        192.168.2.0/24 via 192.168.1.1 proto static 
         END
 
         my $targetIPv6Table = <<'END';
         2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium
-        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 metric 1024 pref medium
-        fdfd:b3f0::/48 metric 1024 pref medium
+        2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium
+        fdfd:b3f0::/48 proto static metric 1024 pref medium
         END
 
         $machine->start;

From 3f8756ce10d7a3d2cc61b7b2f44e0890a2561e40 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 26 Aug 2018 14:24:07 +0200
Subject: [PATCH 15/31] nixos/tests/networking: fix "virtual" tests

`ip route` now displays extended tun attributes, so the expected
output of this test changed.

Upstream change: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818
---
 nixos/tests/networking.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 76ece1ea3e6..ff088ad2621 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -448,8 +448,8 @@ let
 
       testScript = ''
         my $targetList = <<'END';
-        tap0: tap UNKNOWN_FLAGS:800 user 0
-        tun0: tun UNKNOWN_FLAGS:800 user 0
+        tap0: tap persist user 0
+        tun0: tun persist user 0
         END
 
         # Wait for networking to come up

From a3099c9d35c255603c5ee4b450ac00ffc347f2cf Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 26 Aug 2018 14:45:06 +0200
Subject: [PATCH 16/31] subsurface: 4.7.5 -> 4.8.1 (#45640)

Currently build is broken due to some invalid use of incomplete type 'class QHeaderView':
https://hydra.nixos.org/build/76951177/nixlog/2

CC: @bkchr
---
 pkgs/applications/misc/subsurface/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 5e1e7bf3225..1b998c48580 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "4.7.5";
+  version = "4.8.1";
 
   libdc = stdenv.mkDerivation rec {
     name = "libdivecomputer-ssrf-${version}";
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
-      sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x";
+      sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy";
     };
 
     nativeBuildInputs = [ autoreconfHook ];
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
-    sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82";
+    sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2";
   };
 
   buildInputs = [

From 63257c88c3e5867a0a79d82408db5b442b060048 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sat, 25 Aug 2018 14:39:58 +0200
Subject: [PATCH 17/31] xkbd: init at 0.8.18

---
 pkgs/applications/misc/xkbd/default.nix | 30 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/xkbd/default.nix

diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
new file mode 100644
index 00000000000..ccbb88bd1a8
--- /dev/null
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto
+, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "xkbd-${version}";
+  version = "0.8.18";
+
+  src = fetchFromGitHub {
+    owner = "mahatma-kaganovich";
+    repo = "xkbd";
+    rev = name;
+    sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
+  };
+
+  buildInputs = [
+    freetype libXrender libXft libXext libXtst libXpm libX11
+    libXi xextproto xinput xproto
+  ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mahatma-kaganovich/xkbd;
+    description = "onscreen soft keyboard for X11";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82c68a7bcb3..b4373ce191b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1456,6 +1456,8 @@ with pkgs;
 
   onboard = callPackage ../applications/misc/onboard { };
 
+  xkbd = callPackage ../applications/misc/xkbd { };
+
   optar = callPackage ../tools/graphics/optar {};
 
   patdiff = callPackage ../tools/misc/patdiff { };

From d4c25d4953e4914a10d3ccd78d1d8e6dd69fadd1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 17:25:51 +0300
Subject: [PATCH 18/31] nano-wallet: 14.2 -> 15.2

---
 pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 76ee914bd3d..7491e830628 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "14.2";
+  version = "15.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0jbv5a8sz403a1pqcgl32idk6y0z510h7ikjg1dcxla0rsch6ipl";
+    sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3";
     fetchSubmodules = true;
   };
 

From ff583d81146f8f7b3c988204fb2237faa5b0976f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Sun, 26 Aug 2018 19:38:52 +0200
Subject: [PATCH 19/31] endgame-singularity: init at 0.30c (#45057)

---
 pkgs/games/endgame-singularity/default.nix | 56 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/games/endgame-singularity/default.nix

diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix
new file mode 100644
index 00000000000..8b259bad88d
--- /dev/null
+++ b/pkgs/games/endgame-singularity/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, unzip, python2 }:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "endgame-singularity";
+  version = "0.30c";
+  format = "other";
+
+  srcs = [
+    (fetchurl {
+      url = "http://www.emhsoft.com/singularity/singularity-${version}-src.tar.gz";
+      sha256 = "13zjhf67gmla67nkfpxb01rxs8j9n4hs0s4n9lnnq4zgb709yxgl";
+    })
+    (fetchurl {
+      url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip";
+      sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb";
+    })
+  ];
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ]; # The music is zipped
+  propagatedBuildInputs = with python2.pkgs; [ pygame numpy ];
+
+  # This is not an error: it needs both compilation rounds
+  buildPhase = ''
+    ${python2.interpreter} -m compileall "singularity-${version}"
+    ${python2.interpreter} -O -m compileall "singularity-${version}"
+  '';
+
+  installPhase = ''
+    install -Dm755 "singularity-${version}/singularity.py"  "$out/share/singularity.py"
+    install -Dm644 "singularity-${version}/singularity.pyo" "$out/share/singularity.pyo"
+    install -Dm644 "singularity-${version}/singularity.pyc" "$out/share/singularity.pyc"
+    cp -R "singularity-${version}/code" "singularity-${version}/data" "$out/share/"
+    cp -R "endgame-singularity-music-007" "$out/share/music"
+  '';
+
+  # Tell it where to find python libraries
+  # Also cd to the same directory as the code, since it uses relative paths
+  postFixup = ''
+    makeWrapper "${python2.interpreter}" "$out/bin/endgame-singularity" \
+          --set PYTHONPATH "$PYTHONPATH" \
+          --run "cd \"$out/share\"" \
+          --add-flags "$out/share/singularity.py"
+  '';
+
+  meta = {
+    homepage = http://www.emhsoft.com/singularity/;
+    description = "A simulation game about strong AI";
+    longDescription = ''
+      A simulation of a true AI. Go from computer to computer, pursued by the
+      entire world. Keep hidden, and you might have a chance
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 132549fe483..679b46ee702 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19748,6 +19748,8 @@ with pkgs;
 
   EmptyEpsilon = callPackage ../games/empty-epsilon { };
 
+  endgame-singularity = callPackage ../games/endgame-singularity { };
+
   endless-sky = callPackage ../games/endless-sky { };
 
   enyo-doom = libsForQt5.callPackage ../games/enyo-doom { };

From 0e4160a3a11d67a66ba9bc556a6d6d4ee3af9c0e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 26 Aug 2018 19:56:08 +0200
Subject: [PATCH 20/31] pythonPackages.sympy: 1.1.1 -> 1.2

---
 .../science/math/sage/sage-src.nix            |  7 ++++
 .../python-modules/sympy/default.nix          | 32 +++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 096f2212cc4..7fd49fe205c 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -136,6 +136,13 @@ stdenv.mkDerivation rec {
       url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e";
       sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk";
     })
+
+    # https://trac.sagemath.org/ticket/26117
+    (fetchpatch {
+      name = "sympy-1.2.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36";
+      sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi";
+    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches ++ [
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index f41f2e7b4fa..fb702e046a4 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,44 +8,36 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.1.1";
+  version = "1.2"; # Upgrades may break sage. Please test.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4";
+    sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18";
   };
 
   checkInputs = [ glibcLocales ];
 
   propagatedBuildInputs = [ mpmath ];
 
-  # Bunch of failures including transients.
+  # some tests fail: https://github.com/sympy/sympy/issues/15149
   doCheck = false;
 
+  patches = [
+    # to be fixed by https://github.com/sympy/sympy/pull/13476
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
+    })
+  ];
+
   preCheck = ''
     export LANG="en_US.UTF-8"
   '';
 
-  patches = [
-    # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825
-    # There is also an upstream patch for this, included in the next release (PR #128826).
-    # However that doesn't quite fix the issue yet. Apparently some changes by sage are required.
-    # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about
-    # it).
-    (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
-    })
-    (fetchpatch {
-      url = "https://github.com/sympy/sympy/pull/13276.patch";
-      sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh";
-    })
-  ];
-
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ lovek323 ];
+    maintainers = with lib.maintainers; [ lovek323 timokau ];
   };
 }

From 5d91e0f57df0b871b61c42c004607b2df98e7a1f Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Sat, 25 Aug 2018 20:56:21 +0200
Subject: [PATCH 21/31] hunspell-hs: fix build

Using pkgconfig like jtojnar suggested.

Disables tests as some necessary data files
aren't included on hackage.
---
 .../haskell-modules/configuration-common.nix  |  3 ++
 .../haskell-modules/patches/hunspell.patch    | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/hunspell.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 61c2da2b419..ef55272d6e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -672,6 +672,9 @@ self: super: {
   # https://github.com/bos/bloomfilter/issues/7
   bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
 
+  # https://github.com/ashutoshrishi/hunspell-hs/pull/3
+  hunspell-hs = addPkgconfigDepend (dontCheck (appendPatch super.hunspell-hs ./patches/hunspell.patch)) pkgs.hunspell;
+
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch
new file mode 100644
index 00000000000..cc115029a7a
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hunspell.patch
@@ -0,0 +1,30 @@
+diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal
+--- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal	2018-08-26 20:23:33.053763300 +0200
++++ hunspell-hs-0.1.0.0/hunspell-hs.cabal	2018-08-26 20:42:05.886074510 +0200
+@@ -37,7 +37,7 @@
+       base >=4.7 && <5
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -63,7 +63,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:
+@@ -88,7 +88,7 @@
+     , hunspell-hs
+     , stm
+   if os(linux)
+-    extra-libraries:
++    pkgconfig-depends:
+         hunspell
+   if os(darwin)
+     include-dirs:

From 9dedda16e9dbbd415222db1a8ee3736aabb2b4a0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 26 Aug 2018 22:05:13 +0200
Subject: [PATCH 22/31] calibre: 3.29.0 -> 3.30.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 15d894b0413..d66a778c1cd 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.29.0";
+  version = "3.30.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh";
+    sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz";
   };
 
   patches = [

From 9e44b46bab02ae739a50d5edc38d0d338f402f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
Date: Sun, 26 Aug 2018 22:14:17 +0200
Subject: [PATCH 23/31] dex: 0.7 -> 0.8.0 (#45639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 pkgs/tools/X11/dex/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
index d147ef4a70c..2a3a406135b 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/pkgs/tools/X11/dex/default.nix
@@ -3,16 +3,17 @@
 stdenv.mkDerivation rec {
   program = "dex";
   name = "${program}-${version}";
-  version = "0.7";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "jceb";
     repo = program;
     rev = "v${version}";
-    sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5";
+    sha256 = "13dkjd1373mbvskrdrp0865llr3zvdr90sc6a6jqswh3crmgmz4k";
   };
 
   propagatedBuildInputs = [ python3 ];
+  nativeBuildInputs = [ python3.pkgs.sphinx ];
   makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
 
   meta = {

From db11c832fb95128b58f0156dd9eb64726d2473b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Aug 2018 22:51:59 +0100
Subject: [PATCH 24/31] WIP Elm 0.19

---
 pkgs/development/compilers/elm/default.nix    | 57 +++----------------
 .../compilers/elm/packages/elm-compiler.nix   | 41 -------------
 .../compilers/elm/packages/elm-make.nix       | 26 ---------
 .../compilers/elm/packages/elm-package.nix    | 39 -------------
 .../compilers/elm/packages/elm-repl.nix       | 30 ----------
 .../compilers/elm/packages/elm.nix            | 30 ++++++++++
 pkgs/development/compilers/elm/update-elm.rb  | 28 ---------
 7 files changed, 38 insertions(+), 213 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-compiler.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-make.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-package.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-repl.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm.nix
 delete mode 100755 pkgs/development/compilers/elm/update-elm.rb

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 6a8d5f11b75..b7482efe7f5 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -40,28 +40,13 @@ let
       EOF
     '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc802.override {
+  hsPkgs = haskell.packages.ghc822.override {
     overrides = self: super:
       let hlib = haskell.lib;
-          elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
-          elmPkgs' = elmRelease.packages;
-          elmPkgs = elmPkgs' // {
-
-            elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
-              buildTools = drv.buildTools or [] ++ [ self.elm-make ];
-              preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
-            });
-
-            elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
-              doCheck = false;
-              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
-              postInstall =
-                let bins = lib.makeBinPath [ nodejs self.elm-make ];
-                in ''
-                  wrapProgram $out/bin/elm-repl \
-                    --prefix PATH ':' ${bins}
-                '';
-            });
+          elmPkgs = {
+            elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
+              preConfigure = "export HOME=`pwd`";
+            };
 
             /*
             This is not a core Elm package, and it's hosted on GitHub.
@@ -72,37 +57,11 @@ let
             where foo is a tag for a new version, for example "0.3.1-alpha".
             */
             elm-format = self.callPackage ./packages/elm-format.nix { };
-            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {
-              aeson-pretty = self.aeson-pretty_0_7_2;
-              either = hlib.overrideCabal self.either (drv :{
-                jailbreak = true;
-                version = "4.4.1.1";
-                sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
-                libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
-                  self.exceptions self.free self.mmorph self.monad-control
-                  self.MonadRandom self.profunctors self.transformers
-                  self.transformers-base
-                ];
-              });
-            };
+            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {};
           };
       in elmPkgs // {
         inherit elmPkgs;
-        elmVersion = elmRelease.version;
-        # https://github.com/elm-lang/elm-compiler/issues/1566
-        indents = hlib.overrideCabal super.indents (drv: {
-          version = "0.3.3";
-          #test dep tasty has a version mismatch
-          doCheck = false;
-          sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-          libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
-        });
+        elmVersion = elmPkgs.elm.version;
       };
   };
-in hsPkgs.elmPkgs // {
-  elm = lib.hiPrio (buildEnv {
-    name = "elm-${hsPkgs.elmVersion}";
-    paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
-    pathsToLink = [ "/bin" ];
-  });
-}
+in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
deleted file mode 100644
index 1242f556838..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint
-, base, binary, bytestring, containers, directory, edit-distance
-, fetchgit, filemanip, filepath, HUnit, indents
-, language-ecmascript, language-glsl, mtl, parsec, pretty, process
-, QuickCheck, stdenv, test-framework, test-framework-hunit
-, test-framework-quickcheck2, text, union-find
-}:
-mkDerivation {
-  pname = "elm-compiler";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh";
-    rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filepath indents
-    language-ecmascript language-glsl mtl parsec pretty process text
-    union-find
-  ];
-  executableHaskellDepends = [
-    aeson base binary directory filepath process text
-  ];
-  testHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
-    bytestring containers directory edit-distance filemanip filepath
-    HUnit indents language-ecmascript language-glsl mtl parsec pretty
-    process QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2 text union-find
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
-  license = stdenv.lib.licenses.bsd3;
-  # added manually since tests are not passing
-  # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852
-  doCheck = false;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
deleted file mode 100644
index 98e57ac9b7c..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
-, blaze-html, blaze-markup, bytestring, containers, directory
-, elm-compiler, elm-package, fetchgit, filepath, mtl
-, optparse-applicative, raw-strings-qq, stdenv, text, time
-}:
-mkDerivation {
-  pname = "elm-make";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-make";
-    sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2";
-    rev = "1a554833a70694ab142b9179bfac996143f68d9e";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson ansi-terminal ansi-wl-pprint base binary blaze-html
-    blaze-markup bytestring containers directory elm-compiler
-    elm-package filepath mtl optparse-applicative raw-strings-qq text
-    time
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "A build tool for Elm projects";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
deleted file mode 100644
index 49eddb58a14..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary
-, bytestring, containers, directory, edit-distance, elm-compiler
-, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls
-, http-types, mtl, network, optparse-applicative, parallel-io
-, pretty, stdenv, text, time, unordered-containers, vector
-, zip-archive
-}:
-mkDerivation {
-  pname = "elm-package";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-package";
-    sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
-    rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
-  };
-  patches = fetchurl {
-    url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch;
-    sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network parallel-io text time
-    unordered-containers vector zip-archive
-  ];
-  executableHaskellDepends = [
-    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
-    directory edit-distance elm-compiler filepath HTTP http-client
-    http-client-tls http-types mtl network optparse-applicative
-    parallel-io pretty text time unordered-containers vector
-    zip-archive
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-package;
-  description = "Package manager for Elm libraries";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
deleted file mode 100644
index 8c168dedc75..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
-, containers, directory, elm-compiler, elm-package, fetchgit
-, filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text
-}:
-mkDerivation {
-  pname = "elm-repl";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-repl";
-    sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5";
-    rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    base binary bytestring bytestring-trie cmdargs containers directory
-    elm-compiler elm-package filepath haskeline mtl parsec text
-  ];
-  testHaskellDepends = [
-    base bytestring bytestring-trie cmdargs directory elm-compiler
-    elm-package filepath haskeline HUnit mtl parsec QuickCheck
-    test-framework test-framework-hunit test-framework-quickcheck2
-  ];
-  jailbreak = true;
-  homepage = https://github.com/elm-lang/elm-repl;
-  description = "a REPL for Elm";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
new file mode 100644
index 00000000000..1097c8a1e19
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, containers, directory, edit-distance, fetchgit
+, file-embed, filepath, ghc-prim, haskeline, HTTP, http-client
+, http-client-tls, http-types, language-glsl, logict, mtl, network
+, parsec, process, raw-strings-qq, scientific, SHA, snap-core
+, snap-server, stdenv, template-haskell, text, time
+, unordered-containers, utf8-string, vector, zip-archive
+}:
+mkDerivation {
+  pname = "elm";
+  version = "0.19.0";
+  src = fetchgit {
+    url = "https://github.com/elm/compiler";
+    sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
+    rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    ansi-terminal ansi-wl-pprint base binary bytestring containers
+    directory edit-distance file-embed filepath ghc-prim haskeline HTTP
+    http-client http-client-tls http-types language-glsl logict mtl
+    network parsec process raw-strings-qq scientific SHA snap-core
+    snap-server template-haskell text time unordered-containers
+    utf8-string vector zip-archive
+  ];
+  homepage = "http://elm-lang.org";
+  description = "The `elm` command line interface";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
deleted file mode 100755
index 5169ff3fd29..00000000000
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.18.0"
-$elm_packages = { "elm-compiler" => "0.18.0",
-                  "elm-package" => "0.18.0",
-                  "elm-make" => "0.18.0",
-                  "elm-reactor" => "0.18.0",
-                  "elm-repl" => "0.18.0"
-                }
-
-for pkg, ver in $elm_packages
-  system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix"
-end
-
-File.open("packages/release.nix", 'w') do |file|
-  file.puts "# This file is auto-generated by ./update-elm.rb."
-  file.puts "# Please, do not modify it by hand!"
-  file.puts "{ callPackage }:"
-  file.puts "{"
-  file.puts "  version = \"#{$elm_version}\";"
-  file.puts "  packages = {"
-  for pkg, ver in $elm_packages
-    file.puts "    #{pkg} = callPackage ./#{pkg}.nix { };"
-  end
-  file.puts "  };"
-  file.puts "}"
-end

From 9f9e9d6433519a3fe2ca0b08942a8ee025e720d4 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 22 Aug 2018 22:09:23 -0400
Subject: [PATCH 25/31] elm: 0.18 -> 0.19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update makeElmStuff to makeDotElm, create elm-elm.nix listing the elm
code that elm itself embeds, and pre-fetch it so that the elm build
can function offline.  also include a versions.dat file, as created
during an impure build of elm.  set ELM_HOME so that the elm build can
find these things.

continues #45448

(cherry picked from commit e7d0df84676d51fb0cbfbeb10dd32153489c3565)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/compilers/elm/default.nix    |  37 +++++++++----
 .../compilers/elm/packages/elm-elm.nix        |  50 ++++++++++++++++++
 pkgs/development/compilers/elm/versions.dat   | Bin 0 -> 83377 bytes
 3 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/compilers/elm/packages/elm-elm.nix
 create mode 100644 pkgs/development/compilers/elm/versions.dat

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index b7482efe7f5..51f76f1108a 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -6,9 +6,26 @@
 # 3) Run ./elm2nix.rb in elm-reactor's directory.
 # 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
 
+# the elm binary embeds a piece of pre-compiled elm code, used by 'elm
+# reactor'. this means that the build process for 'elm' effectively
+# executes 'elm make'. that in turn expects to retrieve the elm
+# dependencies of that code (elm/core, etc.) from
+# package.elm-lang.org, as well as a cached bit of metadata
+# (versions.dat).
+
+# the makeDotElm function lets us retrieve these dependencies in the
+# standard nix way. we have to copy them in (rather than symlink) and
+# make them writable because the elm compiler writes other .dat files
+# alongside the source code. versions.dat was produced during an
+# impure build of this same code; the build complains that it can't
+# update this cache, but continues past that warning.
+
+# finally, we set ELM_HOME to point to these pre-fetched artifacts so
+# that the default of ~/.elm isn't used.
+
 let
-  makeElmStuff = deps:
-    let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
+  makeDotElm = ver: deps:
+    let versionsDat = ./versions.dat;
         cmds = lib.mapAttrsToList (name: info: let
                  pkg = stdenv.mkDerivation {
 
@@ -29,15 +46,13 @@ let
 
                  };
                in ''
-                 mkdir -p elm-stuff/packages/${name}
-                 ln -s ${pkg} elm-stuff/packages/${name}/${info.version}
+                 mkdir -p .elm/${ver}/package/${name}
+                 cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
+                 chmod -R +w .elm/${ver}/package/${name}/${info.version}
                '') deps;
     in ''
-      export HOME=/tmp
-      mkdir elm-stuff
-      cat > elm-stuff/exact-dependencies.json <<EOF
-      ${json}
-      EOF
+      mkdir -p .elm/${ver}/package;
+      ln -s ${versionsDat} .elm/${ver}/package/versions.dat;
     '' + lib.concatStrings cmds;
 
   hsPkgs = haskell.packages.ghc822.override {
@@ -45,7 +60,9 @@ let
       let hlib = haskell.lib;
           elmPkgs = {
             elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
-              preConfigure = "export HOME=`pwd`";
+              preConfigure = ''
+                export ELM_HOME=`pwd`/.elm
+              '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
             };
 
             /*
diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix
new file mode 100644
index 00000000000..1537dbf6781
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-elm.nix
@@ -0,0 +1,50 @@
+{
+  "elm/time" = {
+    version = "1.0.0";
+    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+  };
+  "elm/url" = {
+    version = "1.0.0";
+    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+  };
+  "elm/json" = {
+    version = "1.0.0";
+    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
+  };
+  "elm/html" = {
+    version = "1.0.0";
+    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+  };
+  "elm/parser" = {
+    version = "1.0.0";
+    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+  };
+  "elm/http" = {
+    version = "1.0.0";
+    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+  };
+  "elm/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+  };
+  "elm/browser" = {
+    version = "1.0.0";
+    sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
+  };
+  "elm/core" = {
+    version = "1.0.0";
+    sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
+  };
+  "elm/svg" = {
+    version = "1.0.0";
+    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+  };
+  "elm/project-metadata-utils" = {
+    version = "1.0.0";
+    sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
+  };
+  "elm-explorations/markdown" = {
+    version = "1.0.0";
+    sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
+  };
+}
diff --git a/pkgs/development/compilers/elm/versions.dat b/pkgs/development/compilers/elm/versions.dat
new file mode 100644
index 0000000000000000000000000000000000000000..824ab383057f2138d4dcd431b52851a2e6b8b127
GIT binary patch
literal 83377
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

literal 0
HcmV?d00001


From 7c542d0c86ad5958d2772026cf48939c3aee2aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 11:52:48 +0100
Subject: [PATCH 26/31] Elm: 0.19 builds with elm-format

---
 pkgs/development/compilers/elm/default.nix    | 53 +++++++++++++------
 .../compilers/elm/packages/elm-format.nix     | 19 +++----
 .../elm/packages/elm-interface-to-json.nix    | 24 ---------
 .../elm/packages/elm-reactor-elm.nix          | 22 --------
 .../compilers/elm/packages/elm-reactor.nix    | 28 ----------
 .../compilers/elm/packages/indents.nix        | 11 ++++
 .../compilers/elm/packages/release.nix        | 13 -----
 pkgs/development/compilers/elm/update.sh      |  3 ++
 8 files changed, 56 insertions(+), 117 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-reactor.nix
 create mode 100644 pkgs/development/compilers/elm/packages/indents.nix
 delete mode 100644 pkgs/development/compilers/elm/packages/release.nix
 create mode 100755 pkgs/development/compilers/elm/update.sh

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 51f76f1108a..70be5a95105 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,10 +1,12 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }:
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
 
 # To update:
-# 1) Update versions in ./update-elm.rb and run it.
-# 2) Checkout elm-reactor and run `elm-package install -y` inside.
-# 3) Run ./elm2nix.rb in elm-reactor's directory.
-# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
+
+# 1) Modify ./update.sh and run it
+# 2) XXX: generate packages/elm-elm.nix
+# 3) XXX: versions.dat
+
+# Notes:
 
 # the elm binary embeds a piece of pre-compiled elm code, used by 'elm
 # reactor'. this means that the build process for 'elm' effectively
@@ -48,22 +50,25 @@ let
                in ''
                  mkdir -p .elm/${ver}/package/${name}
                  cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
-                 chmod -R +w .elm/${ver}/package/${name}/${info.version}
                '') deps;
-    in ''
+    in (lib.concatStrings cmds) + ''
       mkdir -p .elm/${ver}/package;
-      ln -s ${versionsDat} .elm/${ver}/package/versions.dat;
-    '' + lib.concatStrings cmds;
+      cp ${versionsDat} .elm/${ver}/package/versions.dat;
+      chmod -R +w .elm
+    '';
 
   hsPkgs = haskell.packages.ghc822.override {
-    overrides = self: super:
-      let hlib = haskell.lib;
-          elmPkgs = {
-            elm = hlib.overrideCabal (self.callPackage ./packages/elm.nix { }) {
+    overrides = self: super: with haskell.lib;
+      let elmPkgs = {
+            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (attrs: {
+              # sadly with parallelism most of the time breaks compilation
+              enableParallelBuilding = false;
               preConfigure = ''
                 export ELM_HOME=`pwd`/.elm
               '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
-            };
+            });
+
+
 
             /*
             This is not a core Elm package, and it's hosted on GitHub.
@@ -71,14 +76,28 @@ let
 
                 cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
 
-            where foo is a tag for a new version, for example "0.3.1-alpha".
+            where foo is a tag for a new version, for example "0.8.0".
             */
-            elm-format = self.callPackage ./packages/elm-format.nix { };
-            elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {};
+            elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix {  }) (drv: {
+              # https://github.com/avh4/elm-format/issues/529
+              patchPhase = ''
+                cat >Setup.hs <<EOF
+                import Distribution.Simple
+                main = defaultMain
+                EOF
+
+                sed -i '/Build_elm_format/d' elm-format.cabal
+                sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs
+                sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs
+              '';
+            });
           };
       in elmPkgs // {
         inherit elmPkgs;
         elmVersion = elmPkgs.elm.version;
+
+        # Needed for elm-format
+        indents = self.callPackage ./packages/indents.nix {};
       };
   };
 in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 56db835ac10..86d99abab5a 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -6,14 +6,12 @@
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.7.0";
+  version = "0.8.0";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf";
-    rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb";
+    sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6";
+    rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6";
   };
-
-  doHaddock = false;
   isLibrary = true;
   isExecutable = true;
   setupHaskellDepends = [ base Cabal directory filepath process ];
@@ -27,15 +25,10 @@ mkDerivation {
     base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
     split tasty tasty-golden tasty-hunit tasty-quickcheck text
   ];
+  doHaddock = false;
   jailbreak = true;
-  postInstall = ''
-    ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
-  '';
-  postPatch = ''
-    sed -i "s|desc <-.*||" ./Setup.hs
-    sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs
-  '';
-  homepage = http://elm-lang.org;
+  doCheck = false;
+  homepage = "http://elm-lang.org";
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
deleted file mode 100644
index 3f797b7a236..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-, concatenative, containers, directory, either, elm-compiler
-, filemanip, filepath, indents, optparse-applicative, parsec
-, stdenv, text, transformers, fetchgit
-}:
-mkDerivation {
-  pname = "elm-interface-to-json";
-  version = "0.1.0.0";
-  src = fetchgit {
-    url = "https://github.com/stoeffel/elm-interface-to-json";
-    sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k";
-    rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  jailbreak = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base binary bytestring concatenative containers
-    directory either elm-compiler filemanip filepath indents
-    optparse-applicative parsec text transformers
-  ];
-  homepage = "https://github.com/githubuser/elm-interface-to-json#readme";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
deleted file mode 100644
index 90c8956323b..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "elm-lang/virtual-dom" = {
-    version = "2.0.1";
-    sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3";
-  };
-  "evancz/elm-markdown" = {
-    version = "3.0.1";
-    sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj";
-  };
-  "elm-lang/html" = {
-    version = "2.0.0";
-    sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi";
-  };
-  "elm-lang/svg" = {
-    version = "2.0.0";
-    sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l";
-  };
-  "elm-lang/core" = {
-    version = "5.0.0";
-    sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn";
-  };
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
deleted file mode 100644
index 41611b3cdd0..00000000000
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-, cmdargs, containers, directory, elm-compiler, elm-package
-, fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core
-, snap-server, stdenv, template-haskell, text, time, transformers
-, unordered-containers, utf8-string, websockets, websockets-snap
-}:
-mkDerivation {
-  pname = "elm-reactor";
-  version = "0.18";
-  src = fetchgit {
-    url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65";
-    rev = "c519d4ec0aaf2f043a416fe858346b0181eca516";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson base blaze-html blaze-markup bytestring cmdargs containers
-    directory elm-compiler elm-package file-embed filepath fsnotify mtl
-    process snap-core snap-server template-haskell text time
-    transformers unordered-containers utf8-string websockets
-    websockets-snap
-  ];
-  jailbreak = true;
-  homepage = http://elm-lang.org;
-  description = "Interactive development tool for Elm programs";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix
new file mode 100644
index 00000000000..6bf7fa7890e
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/indents.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, base, concatenative, mtl, parsec, stdenv }:
+mkDerivation {
+  pname = "indents";
+  version = "0.3.3";
+  sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
+  libraryHaskellDepends = [ base concatenative mtl parsec ];
+  doCheck = false;
+  homepage = "http://patch-tag.com/r/salazar/indents";
+  description = "indentation sensitive parser-combinators for parsec";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix
deleted file mode 100644
index fd4e08fff09..00000000000
--- a/pkgs/development/compilers/elm/packages/release.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is auto-generated by ./update-elm.rb.
-# Please, do not modify it by hand!
-{ callPackage }:
-{
-  version = "0.18.0";
-  packages = {
-    elm-compiler = callPackage ./elm-compiler.nix { };
-    elm-package = callPackage ./elm-package.nix { };
-    elm-make = callPackage ./elm-make.nix { };
-    elm-reactor = callPackage ./elm-reactor.nix { };
-    elm-repl = callPackage ./elm-repl.nix { };
-  };
-}
diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh
new file mode 100755
index 00000000000..02e5bdc9b58
--- /dev/null
+++ b/pkgs/development/compilers/elm/update.sh
@@ -0,0 +1,3 @@
+cabal2nix https://github.com/elm/compiler --revision  32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix
+cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
+cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix

From 82f11ba01b97e1f3961b24187e96ad8db336a124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 11:53:04 +0100
Subject: [PATCH 27/31] haskell generic builder: expose enableParallelBuilding

---
 pkgs/development/haskell-modules/generic-builder.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 37916c0bba2..0786238040b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -46,6 +46,10 @@ in
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
 , license
+# We cannot enable -j<n> parallelism for libraries because GHC is far more
+# likely to generate a non-determistic library ID in that case. Further
+# details are at <https://github.com/peti/ghc-library-id-bug>.
+, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
 , maintainers ? []
 , doCoverage ? false
 , doHaddock ? !(ghc.isHaLVM or false)
@@ -112,11 +116,6 @@ let
                      main = defaultMain
                    '';
 
-  # We cannot enable -j<n> parallelism for libraries because GHC is far more
-  # likely to generate a non-determistic library ID in that case. Further
-  # details are at <https://github.com/peti/ghc-library-id-bug>.
-  enableParallelBuilding = (versionOlder "7.8" ghc.version && !isLibrary) || versionOlder "8.0.1" ghc.version;
-
   crossCabalFlags = [
     "--with-ghc=${ghc.targetPrefix}ghc"
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"

From fc11905b6e44ca7a803fec6986950608625a16d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Aug 2018 12:01:52 +0100
Subject: [PATCH 28/31] elm: depend on nodejs due to repl

---
 pkgs/development/compilers/elm/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 70be5a95105..f338fc23835 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -60,12 +60,17 @@ let
   hsPkgs = haskell.packages.ghc822.override {
     overrides = self: super: with haskell.lib;
       let elmPkgs = {
-            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (attrs: {
+            elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
               # sadly with parallelism most of the time breaks compilation
               enableParallelBuilding = false;
               preConfigure = ''
                 export ELM_HOME=`pwd`/.elm
               '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
+              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+              postInstall = ''
+                wrapProgram $out/bin/elm \
+                  --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
+              '';
             });
 
 

From aa8bdaf0c4ed67acfab6a1977b70c356bbf0543a Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 26 Aug 2018 16:53:04 -0400
Subject: [PATCH 29/31] elm: add instructions for versions.dat and elm-elm.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit fcabcb2e41a89b2249d24e68355866979e961f8a)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/compilers/elm/default.nix    | 27 ++++++++-
 .../compilers/elm/packages/elm-elm.nix        | 60 +++++++++----------
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index f338fc23835..93deb4a90af 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -3,8 +3,31 @@
 # To update:
 
 # 1) Modify ./update.sh and run it
-# 2) XXX: generate packages/elm-elm.nix
-# 3) XXX: versions.dat
+
+# 2) to generate versions.dat:
+# 2.1) git clone https://github.com/elm/compiler.git
+# 2.2) cd compiler
+# 2.3) cabal2nix --shell . | sed 's/"default",/"ghc822",/' > shell.nix
+# 2.4) nix-shell
+# 2.5) mkdir .elm
+# 2.6) export ELM_HOME=$(pwd)/.elm
+# 2.7) cabal build
+# 2.8) cp .elm/0.19.0/package/versions.dat ...
+
+# 3) generate a template for elm-elm.nix with:
+# (
+#   echo "{";
+#   jq '.dependencies | .direct, .indirect | to_entries | .[] | { (.key) : { version : .value, sha256:  "" } } ' \
+#   < ui/browser/elm.json \
+#   | sed 's/:/ =/' \
+#   | sed 's/^[{}]//' \
+#   | sed -E 's/(["}]),?$/\1;/' \
+#   | sed -E 's/"(version|sha256)"/\1/' \
+#   | grep -v '^$';
+#   echo "}"
+# )
+#
+# ... then fill in the sha256s
 
 # Notes:
 
diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix
index 1537dbf6781..a38e21daa06 100644
--- a/pkgs/development/compilers/elm/packages/elm-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-elm.nix
@@ -1,32 +1,4 @@
 {
-  "elm/time" = {
-    version = "1.0.0";
-    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
-  };
-  "elm/url" = {
-    version = "1.0.0";
-    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
-  };
-  "elm/json" = {
-    version = "1.0.0";
-    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
-  };
-  "elm/html" = {
-    version = "1.0.0";
-    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
-  };
-  "elm/parser" = {
-    version = "1.0.0";
-    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
-  };
-  "elm/http" = {
-    version = "1.0.0";
-    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
-  };
-  "elm/virtual-dom" = {
-    version = "1.0.0";
-    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
-  };
   "elm/browser" = {
     version = "1.0.0";
     sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
@@ -35,16 +7,44 @@
     version = "1.0.0";
     sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
   };
-  "elm/svg" = {
+  "elm/html" = {
     version = "1.0.0";
-    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+  };
+  "elm/http" = {
+    version = "1.0.0";
+    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+  };
+  "elm/json" = {
+    version = "1.0.0";
+    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
   };
   "elm/project-metadata-utils" = {
     version = "1.0.0";
     sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
   };
+  "elm/svg" = {
+    version = "1.0.0";
+    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+  };
   "elm-explorations/markdown" = {
     version = "1.0.0";
     sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
   };
+  "elm/parser" = {
+    version = "1.0.0";
+    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+  };
+  "elm/time" = {
+    version = "1.0.0";
+    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+  };
+  "elm/url" = {
+    version = "1.0.0";
+    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+  };
+  "elm/virtual-dom" = {
+    version = "1.0.0";
+    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+  };
 }

From c2c13157bb4339069874206fa9588e75d106c808 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 27 Aug 2018 00:26:07 +0200
Subject: [PATCH 30/31] udunits: 2.2.26 -> 2.2.27.6 (#45660)

---
 .../development/libraries/udunits/default.nix | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index b02ac885237..664bc29a72d 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl,
-  bison, flex, expat, file
+{ stdenv, fetchFromGitHub, autoreconfHook,
+  texinfo, bison, flex, expat, file
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.26";
-    src = fetchurl {
-        url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn";
-    };
+  name = "udunits-${version}";
+  version = "2.2.27.6";
+  
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "UDUNITS-2";
+    rev = "v${version}";
+    sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm";
+  };
 
-    nativeBuildInputs = [ bison flex file ];
-    buildInputs = [ expat ];
+  nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
+  buildInputs = [ expat ];
 
-    meta = with stdenv.lib; {
-      homepage = https://www.unidata.ucar.edu/software/udunits/;
-      description = "A C-based package for the programatic handling of units of physical quantities";
-      license = licenses.bsdOriginal;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ pSub ];
-    };
+  meta = with stdenv.lib; {
+    homepage = https://www.unidata.ucar.edu/software/udunits/;
+    description = "A C-based package for the programatic handling of units of physical quantities";
+    license = licenses.bsdOriginal;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
 }

From f412e19996f059faaa216fb52babe7efa2d5ff27 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Aug 2018 21:50:19 -0400
Subject: [PATCH 31/31] linux: 4.18-rc8 -> 4.19-rc1

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index dd3186bc876..68b5e7c21a8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -302,7 +302,7 @@ let
       CIFS_XATTR        = yes;
       CIFS_POSIX        = yes;
       CIFS_FSCACHE      = yes;
-      CIFS_STATS        = yes;
+      CIFS_STATS        = whenOlder "4.19" yes;
       CIFS_WEAK_PW_HASH = yes;
       CIFS_UPCALL       = yes;
       CIFS_ACL          = yes;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index ec3baaf1e0a..c2feeceb072 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18-rc8";
-  modDirVersion = "4.18.0-rc8";
-  extraMeta.branch = "4.18";
+  version = "4.19-rc1";
+  modDirVersion = "4.19.0-rc1";
+  extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0rqyqms63c15iwcwy40yqd9fvlvh3ah09gddv0wf45z9dqp7id1m";
+    sha256 = "14c9xg9sv0jrdri36das97vdbybi7vmcy59mj9wmgaz81cdk3wg5";
   };
 
   # Should the testing kernels ever be built on Hydra?