Merge master into staging-next

2018-07-23 20:24:36 +02:00 · 2018-07-23 20:24:36 +02:00 · ac0c250ce3
commit ac0c250ce3
parent 04e21a073b f03238525c
96 changed files with 8409 additions and 1459 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -46,17 +46,17 @@

 # Python-related code and docs
 /maintainers/scripts/update-python-libraries	@FRidh
-/pkgs/top-level/python-packages.nix     	@FRidh
-/pkgs/development/interpreters/python   	@FRidh
-/pkgs/development/python-modules        	@FRidh
-/doc/languages-frameworks/python.md     	@FRidh
+/pkgs/top-level/python-packages.nix     @FRidh
+/pkgs/development/interpreters/python   @FRidh
+/pkgs/development/python-modules        @FRidh
+/doc/languages-frameworks/python.md     @FRidh

 # Haskell
-/pkgs/development/compilers/ghc                       @peti
-/pkgs/development/haskell-modules                     @peti
-/pkgs/development/haskell-modules/default.nix         @peti
-/pkgs/development/haskell-modules/generic-builder.nix @peti
-/pkgs/development/haskell-modules/hoogle.nix          @peti
+/pkgs/development/compilers/ghc                       @peti @ryantm @basvandijk
+/pkgs/development/haskell-modules                     @peti @ryantm @basvandijk
+/pkgs/development/haskell-modules/default.nix         @peti @ryantm @basvandijk
+/pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk
+/pkgs/development/haskell-modules/hoogle.nix          @peti @ryantm @basvandijk

 # R
 /pkgs/applications/science/math/R   @peti
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@ -689,7 +689,7 @@ overrides = super: self: rec {
    plugins = with availablePlugins; [
            (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
        ];
-    }
+    };
 }
 </programlisting>
  </para>
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1372,6 +1372,11 @@
    github = "froozen";
    name = "fro_ozen";
  };
+  frontsideair = {
+    email = "photonia@gmail.com";
+    github = "frontsideair";
+    name = "Fatih Altinok";
+  };
  ftrvxmtrx = {
    email = "ftrvxmtrx@gmail.com";
    github = "ftrvxmtrx";
@ -2002,6 +2007,13 @@
    email = "tierpluspluslists@gmail.com";
    name = "Karn Kallio";
  };
+
+  kmeakin = {
+    email = "karlwfmeakin@gmail.com";
+    name = "Karl Meakin";
+    github = "Kmeakin";
+  };
+
  knedlsepp = {
    email = "josef.kemetmueller@gmail.com";
    github = "knedlsepp";
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@ -144,8 +144,8 @@ in {

      package = mkOption {
        type = types.package;
-        default = pulseaudioLight;
-        defaultText = "pkgs.pulseaudioLight";
+        default = pkgs.pulseaudio;
+        defaultText = "pkgs.pulseaudio";
        example = literalExample "pkgs.pulseaudioFull";
        description = ''
          The PulseAudio derivation to use.  This can be used to enable
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@ -120,8 +120,8 @@ let

      shell = mkOption {
        type = types.either types.shellPackage types.path;
-        default = pkgs.nologin;
-        defaultText = "pkgs.nologin";
+        default = pkgs.shadow;
+        defaultText = "pkgs.shadow";
        example = literalExample "pkgs.bashInteractive";
        description = ''
          The path to the user's shell. Can use shell derivations,
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@ -78,7 +78,7 @@ in

        # Allow execution of "/home/root/secret.sh" by user `backup`, `database`
        # and the group with GID `1006` without a password.
-        { users = [ "backup" ]; groups = [ 1006 ];
+        { users = [ "backup" "database" ]; groups = [ 1006 ];
          commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; }

        # Allow all users of group `bar` to run two executables as user `foo`
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@ -70,8 +70,6 @@ let
      "systemd-journald.socket"
      "systemd-journald.service"
      "systemd-journal-flush.service"
-      "systemd-journal-gatewayd.socket"
-      "systemd-journal-gatewayd.service"
      "systemd-journal-catalog-update.service"
      "systemd-journald-audit.socket"
      "systemd-journald-dev-log.socket"
@ -160,8 +158,10 @@ let
      "systemd-binfmt.service"
      "systemd-exit.service"
      "systemd-update-done.service"
-    ]
-    ++ cfg.additionalUpstreamSystemUnits;
+    ] ++ optionals config.services.journald.enableHttpGateway [
+      "systemd-journal-gatewayd.socket"
+      "systemd-journal-gatewayd.service"
+    ] ++ cfg.additionalUpstreamSystemUnits;

  upstreamSystemWants =
    [ "sysinit.target.wants"
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@ -104,7 +104,7 @@ in {

  config = mkIf cfg.enable {

-    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ];
+    environment.systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];

    boot.kernelModules = [ "tun" ];

--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@ -304,7 +304,7 @@ let
        serviceConfig.Type = "oneshot";
        serviceConfig.RemainAfterExit = true;
        script = let
-          netcat = "${pkgs.netcat-openbsd}/bin/nc";
+          netcat = "${pkgs.libressl.nc}/bin/nc";
          portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}";
        in "while ! ${portCheck}; do :; done";
      };
@ -435,7 +435,7 @@ in {
        serviceConfig.RemainAfterExit = true;
        script = let
          ports = lib.range 8000 8005 ++ lib.singleton 80;
-          netcat = "${pkgs.netcat-openbsd}/bin/nc";
+          netcat = "${pkgs.libressl.nc}/bin/nc";
          mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}";
          checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})";
        in "while ! ${checks}; do :; done";
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@ -48,8 +48,10 @@ stdenv.mkDerivation rec {
        -i $out/bin/banshee
  '';
  meta = with lib; {
+    homepage = "http://banshee.fm/";
    description = "A music player written in C# using GNOME technologies";
    platforms = platforms.linux;
    maintainers = [ maintainers.zohl ];
+    license = licenses.mit;
  };
 }
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
    description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
    maintainers = [ stdenv.lib.maintainers.siddharthist ];
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@ -25,7 +25,7 @@ self:
    super = removeAttrs imported [ "dash" ];

    elpaBuild = import ../../../build-support/emacs/elpa.nix {
-      inherit fetchurl lib stdenv texinfo;
+      inherit lib stdenv texinfo;
      inherit (self) emacs;
    };

--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@ -75,28 +75,16 @@ self:
      # upstream issue: missing file header
      elmine = markBroken super.elmine;

-      # upstream issue: missing dependency redshank
-      emr = markBroken super.emr;
-
      ess-R-data-view = super.ess-R-data-view.override {
        inherit (self.melpaPackages) ess ctable popup;
      };

-      # upstream issue: missing dependency highlight
-      evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
-      # upstream issue: missing dependency highlight
-      floobits  = markBroken super.floobits;
-
      # missing OCaml
      flycheck-ocaml = markBroken super.flycheck-ocaml;

      # Expects bash to be at /bin/bash
      flycheck-rtags = markBroken super.flycheck-rtags;

-      # upstream issue: missing dependency
-      fold-dwim-org = markBroken super.fold-dwim-org;
-
      # build timeout
      graphene = markBroken super.graphene;

@ -158,9 +146,6 @@ self:
            (attrs.nativeBuildInputs or []) ++ [ external.git ];
         }));

-      # upstream issue: missing dependency
-      org-readme = markBroken super.org-readme;
-
      # upstream issue: truncated file
      powershell = markBroken super.powershell;

@ -173,9 +158,6 @@ self:
      # upstream issue: missing file footer
      seoul256-theme = markBroken super.seoul256-theme;

-      # upstream issue: missing dependency highlight
-      sonic-pi  = markBroken super.sonic-pi;
-
      spaceline = super.spaceline.override {
        inherit (self.melpaPackages) powerline;
      };
@ -198,9 +180,6 @@ self:
      # upstream issue: missing file header
      voca-builder = markBroken super.voca-builder;

-      # upstream issue: missing dependency
-      weechat-alert = markBroken super.weechat-alert;
-
      # upstream issue: missing file header
      window-numbering = markBroken super.window-numbering;

@ -216,6 +195,10 @@ self:
      });
    };

-    melpaPackages = super // overrides;
+    melpaPackages =
+      removeAttrs (super // overrides)
+      [
+        "show-marks"  # missing dependency: fm
+      ];
  in
    melpaPackages // { inherit melpaPackages; }
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -3,10 +3,11 @@
    org = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "org";
-        version = "20180716";
+        ename = "org";
+        version = "20180723";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20180716.tar";
-          sha256 = "0gr57nfdncnxrxxzw87ni5i6zjh1mdxl9h8pw96msh1c47xhpk2d";
+          url = "http://orgmode.org/elpa/org-20180723.tar";
+          sha256 = "1mcgnba16lpyh55zjx4rcbmpygcmdnjjzvgv1rx0c3kz1h5fgzf8";
        };
        packageRequires = [];
        meta = {
@ -17,10 +18,11 @@
    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
      elpaBuild {
        pname = "org-plus-contrib";
-        version = "20180716";
+        ename = "org-plus-contrib";
+        version = "20180723";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20180716.tar";
-          sha256 = "0j4r3bcy96kcaab7cv2a5qd0mv8ddkr1qlihijk79l9nhsh2y4hm";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20180723.tar";
+          sha256 = "1l34bagkm8mcyv5diprpbd4yjijkdvx1l54qpvi8bmvxjnzsm7mk";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@ -60,7 +60,7 @@ let
    '';

    postInstall = stdenv.lib.optionalString stdenv.isLinux ''
-      sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim
+      sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim
    '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) ''
      install_name_tool -change libjemalloc.1.dylib \
                ${jemalloc}/lib/libjemalloc.1.dylib \
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@ -49,18 +49,18 @@ let
  ];
 in buildRustPackage rec {
  name = "alacritty-unstable-${version}";
-  version = "2018-05-09";
+  version = "2018-07-20";

  # At the moment we cannot handle git dependencies in buildRustPackage.
  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
  src = fetchgit {
    url = https://github.com/Mic92/alacritty.git;
    rev = "rev-${version}";
-    sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
+    sha256 = "1vhjmysfra6dsbv35qbvsf76rhkj990lgns0k0gpbcrf47gsvx1n";
    fetchSubmodules = true;
  };

-  cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
+  cargoSha256 = "0rs2p4sik25ynx6ri2wlg8v6vrdmf10xxnw9f2aqyps9m038i9di";

  nativeBuildInputs = [
    cmake
@ -87,7 +87,7 @@ in buildRustPackage rec {
    mkdir $out/Applications
    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
  '' else ''
-    install -D Alacritty.desktop $out/share/applications/alacritty.desktop
+    install -D alacritty.desktop $out/share/applications/alacritty.desktop
    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
  '') + ''

--- a/pkgs/applications/misc/mupdf/darwin.patch
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@ -21,7 +21,7 @@ diff --git a/Makerules b/Makerules
 -SYS_GLUT_CFLAGS :=
 -SYS_GLUT_LIBS := -lglut -lGL
 -
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
 HAVE_LIBCRYPTO := yes
 SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
@ -33,3 +33,15 @@ diff --git a/Makerules b/Makerules
 
 ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
 HAVE_X11 := yes
+diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
+index d58f7ba..808af18 100644
+--- a/platform/gl/gl-main.c
+++ b/platform/gl/gl-main.c
+@@ -16,6 +16,7 @@ void glutExit(void) {}
+ void glutMouseWheelFunc(void *fn) {}
+ void glutInitErrorFunc(void *fn) {}
+ void glutInitWarningFunc(void *fn) {}
+#define glutSetOption(X,Y)
+ #endif
+ 
+ enum
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@ -65,5 +65,6 @@ mkDerivation rec {
    homepage = https://yakuake.kde.org;
    description = "Quad-style terminal emulator for KDE";
    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2;
  };
 }
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@ -19,5 +19,6 @@ stdenv.mkDerivation {
    description = "Instant messaging (MSN Messenger clone)";
    homepage = http://amsn-project.net;
    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/applications/science/astronomy/openspace/assets.patch
+++ b/pkgs/applications/science/astronomy/openspace/assets.patch
@ -0,0 +1,100 @@
+diff --git a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
+index c15f6d9..1f8ddaf 100755
+--- a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Jupiter Spice Kernels (jup310)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "jup310",
+-    Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
+-- local Kernels = asset.syncedResource({
+--     Name = "Jupiter Spice Kernels (jup310)",
+--     Type = "TorrentSynchronization",
+--     Identifier = "jup310",
+--     Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-- })
+ 
+-asset.export("Kernels", Kernels .. '/jup310.bsp')
+-- asset.export("Kernels", Kernels .. '/jup310.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/mars/mar097.asset b/data/assets/scene/solarsystem/planets/mars/mar097.asset
+index e77d67d..8d738a6 100755
+--- a/data/assets/scene/solarsystem/planets/mars/mar097.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mar097.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Mars Spice Kernels",
+-    Type = "TorrentSynchronization",
+-    Identifier = "mat097",
+-    Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
+-- local Kernels = asset.syncedResource({
+--     Name = "Mars Spice Kernels",
+--     Type = "TorrentSynchronization",
+--     Identifier = "mat097",
+--     Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-- })
+ 
+-asset.export("Kernels", Kernels .. '/mar097.bsp')
+-- asset.export("Kernels", Kernels .. '/mar097.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/neptune/nep081.asset b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
+index e9c49ce..cfb5fac 100755
+--- a/data/assets/scene/solarsystem/planets/neptune/nep081.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Neptune Spice Kernels (nep081)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "nep081",
+-    Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
+-- local Kernels = asset.syncedResource({
+--     Name = "Neptune Spice Kernels (nep081)",
+--     Type = "TorrentSynchronization",
+--     Identifier = "nep081",
+--     Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-- })
+ 
+-asset.export("Kernels", Kernels .. '/nep081.bsp')
+-- asset.export("Kernels", Kernels .. '/nep081.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/saturn/sat375.asset b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
+index a55f2ed..f904b3c 100755
+--- a/data/assets/scene/solarsystem/planets/saturn/sat375.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Saturn Spice Kernels (sat375)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "sat375",
+-    Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
+-})
+-- local Kernels = asset.syncedResource({
+--     Name = "Saturn Spice Kernels (sat375)",
+--     Type = "TorrentSynchronization",
+--     Identifier = "sat375",
+--     Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
+-- })
+ 
+-asset.export("Kernels", Kernels .. '/sat375.bsp')
+-- asset.export("Kernels", Kernels .. '/sat375.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/uranus/ura111.asset b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
+index 665d059..8f95f34 100755
+--- a/data/assets/scene/solarsystem/planets/uranus/ura111.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Uranus Spice Kernels (ura111)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "ura111",
+-    Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
+-- local Kernels = asset.syncedResource({
+--     Name = "Uranus Spice Kernels (ura111)",
+--     Type = "TorrentSynchronization",
+--     Identifier = "ura111",
+--     Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-- })
+ 
+-asset.export("Kernels", Kernels .. '/ura111.bsp')
+-- asset.export("Kernels", Kernels .. '/ura111.bsp')
--- a/pkgs/applications/science/astronomy/openspace/config.patch
+++ b/pkgs/applications/science/astronomy/openspace/config.patch
@ -0,0 +1,49 @@
+diff --git a/openspace.cfg b/openspace.cfg
+index c86830b..e7f89d9 100755
+--- a/openspace.cfg
+++ b/openspace.cfg
+@@ -2,18 +2,21 @@
+ -- require('scripts/configuration_helper.lua')
+ -- which defines helper functions useful to customize the configuration
+ 
+userdir = os.getenv("HOME") .. "/.openspace/"
+os.execute("mkdir -p " .. userdir)
+
+ return {
+     -- Determines which SGCT configuration file is loaded, that is, if there rendering
+     -- occurs in a single window, a fisheye projection, or a dome cluster system
+ 
+     -- A regular 1280x720 window
+-    SGCTConfig = sgct.config.single{},
+    -- SGCTConfig = sgct.config.single{},
+ 
+     -- A regular 1920x1080 window
+     -- SGCTConfig = sgct.config.single{1920, 1080},
+     
+     -- A windowed 1920x1080 fullscreen
+-    -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
+    SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
+ 
+     -- A 1k fisheye rendering
+     -- SGCTConfig = sgct.config.fisheye{1024, 1024},
+@@ -53,15 +56,15 @@ return {
+         TASKS = "${DATA}/tasks",
+         WEB = "${DATA}/web",
+ 
+-        CACHE = "${BASE}/cache",
+        CACHE  = userdir .. "cache",
+         CONFIG = "${BASE}/config",
+-        DOCUMENTATION = "${BASE}/documentation",
+-        LOGS = "${BASE}/logs",
+        DOCUMENTATION = userdir .. "documentation",
+        LOGS    = userdir .. "logs",
+         MODULES = "${BASE}/modules",
+         SCRIPTS = "${BASE}/scripts",
+         SHADERS = "${BASE}/shaders",
+-        SYNC = "${BASE}/sync",
+-        TESTDIR = "${BASE}/tests"
+        SYNC    = userdir .. "sync",
+        TESTDIR = userdir .. "tests"
+     },
+     Fonts = {
+         Mono = "${FONTS}/Bitstream-Vera-Sans-Mono/VeraMono.ttf",
--- a/pkgs/applications/science/astronomy/openspace/constexpr.patch
+++ b/pkgs/applications/science/astronomy/openspace/constexpr.patch
@ -0,0 +1,91 @@
+diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
+index 80a3a96..7059752 100755
+--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
+@@ -159,24 +159,34 @@ constexpr const char* nameForDistanceUnit(DistanceUnit unit, bool pluralForm = f
+ }
+ 
+ constexpr DistanceUnit distanceUnitFromString(const char* unitName) {
+    int result = -1;
+  
+     int i = 0;
+     for (const char* val : DistanceUnitNamesSingular) {
+         if (ghoul::equal(unitName, val)) {
+-            return static_cast<DistanceUnit>(i);
+            result = i;
+            break;
+         }
+         ++i;
+     }
+ 
+-    i = 0;
+-    for (const char* val : DistanceUnitNamesPlural) {
+-        if (ghoul::equal(unitName, val)) {
+-            return static_cast<DistanceUnit>(i);
+    if (result == -1) {
+        i = 0;
+        for (const char* val : DistanceUnitNamesPlural) {
+            if (ghoul::equal(unitName, val)) {
+                result = i;
+                break;
+            }
+            ++i;
+         }
+-        ++i;
+     }
+ 
+-    ghoul_assert(false, "Unit name is not a valid name");
+-    throw ghoul::MissingCaseException();
+    if (result != -1)
+        return static_cast<DistanceUnit>(result);
+    else {
+        ghoul_assert(false, "Unit name is not a valid name");
+        throw ghoul::MissingCaseException();
+    }
+ }
+ 
+ 
+diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
+index a36c92a..699bca9 100755
+--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
+@@ -142,23 +142,32 @@ constexpr const char* nameForTimeUnit(TimeUnit unit, bool pluralForm = false) {
+ }
+ 
+ constexpr TimeUnit timeUnitFromString(const char* unitName) {
+    int result = -1;
+    
+     int i = 0;
+     for (const char* val : TimeUnitNamesSingular) {
+         if (ghoul::equal(unitName, val)) {
+-            return static_cast<TimeUnit>(i);
+            result = i;
+            break;
+         }
+         ++i;
+     }
+ 
+-    i = 0;
+-    for (const char* val : TimeUnitNamesPlural) {
+-        if (ghoul::equal(unitName, val)) {
+-            return static_cast<TimeUnit>(i);
+    if (result == -1) {
+        i = 0;
+        for (const char* val : TimeUnitNamesPlural) {
+            if (ghoul::equal(unitName, val)) {
+                result = i;
+                break;
+            }
+            ++i;
+         }
+-        ++i;
+     }
+ 
+-    throw ghoul::MissingCaseException();
+    if (result != -1)
+        return static_cast<TimeUnit>(result);
+    else
+        throw ghoul::MissingCaseException();
+ }
+ 
+ std::pair<double, std::string> simplifyTime(double seconds,
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake
+, curl, boost, gdal, glew, soil
+, libX11, libXi, libXxf86vm, libXcursor, libXrandr, libXinerama }:
+
+stdenv.mkDerivation rec {
+  version = "0.11.1";
+  name    = "openspace-${version}";
+  
+  src = fetchFromGitHub {
+    owner  = "OpenSpace";
+    repo   = "OpenSpace";
+    rev    = "a65eea61a1b8807ce3d69e9925e75f8e3dfb085d";
+    sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv";
+    fetchSubmodules = true;
+  };
+  
+  buildInputs = [
+    makeWrapper cmake
+    curl boost gdal glew soil
+    libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
+  ];
+      
+  glmPlatformH = fetchurl {
+    url    = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
+    sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
+  };
+  
+  # See <https://github.com/g-truc/glm/issues/726>
+  prePatch = ''
+    cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h
+    cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h
+  '';
+  
+  patches = [
+    # See <https://github.com/opensgct/sgct/issues/13>
+    ./vrpn.patch
+    
+    ./constexpr.patch
+    ./config.patch
+
+    # WARNING: This patch disables some slow torrents in a very dirty way.
+    ./assets.patch 
+  ];
+  
+  bundle = "$out/usr/share/openspace";
+  
+  preConfigure = ''
+    cmakeFlagsArray=(
+      $cmakeFlagsArray
+      "-DCMAKE_BUILD_TYPE="
+      "-DCMAKE_INSTALL_PREFIX=${bundle}"
+    )
+  '';
+  
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p ${bundle}
+  '';
+  
+  postInstall = ''
+    cp ext/spice/libSpice.so       ${bundle}/lib
+    cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib
+  '';
+  
+  postFixup = ''
+    for bin in ${bundle}/bin/*
+    do
+      rpath=$(patchelf --print-rpath $bin)
+      patchelf --set-rpath $rpath:${bundle}/lib $bin
+      
+      name=$(basename $bin)
+      makeWrapper $bin $out/bin/$name --run "cd ${bundle}"
+    done
+  '';
+  
+  meta = {
+    description     = "Open-source astrovisualization project";
+    longDescription = ''
+      OpenSpace is open source interactive data visualization software
+      designed to visualize the entire known universe and portray our
+      ongoing efforts to investigate the cosmos.
+
+      WARNING: This build is not very usable for now.
+    '';
+    homepage  = https://www.openspaceproject.com/;
+    license   = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/science/astronomy/openspace/vrpn.patch
+++ b/pkgs/applications/science/astronomy/openspace/vrpn.patch
@ -0,0 +1,13 @@
+diff --git a/ext/sgct/src/deps/vrpn/vrpn_Connection.C b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
+index d6ffdc5..f90a2b2 100755
+--- a/ext/sgct/src/deps/vrpn/vrpn_Connection.C
+++ b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
+@@ -2489,7 +2489,7 @@ static int vrpn_start_server(const char *machine, char *server_name, char *args,
+ #if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
+             int status; // doesn't exist on sparc_solaris or FreeBSD
+ #else
+-            union wait status;
+            int status;
+ #endif
+ 
+             /* Check to see if they called back yet. */
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@ -1,4 +1,5 @@
 { stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig
+, lib
 , autoreconfHook
 , file
 , flint
@ -9,21 +10,25 @@
 }:

 stdenv.mkDerivation rec {
-  name = "singular-${version}${patchVersion}";
-  version = "4.1.1";
-  patchVersion = "p1";
+  name = "singular-${version}";
+  version = "4.1.1p2";

-  urlVersion = builtins.replaceStrings [ "." ] [ "-" ] version;
-  src = fetchurl {
-    url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}${patchVersion}.tar.gz";
-    sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1";
+  src = let
+    # singular sorts its tarballs in directories by base release (without patch version)
+    # for example 4.1.1p1 will be in the directory 4-1-1
+    baseVersion = builtins.head (lib.splitString "p" version);
+    urlVersion = builtins.replaceStrings [ "." ] [ "-" ] baseVersion;
+  in
+  fetchurl {
+    url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}.tar.gz";
+    sha256 = "07x9kri8vl4galik7lr6pscq3c51n8570pyw64i7gbj0m706f7wf";
  };

  configureFlags = [
    "--with-ntl=${ntl}"
-  ] ++stdenv.lib.optionals enableFactory [
+  ] ++ lib.optionals enableFactory [
    "--enable-factory"
-  ] ++ stdenv.lib.optionals enableGfanlib [
+  ] ++ lib.optionals enableGfanlib [
    "--enable-gfanlib"
  ];

@ -42,7 +47,7 @@ stdenv.mkDerivation rec {
    readline
    ntl
    flint
-  ] ++ stdenv.lib.optionals enableGfanlib [
+  ] ++ lib.optionals enableGfanlib [
    cddlib
  ];
  nativeBuildInputs = [
@ -60,10 +65,12 @@ stdenv.mkDerivation rec {
      -i '{}' ';'
  '';

-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
+  hardeningDisable = lib.optional stdenv.isi686 "stackprotector";

  # The Makefile actually defaults to `make install` anyway
-  buildPhase = "true;";
+  buildPhase = ''
+    # do nothing
+  '';

  installPhase = ''
    mkdir -p "$out"
@ -77,7 +84,7 @@ stdenv.mkDerivation rec {
  # simple test to make sure singular starts and finds its libraries
  doInstallCheck = true;
  installCheckPhase = ''
-    $out/bin/Singular -c 'LIB "freegb.lib"; exit;'
+    "$out/bin/Singular" -c 'LIB "freegb.lib"; exit;'
    if [ $? -ne 0 ]; then
        echo >&2 "Error loading the freegb library in Singular."
        exit 1
@ -86,9 +93,10 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "A CAS for polynomial computations";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin timokau ];
+    # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
    platforms = subtractLists platforms.i686 platforms.linux;
    license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
    homepage = http://www.singular.uni-kl.de;
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -38,6 +38,7 @@ let
    svnSupport = true;
    guiSupport = true;
    sendEmailSupport = !stdenv.isDarwin;
+    withLibsecret = !stdenv.isDarwin;
  };

  # Git with SVN support, but without GUI.
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -12,6 +12,8 @@
 , withpcre2 ? true
 , sendEmailSupport
 , darwin
+, withLibsecret ? false
+, pkgconfig, glib, libsecret
 }:

 assert sendEmailSupport -> perlSupport;
@ -64,7 +66,8 @@ stdenv.mkDerivation {
    ++ stdenv.lib.optionals perlSupport [ perl ]
    ++ stdenv.lib.optionals guiSupport [tcl tk]
    ++ stdenv.lib.optionals withpcre2 [ pcre2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]
+    ++ stdenv.lib.optionals withLibsecret [ pkgconfig glib libsecret ];

  # required to support pthread_cancel()
  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
@ -90,12 +93,14 @@ stdenv.mkDerivation {
  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
  ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";

-  # build git-credential-osxkeychain if darwin
-  postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-    pushd $PWD/contrib/credential/osxkeychain/
-    make
-    popd
-  '';
+
+  postBuild = ''
+    make -C contrib/subtree
+  '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+    make -C contrib/credential/osxkeychain
+  '') + (stdenv.lib.optionalString withLibsecret ''
+    make -C contrib/credential/libsecret
+  '');


  ## Install
@ -105,11 +110,15 @@ stdenv.mkDerivation {

  installFlags = "NO_INSTALL_HARDLINKS=1";

-  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  preInstall = (stdenv.lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/bin
-    cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+    ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/
    rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
-  '';
+  '') + (stdenv.lib.optionalString withLibsecret ''
+    mkdir -p $out/bin
+    ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/
+    rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
+  '');

  postInstall =
    ''
@ -118,10 +127,7 @@ stdenv.mkDerivation {
      }

      # Install git-subtree.
-      pushd contrib/subtree
-      make
-      make install ${stdenv.lib.optionalString withManual "install-doc"}
-      popd
+      make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"}
      rm -rf contrib/subtree

      # Install contrib stuff.
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@ -4,14 +4,14 @@

 stdenv.mkDerivation rec {
  pname = "tig";
-  version = "2.3.3";
+  version = "2.4.0";
  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "jonas";
    repo = pname;
    rev = name;
-    sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap";
+    sha256 = "1d5clkdgj0ip1j0k335pr4dabcnap6jr016q90i49p1jxixy96pb";
  };

  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@ -7,13 +7,13 @@ with stdenv.lib;

 buildGoPackage rec {
  name = "gitea-${version}";
-  version = "1.4.2";
+  version = "1.4.3";

  src = fetchFromGitHub {
    owner = "go-gitea";
    repo = "gitea";
    rev = "v${version}";
-    sha256 = "15iqvfvijg46444pybi7vg7xhl2x0pr5p1416qlc2nakkn3drpi1";
+    sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd";
  };

  patches = [ ./static-root-path.patch ];
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@ -5,7 +5,15 @@

 with lib;

-{ pname
+{ /*
+    pname: Nix package name without special symbols and without version or
+    "emacs-" prefix.
+  */
+  pname
+  /*
+    ename: Original Emacs package name, possibly containing special symbols.
+  */
+, ename ? pname
 , version
 , recipe
 , meta ? {}
@ -35,7 +43,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
  preUnpack = ''
    mkdir -p "$NIX_BUILD_TOP/recipes"
    if [ -n "$recipe" ]; then
-      cp "$recipe" "$NIX_BUILD_TOP/recipes/$pname"
+      cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename"
    fi

    ln -s "$melpa/package-build" "$NIX_BUILD_TOP/package-build"
@ -45,7 +53,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({

  postUnpack = ''
    mkdir -p "$NIX_BUILD_TOP/working"
-    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$pname"
+    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
  '';

  buildPhase =
@ -58,7 +66,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
          -L "$melpa/package-build" \
          -l "$melpa2nix" \
          -f melpa2nix-build-package \
-          $pname $version
+          $ename $version

      runHook postBuild
    '';
@ -66,9 +74,9 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
  installPhase = ''
    runHook preInstall

-    archive="$NIX_BUILD_TOP/packages/$pname-$version.el"
+    archive="$NIX_BUILD_TOP/packages/$ename-$version.el"
    if [ ! -f "$archive" ]; then
-        archive="$NIX_BUILD_TOP/packages/$pname-$version.tar"
+        archive="$NIX_BUILD_TOP/packages/$ename-$version.tar"
    fi

    emacs --batch -Q \
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@ -29,6 +29,8 @@
  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:

+assert !enableIntegerSimple -> gmp != null;
+
 let
  inherit (bootPkgs) ghc;

@ -43,8 +45,7 @@ let
    include mk/flavours/\$(BuildFlavour).mk
    endif
    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
    Stage1Only = YES
    HADDOCK_DOCS = NO
@ -127,7 +128,7 @@ stdenv.mkDerivation rec {
    "--datadir=$doc/share/doc/ghc"
    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@ -34,6 +34,8 @@
  deterministicProfiling ? false
 }:

+assert !enableIntegerSimple -> gmp != null;
+
 let
  inherit (bootPkgs) ghc;

@ -48,8 +50,7 @@ let
    include mk/flavours/\$(BuildFlavour).mk
    endif
    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
    CrossCompilePrefix = ${targetPrefix}
@ -160,8 +161,8 @@ stdenv.mkDerivation rec {
    "--datadir=$doc/share/doc/ghc"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [
    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@ -32,6 +32,8 @@
  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:

+assert !enableIntegerSimple -> gmp != null;
+
 let
  inherit (bootPkgs) ghc;

@ -46,8 +48,7 @@ let
    include mk/flavours/\$(BuildFlavour).mk
    endif
    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
    CrossCompilePrefix = ${targetPrefix}
@ -149,8 +150,8 @@ stdenv.mkDerivation (rec {
  configureFlags = [
    "--datadir=$doc/share/doc/ghc"
    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@ -32,6 +32,8 @@
  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:

+assert !enableIntegerSimple -> gmp != null;
+
 let
  inherit (bootPkgs) ghc;

@ -46,8 +48,7 @@ let
    include mk/flavours/\$(BuildFlavour).mk
    endif
    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
    CrossCompilePrefix = ${targetPrefix}
@ -141,8 +142,8 @@ stdenv.mkDerivation (rec {
  configureFlags = [
    "--datadir=$doc/share/doc/ghc"
    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:

-let version = "0.10.0"; in
+let version = "0.11.2"; in

 stdenv.mkDerivation {
  name = "jsonnet-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
    rev = "v${version}";
    owner = "google";
    repo = "jsonnet";
-    sha256 = "0xj540140r89qrdh3h4kzlz4x8c576ynq9i1x82zzl3d7fxbk5f0";
+    sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
  };

  buildInputs = [ emscripten ];
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@ -1,8 +1,8 @@
 import ./generic.nix {
  major_version = "4";
  minor_version = "07";
-  patch_version = "0+rc1";
-  sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8";
+  patch_version = "0";
+  sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl";

  # If the executable is stripped it does not work
  dontStrip = true;
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@ -2,6 +2,7 @@
 , removeReferencesTo, fetchFromGitHub }:

 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+, shellHook ? ""

 # We want parallel builds by default
 , enableParallelBuilding ? true
@ -198,7 +199,7 @@ go.stdenv.mkDerivation (
  ''
  ) goPath) + ''
    export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
-  '';
+  '' + shellHook;

  disallowedReferences = lib.optional (!allowGoReference) go
    ++ lib.optional (!dontRenameImports) govers;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -416,6 +416,9 @@ self: super: {
  # https://github.com/bos/snappy/issues/1
  snappy = dontCheck super.snappy;

+  # https://github.com/kim/snappy-framing/issues/3
+  snappy-framing = dontHaddock super.snappy-framing;
+
  # https://ghc.haskell.org/trac/ghc/ticket/9625
  vty = dontCheck super.vty;

@ -604,6 +607,11 @@ self: super: {
        url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch;
        sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9";
      })
+      # No instance for (Semigroup Marquee)
+      (pkgs.fetchpatch {
+        url = https://github.com/wjt/bustle/commit/95393cb17c2fe5f0903470a449e36728471759eb.patch;
+        sha256 = "1n7h1rh62731kg9jjs2mn49nx033ds0l33mpgfl75hrjqblz44m1";
+      })
    ];
    postInstall = ''
      make install PREFIX=$out
@ -1078,6 +1086,9 @@ self: super: {
  # https://github.com/phadej/tree-diff/issues/19
  tree-diff = doJailbreak super.tree-diff;

+  # https://github.com/haskell-hvr/hgettext/issues/14
+  hgettext = doJailbreak super.hgettext;
+
  # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
  haddock-library = doJailbreak (dontCheck super.haddock-library);
  haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@ -96,83 +96,4 @@ self: super: {
    haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
  }));

-} // # All the following is needed to build tensorflow.
-(
-let
-  tensorflow-haskell = pkgs.fetchFromGitHub {
-    owner = "tensorflow";
-    repo = "haskell";
-    rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7";
-    sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8";
-    fetchSubmodules = true;
-  };
-in
-{
-  proto-lens-descriptors = super.proto-lens-descriptors.override {
-    proto-lens = self.proto-lens_0_2_2_0;
-    lens-labels = self.lens-labels_0_1_0_2;
-  };
-  proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override {
-    haskell-src-exts = self.haskell-src-exts_1_19_1;
-  };
-  proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override {
-    proto-lens = self.proto-lens_0_2_2_0;
-    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
-  };
-  tensorflow-proto = (super.callPackage (
-    { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
-    , proto-lens-protoc, stdenv
-    }:
-    mkDerivation {
-      pname = "tensorflow-proto";
-      version = "0.1.0.0";
-      src = tensorflow-haskell;
-      setupHaskellDepends = [ base Cabal proto-lens-protoc ];
-      libraryHaskellDepends = [
-        base proto-lens proto-lens-protobuf-types proto-lens-protoc
-      ];
-      libraryToolDepends = [ pkgs.protobuf ];
-      homepage = "https://github.com/tensorflow/haskell#readme";
-      description = "TensorFlow protocol buffers";
-      license = stdenv.lib.licenses.asl20;
-    }
-  ) {
-    proto-lens = self.proto-lens_0_2_2_0;
-    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
-    proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0;
-  }).overrideAttrs (_oldAttrs: {
-    sourceRoot = "source/tensorflow-proto";
-  });
-  tensorflow = (super.callPackage (
-    { mkDerivation, async, attoparsec, base, bytestring, c2hs
-    , containers, data-default, exceptions, fgl, HUnit, lens-family
-    , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv
-    , temporary, libtensorflow, tensorflow-proto, test-framework
-    , test-framework-hunit, test-framework-quickcheck2, text
-    , transformers, vector
-    }:
-    mkDerivation {
-      pname = "tensorflow";
-      version = "0.1.0.2";
-      src = tensorflow-haskell;
-      libraryHaskellDepends = [
-        async attoparsec base bytestring containers data-default exceptions
-        fgl lens-family mainland-pretty mtl proto-lens semigroups split
-        temporary tensorflow-proto text transformers vector
-      ];
-      librarySystemDepends = [ libtensorflow ];
-      libraryToolDepends = [ c2hs ];
-      testHaskellDepends = [
-        attoparsec base bytestring HUnit lens-family proto-lens
-        tensorflow-proto test-framework test-framework-hunit
-        test-framework-quickcheck2
-      ];
-      homepage = "https://github.com/tensorflow/haskell#readme";
-      description = "TensorFlow bindings";
-      license = stdenv.lib.licenses.asl20;
-    }
-  ) {}).overrideAttrs (_oldAttrs: {
-    sourceRoot = "source/tensorflow";
-  });
-}
-)
+} // import ./configuration-tensorflow-ghc-8.2.x.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -2393,6 +2393,7 @@ extra-packages:
  - inline-c < 0.6                      # required on GHC 8.0.x
  - inline-c-cpp < 0.2                  # required on GHC 8.0.x
  - lens-labels == 0.1.*                # required for proto-lens-descriptors
+  - mainland-pretty == 0.6.2.*          # required for tensorflow-opgen-0.1.0.0
  - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
  - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
  - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -471,6 +471,9 @@ self: super: builtins.intersectAttrs super {
    '';
  });

+  # https://github.com/plow-technologies/servant-streaming/issues/12
+  servant-streaming-server = dontCheck super.servant-streaming-server;
+
  # tests run executable, relying on PATH
  # without this, tests fail with "Couldn't launch intero process"
  intero = overrideCabal super.intero (drv: {
--- a/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix
@ -0,0 +1,292 @@
+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+self: super:
+let
+  tensorflow-haskell = pkgs.fetchFromGitHub {
+    owner = "tensorflow";
+    repo = "haskell";
+    rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7";
+    sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8";
+    fetchSubmodules = true;
+  };
+
+  setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";});
+
+  proto-lens = self.proto-lens_0_2_2_0;
+  proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
+  proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0;
+  mainland-pretty = self.mainland-pretty_0_6_2;
+  lens-labels = self.lens-labels_0_1_0_2;
+  haskell-src-exts = self.haskell-src-exts_1_19_1;
+in
+{
+  proto-lens-descriptors = super.proto-lens-descriptors.override {
+    inherit proto-lens lens-labels;
+  };
+  proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override {
+    inherit proto-lens haskell-src-exts;
+  };
+  proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override {
+    inherit proto-lens proto-lens-protoc;
+  };
+  tensorflow-proto = setSourceRoot "tensorflow-proto" (super.callPackage (
+    { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
+    , proto-lens-protoc, stdenv
+    }:
+    mkDerivation {
+      pname = "tensorflow-proto";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+      libraryHaskellDepends = [
+        base proto-lens proto-lens-protobuf-types proto-lens-protoc
+      ];
+      libraryToolDepends = [ pkgs.protobuf ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow protocol buffers";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit proto-lens proto-lens-protoc proto-lens-protobuf-types;
+  });
+  tensorflow = setSourceRoot "tensorflow" (super.callPackage (
+    { mkDerivation, async, attoparsec, base, bytestring, c2hs
+    , containers, data-default, exceptions, fgl, HUnit, lens-family
+    , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv
+    , temporary, libtensorflow, tensorflow-proto, test-framework
+    , test-framework-hunit, test-framework-quickcheck2, text
+    , transformers, vector
+    }:
+    mkDerivation {
+      pname = "tensorflow";
+      version = "0.1.0.2";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        async attoparsec base bytestring containers data-default exceptions
+        fgl lens-family mainland-pretty mtl proto-lens semigroups split
+        temporary tensorflow-proto text transformers vector
+      ];
+      librarySystemDepends = [ libtensorflow ];
+      libraryToolDepends = [ c2hs ];
+      testHaskellDepends = [
+        attoparsec base bytestring HUnit lens-family proto-lens
+        tensorflow-proto test-framework test-framework-hunit
+        test-framework-quickcheck2
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow bindings";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit mainland-pretty proto-lens;
+  });
+  tensorflow-core-ops = setSourceRoot "tensorflow-core-ops" (super.callPackage (
+    { mkDerivation, base, bytestring, Cabal, directory, filepath
+    , lens-family, mainland-pretty, proto-lens, stdenv, tensorflow
+    , tensorflow-opgen, text
+    }:
+    mkDerivation {
+      pname = "tensorflow-core-ops";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      setupHaskellDepends = [
+        base bytestring Cabal directory filepath mainland-pretty proto-lens
+        tensorflow tensorflow-opgen text
+      ];
+      libraryHaskellDepends = [
+        base bytestring lens-family proto-lens tensorflow text
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Haskell wrappers for Core Tensorflow Ops";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit mainland-pretty proto-lens;
+  });
+  tensorflow-logging = setSourceRoot "tensorflow-logging" (super.callPackage (
+    { mkDerivation, base, bytestring, conduit, data-default, directory
+    , exceptions, filepath, hostname, HUnit, lens-family, proto-lens
+    , resourcet, stdenv, stm, stm-chans, stm-conduit, temporary
+    , tensorflow, tensorflow-core-ops, tensorflow-ops, tensorflow-proto
+    , tensorflow-records-conduit, test-framework, test-framework-hunit
+    , text, time, transformers
+    }:
+    mkDerivation {
+      pname = "tensorflow-logging";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        base bytestring conduit data-default directory exceptions filepath
+        hostname lens-family proto-lens resourcet stm stm-chans stm-conduit
+        tensorflow tensorflow-core-ops tensorflow-ops tensorflow-proto
+        tensorflow-records-conduit text time transformers
+      ];
+      testHaskellDepends = [
+        base bytestring conduit data-default directory filepath HUnit
+        lens-family proto-lens resourcet temporary tensorflow
+        tensorflow-proto tensorflow-records-conduit test-framework
+        test-framework-hunit text
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorBoard related functionality";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit proto-lens;
+  });
+  tensorflow-mnist = setSourceRoot "tensorflow-mnist" (super.callPackage (
+    { mkDerivation, base, binary, bytestring, containers, filepath
+    , HUnit, lens-family, proto-lens, split, stdenv, tensorflow
+    , tensorflow-core-ops, tensorflow-mnist-input-data, tensorflow-ops
+    , tensorflow-proto, test-framework, test-framework-hunit, text
+    , transformers, vector, zlib
+    }:
+    mkDerivation {
+      pname = "tensorflow-mnist";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base binary bytestring containers filepath lens-family proto-lens
+        split tensorflow tensorflow-core-ops tensorflow-proto text vector
+        zlib
+      ];
+      executableHaskellDepends = [
+        base bytestring filepath lens-family proto-lens tensorflow
+        tensorflow-mnist-input-data tensorflow-ops tensorflow-proto text
+        transformers vector
+      ];
+      testHaskellDepends = [
+        base bytestring HUnit lens-family proto-lens tensorflow
+        tensorflow-mnist-input-data tensorflow-ops tensorflow-proto
+        test-framework test-framework-hunit text transformers vector
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow demo application for learning MNIST model";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit proto-lens;
+  });
+  tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage (
+    { mkDerivation, base, bytestring, Cabal, cryptonite, directory
+    , filepath, HTTP, network-uri, stdenv
+    }:
+    mkDerivation {
+      pname = "tensorflow-mnist-input-data";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      enableSeparateDataOutput = true;
+      setupHaskellDepends = [
+        base bytestring Cabal cryptonite directory filepath HTTP
+        network-uri
+      ];
+      libraryHaskellDepends = [ base ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Downloader of input data for training MNIST";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {});
+  tensorflow-opgen = setSourceRoot "tensorflow-opgen" (super.callPackage (
+    { mkDerivation, base, bytestring, containers, filepath, lens-family
+    , mainland-pretty, optparse-applicative, proto-lens, semigroups
+    , stdenv, tensorflow-proto, text
+    }:
+    mkDerivation {
+      pname = "tensorflow-opgen";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        base bytestring containers filepath lens-family mainland-pretty
+        optparse-applicative proto-lens semigroups tensorflow-proto text
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Code generation for TensorFlow operations";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit mainland-pretty proto-lens;
+  });
+  tensorflow-ops = setSourceRoot "tensorflow-ops" (super.callPackage (
+    { mkDerivation, base, bytestring, containers, criterion
+    , data-default, deepseq, fgl, HUnit, lens-family, mtl, proto-lens
+    , QuickCheck, random, stdenv, temporary, tensorflow
+    , tensorflow-core-ops, tensorflow-proto, tensorflow-test
+    , test-framework, test-framework-hunit, test-framework-quickcheck2
+    , text, transformers, vector
+    }:
+    mkDerivation {
+      pname = "tensorflow-ops";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        base bytestring containers data-default fgl lens-family mtl
+        proto-lens tensorflow tensorflow-core-ops tensorflow-proto text
+      ];
+      testHaskellDepends = [
+        base bytestring data-default HUnit lens-family proto-lens
+        QuickCheck random temporary tensorflow tensorflow-core-ops
+        tensorflow-proto tensorflow-test test-framework
+        test-framework-hunit test-framework-quickcheck2 transformers vector
+      ];
+      benchmarkHaskellDepends = [
+        base criterion deepseq tensorflow transformers vector
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Friendly layer around TensorFlow bindings";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    inherit proto-lens;
+  });
+  tensorflow-records = setSourceRoot "tensorflow-records" (super.callPackage (
+    { mkDerivation, base, bytestring, cereal, snappy-framing, stdenv
+    , test-framework, test-framework-quickcheck2
+    }:
+    mkDerivation {
+      pname = "tensorflow-records";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [ base bytestring cereal snappy-framing ];
+      testHaskellDepends = [
+        base bytestring cereal test-framework test-framework-quickcheck2
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {});
+  tensorflow-records-conduit = setSourceRoot "tensorflow-records-conduit" (super.callPackage (
+    { mkDerivation, base, bytestring, cereal-conduit, conduit
+    , conduit-extra, exceptions, resourcet, stdenv, tensorflow-records
+    }:
+    mkDerivation {
+      pname = "tensorflow-records-conduit";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        base bytestring cereal-conduit conduit conduit-extra exceptions
+        resourcet tensorflow-records
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Conduit wrappers for TensorFlow.Records.";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {});
+  tensorflow-test = setSourceRoot "tensorflow-test" (super.callPackage (
+    { mkDerivation, base, HUnit, stdenv, vector }:
+    mkDerivation {
+      pname = "tensorflow-test";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [ base HUnit vector ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "Some common functions for test suites";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {});
+}
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -11510,6 +11510,8 @@ self: {
       pname = "ListLike";
       version = "4.6";
       sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1";
+       revision = "1";
+       editedCabalFile = "1mbfywf17nnwy2mc15zrsv0j30y1dpblim49nmndpbygq8j26y8j";
       libraryHaskellDepends = [
         array base bytestring containers deepseq dlist fmlist text
         utf8-string vector
@ -29701,8 +29703,8 @@ self: {
     }:
     mkDerivation {
       pname = "ats-pkg";
-       version = "3.0.0.4";
-       sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s";
+       version = "3.0.0.11";
+       sha256 = "1myqx5hw3khvqwda3iw6fl6ahh8cl5j33g2z1689vvqvivglr2la";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@ -60066,8 +60068,8 @@ self: {
     }:
     mkDerivation {
       pname = "dfinity-radix-tree";
-       version = "0.1.1";
-       sha256 = "1s9yqmx1nlj62xn2khr0y6gwdjrbknz6yk2inir76gbklsc9fw4s";
+       version = "0.2.0";
+       sha256 = "1sdb6zrxkl0r66ip56c9j3as2l0gmbxk0fsxmgxlpak8rglpnv8k";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -60177,6 +60179,43 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "dhall_1_16_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
+     , containers, contravariant, criterion, cryptonite, deepseq, Diff
+     , directory, doctest, exceptions, filepath, haskeline, http-client
+     , http-client-tls, insert-ordered-containers, lens-family-core
+     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
+     , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
+     , tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "dhall";
+       version = "1.16.1";
+       sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring case-insensitive containers
+         contravariant cryptonite Diff directory exceptions filepath
+         haskeline http-client http-client-tls insert-ordered-containers
+         lens-family-core megaparsec memory mtl optparse-applicative parsers
+         prettyprinter prettyprinter-ansi-terminal repline scientific
+         template-haskell text transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base deepseq directory doctest filepath insert-ordered-containers
+         mockery prettyprinter tasty tasty-hunit text vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory text
+       ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "dhall-bash" = callPackage
    ({ mkDerivation, base, bytestring, containers, dhall
     , insert-ordered-containers, neat-interpolation, optparse-generic
@ -60186,6 +60225,8 @@ self: {
       pname = "dhall-bash";
       version = "1.0.14";
       sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
+       revision = "1";
+       editedCabalFile = "1ih8w5q0gnys02hv7hnjxxapfqw4gqmd9xfxn7a05cg2gb30mapr";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -60226,6 +60267,8 @@ self: {
       pname = "dhall-json";
       version = "1.2.1";
       sha256 = "0zf88py0hfrzsa3jq5i8nz0wv8m1b753bdakvykmkj6r0dgd574r";
+       revision = "1";
+       editedCabalFile = "06dr99jwvkabav7krb2dj0c037rdrv5mmm9p8ycvx4b7a1zd86h3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -60268,6 +60311,8 @@ self: {
       pname = "dhall-nix";
       version = "1.1.5";
       sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
+       revision = "1";
+       editedCabalFile = "1k9mb8fm5vxm7asqawvv103y63i81n84py42w7hh72rk3wp3xcnk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -60288,6 +60333,8 @@ self: {
       pname = "dhall-text";
       version = "1.0.11";
       sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
+       revision = "1";
+       editedCabalFile = "0lrp1aknia3y4cz87vh14ns3f273lbca09ssz138wlf3266ka613";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -70895,8 +70942,8 @@ self: {
     }:
     mkDerivation {
       pname = "extralife";
-       version = "0.1.0.2";
-       sha256 = "1ag8rpj8cyq64w9ig4dm4ssws39y5xyr1c1w0qjrv47vr0vvcpi8";
+       version = "0.1.1.0";
+       sha256 = "0kw5lqfldncl1ci6x6izgs16hl0brrlaxin2yis279a5q4kh8xpz";
       libraryHaskellDepends = [
         aeson base bytestring http-client http-client-tls text time
       ];
@ -100907,6 +100954,8 @@ self: {
       pname = "hgettext";
       version = "0.1.31.0";
       sha256 = "0s7kgpjlkkw32rbksic099m9g07czi0vrhcn7mbiyi0lyhcbc7ym";
+       revision = "1";
+       editedCabalFile = "1bd60chlmz1mxl5y0v8hqdlfhdxw68vm45x2phjkz2ibq79a9jjg";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -125156,8 +125205,8 @@ self: {
     }:
     mkDerivation {
       pname = "language-ats";
-       version = "1.2.0.15";
-       sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx";
+       version = "1.2.0.16";
+       sha256 = "1hjp174pfsjj55ksb2x3xlir9v2z5xlnis9cx0d2rz5ff8cwys23";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         ansi-wl-pprint array base composition-prelude containers deepseq
@ -126376,8 +126425,8 @@ self: {
     }:
     mkDerivation {
       pname = "latex-formulae-hakyll";
-       version = "0.2.0.3";
-       sha256 = "0mdfisdcsbr4q74h6zkrs6pacc2pxhq0dwh31jahpix5p8a07psn";
+       version = "0.2.0.4";
+       sha256 = "0q16p3ccql38ri3rnbsx54vj6jn154j3m6vic64zi4nk54g0sc5f";
       libraryHaskellDepends = [
         base hakyll latex-formulae-image latex-formulae-pandoc lrucache
         pandoc-types
@ -126393,8 +126442,8 @@ self: {
     }:
     mkDerivation {
       pname = "latex-formulae-image";
-       version = "0.1.1.3";
-       sha256 = "0qf4906n0vs231hiyq6lxck5h5k0gkp9fsn3b0apx94akhr6v0zh";
+       version = "0.1.1.4";
+       sha256 = "0s3r0qd235lgmw4g5j52r2d97zsr3nd0ikzffgpwigvcbzshddv0";
       libraryHaskellDepends = [
         base directory errors filepath JuicyPixels process temporary
         transformers
@ -126410,8 +126459,8 @@ self: {
     }:
     mkDerivation {
       pname = "latex-formulae-pandoc";
-       version = "0.2.0.5";
-       sha256 = "023l02qlzhxkxkccbqlkhfipgis0657vpn8h6c6hdbc0cnl7cpg6";
+       version = "0.2.0.6";
+       sha256 = "120ckmvd9ykgdxmfidfw9rfifikmg85zh91wvynfwdz27290pz1f";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -131712,16 +131761,16 @@ self: {

  "logic-TPTP" = callPackage
    ({ mkDerivation, alex, ansi-wl-pprint, array, base, containers
-     , happy, mtl, pointed, QuickCheck, syb, transformers
+     , happy, mtl, pointed, QuickCheck, semigroups, syb, transformers
     , transformers-compat
     }:
     mkDerivation {
       pname = "logic-TPTP";
-       version = "0.4.5.0";
-       sha256 = "1xlh33axjl1y70rdjx7vv6710a3i8dll6g725m4b5l9l1c5vflkr";
+       version = "0.4.6.0";
+       sha256 = "06c0c5cr330icp9q11l5mvdf3sd67y31bpc38rvvghqvm1v4zn22";
       libraryHaskellDepends = [
-         ansi-wl-pprint array base containers mtl pointed QuickCheck syb
-         transformers transformers-compat
+         ansi-wl-pprint array base containers mtl pointed QuickCheck
+         semigroups syb transformers transformers-compat
       ];
       libraryToolDepends = [ alex happy ];
       description = "Import, export etc. for TPTP, a syntax for first-order logic";
@ -133747,6 +133796,20 @@ self: {
       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

+  "mainland-pretty_0_6_2" = callPackage
+    ({ mkDerivation, base, containers, srcloc, text, transformers }:
+     mkDerivation {
+       pname = "mainland-pretty";
+       version = "0.6.2";
+       sha256 = "0w3w1176a2lhcin45vf6f886srggqydj4rgjhrghh715cgh5cxxk";
+       libraryHaskellDepends = [
+         base containers srcloc text transformers
+       ];
+       description = "Pretty printing designed for printing source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "mainland-pretty" = callPackage
    ({ mkDerivation, base, containers, srcloc, text, transformers }:
     mkDerivation {
@ -146563,8 +146626,8 @@ self: {
     }:
     mkDerivation {
       pname = "nix-diff";
-       version = "1.0.3";
-       sha256 = "1580gqc5jy2zrd62drwzl1i7lcq0r0l653yi9s0c08a7xk5vsz7h";
+       version = "1.0.4";
+       sha256 = "1ggsqm8bcfvx3l2nji90gwllkq2v832wihf8msfi9br4mqwx234j";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -153699,6 +153762,26 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "path-io_1_4_0" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, exceptions
+     , filepath, hspec, path, temporary, time, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.4.0";
+       sha256 = "0pffdxzn59qm3ifk746sp2g3h2gip2ijs39gwi0k0xn1rkid6ph5";
+       libraryHaskellDepends = [
+         base containers directory dlist exceptions filepath path temporary
+         time transformers unix-compat
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec path transformers unix-compat
+       ];
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "path-pieces" = callPackage
    ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
     mkDerivation {
@ -180495,33 +180578,34 @@ self: {
    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
     , bytestring, case-insensitive, containers, digestive-functors
     , directory, either, errors, exceptions, filepath, heist, hspec
-     , hspec-core, hspec-snap, http-api-data, http-types, HUnit
-     , io-streams, lens, map-syntax, mmorph, mtl, network, network-uri
-     , parsec, process, QuickCheck, servant, snap, snap-core, snap-cors
-     , snap-server, string-conversions, temporary, text, time
-     , transformers, word8
+     , hspec-core, hspec-snap, http-api-data, http-client, http-media
+     , http-types, HUnit, io-streams, lens, map-syntax, mmorph, mtl
+     , network, network-uri, parsec, process, QuickCheck, servant
+     , servant-client, snap, snap-core, snap-cors, snap-server
+     , string-conversions, temporary, text, time, transformers, word8
     }:
     mkDerivation {
       pname = "servant-snap";
-       version = "0.8.1";
-       sha256 = "0l85gs987g6z3r6pqrf79279l1jmxq3pl8xjz62ps0p3ww1rp296";
+       version = "0.8.2";
+       sha256 = "0iyiifr9przbayqjs7ydwbzwad5m79379ypmmfiyvcw9m14syhyk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson attoparsec base base64-bytestring bytestring case-insensitive
-         containers either filepath http-api-data http-types io-streams
-         mmorph mtl network-uri servant snap snap-core snap-server
-         string-conversions text transformers word8
+         containers either filepath http-api-data http-media http-types
+         io-streams mmorph mtl network-uri servant snap snap-core
+         snap-server string-conversions text transformers word8
       ];
       executableHaskellDepends = [
-         aeson base bytestring either errors heist lens map-syntax servant
-         snap snap-core snap-cors snap-server text transformers
+         aeson base bytestring either errors heist http-client lens
+         map-syntax servant servant-client snap snap-core snap-cors
+         snap-server text transformers
       ];
       testHaskellDepends = [
         aeson base base64-bytestring bytestring case-insensitive containers
         digestive-functors directory either exceptions hspec hspec-core
-         hspec-snap http-types HUnit lens mtl network parsec process
-         QuickCheck servant snap snap-core snap-cors snap-server
+         hspec-snap http-types HUnit io-streams lens mtl network parsec
+         process QuickCheck servant snap snap-core snap-cors snap-server
         string-conversions temporary text time transformers
       ];
       description = "A family of combinators for defining webservices APIs and serving them";
@ -180971,7 +181055,7 @@ self: {
       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

-  "serverless-haskell_0_7_1" = callPackage
+  "serverless-haskell_0_7_2" = callPackage
    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
     , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@ -180979,8 +181063,8 @@ self: {
     }:
     mkDerivation {
       pname = "serverless-haskell";
-       version = "0.7.1";
-       sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22";
+       version = "0.7.2";
+       sha256 = "12nkqx8wsbc1l8hka8i0jr84gdf8k1wvsx5m6nabrnp60zxnqjxc";
       libraryHaskellDepends = [
         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
         amazonka-s3 base bytestring case-insensitive http-types iproute
@ -185734,6 +185818,26 @@ self: {
       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

+  "smuggler" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , ghc, ghc-exactprint, hash-store, unordered-containers
+     }:
+     mkDerivation {
+       pname = "smuggler";
+       version = "0.0.0";
+       sha256 = "06myh42zc4rgis6bhng60i4skvm9kmvd63lasycp7198mjf61jsn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers filepath ghc ghc-exactprint hash-store
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory filepath ];
+       description = "Smuggling";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
  "snake" = callPackage
    ({ mkDerivation, base, random, split, terminal-size }:
     mkDerivation {
@ -193806,16 +193910,18 @@ self: {
     }) {};

  "substring-parser" = callPackage
-    ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace
+    ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace, parsers
     , QuickCheck, text
     }:
     mkDerivation {
       pname = "substring-parser";
-       version = "0.4.0.0";
-       sha256 = "0xi3yjgp87515g99qxnhjkcr2ddqc0b6rz0whg2zsi00z1sb6wc3";
-       libraryHaskellDepends = [ attoparsec base dlist NoTrace text ];
+       version = "0.4.1.0";
+       sha256 = "1d49py3dn7jh9y0pqm9in6qhhk5xi8dr8m143h5raqji4q53mfva";
+       libraryHaskellDepends = [
+         attoparsec base dlist NoTrace parsers text
+       ];
       testHaskellDepends = [
-         attoparsec base hspec NoTrace QuickCheck text
+         attoparsec base hspec NoTrace parsers QuickCheck text
       ];
       description = "Match / replace substrings with a parser combinators";
       license = stdenv.lib.licenses.asl20;
@ -198624,10 +198730,10 @@ self: {
  "tensorflow" = callPackage
    ({ mkDerivation, async, attoparsec, base, bytestring, c2hs
     , containers, data-default, exceptions, fgl, HUnit, lens-family
-     , mainland-pretty, mtl, proto-lens, proto-lens-protoc, semigroups
-     , split, temporary, tensorflow, tensorflow-proto, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers, vector
+     , libtensorflow, mainland-pretty, mtl, proto-lens
+     , proto-lens-protoc, semigroups, split, temporary, tensorflow-proto
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, transformers, vector
     }:
     mkDerivation {
       pname = "tensorflow";
@ -198639,7 +198745,7 @@ self: {
         semigroups split temporary tensorflow-proto text transformers
         vector
       ];
-       librarySystemDepends = [ tensorflow ];
+       librarySystemDepends = [ libtensorflow ];
       libraryToolDepends = [ c2hs ];
       testHaskellDepends = [
         attoparsec base bytestring HUnit lens-family proto-lens
@ -198649,7 +198755,7 @@ self: {
       description = "TensorFlow bindings";
       license = stdenv.lib.licenses.asl20;
       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {tensorflow = null;};
+     }) {inherit (pkgs) libtensorflow;};

  "tensorflow-core-ops" = callPackage
    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
@ -207831,7 +207937,7 @@ self: {
     }) {};

  "udev" = callPackage
-    ({ mkDerivation, base, bytestring, udev, posix-paths, unix }:
+    ({ mkDerivation, base, bytestring, posix-paths, systemd, unix }:
     mkDerivation {
       pname = "udev";
       version = "0.1.0.0";
@ -207839,12 +207945,12 @@ self: {
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [ base bytestring posix-paths unix ];
-       libraryPkgconfigDepends = [ udev ];
+       libraryPkgconfigDepends = [ systemd ];
       description = "libudev bindings";
       license = stdenv.lib.licenses.bsd3;
       platforms = [ "i686-linux" "x86_64-linux" ];
       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) udev;};
+     }) {inherit (pkgs) systemd;};

  "udp-conduit" = callPackage
    ({ mkDerivation, base, chunked-data, conduit-combinators
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@ -4,7 +4,7 @@
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }:
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, libtidy }:

 let

@ -230,6 +230,11 @@ let
          configureFlags = ["--with-sodium=${libsodium.dev}"];
          buildInputs = [libsodium];
        };
+
+        tidy = {
+          configureFlags = [ "--with-tidy=${libtidy}" ];
+          buildInputs = [ libtidy ];
+        };
      };

      cfg = {
@ -270,6 +275,7 @@ let
        ztsSupport = config.php.zts or false;
        calendarSupport = config.php.calendar or true;
        sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true;
+        tidySupport = php7 && config.php.tidy or true;
      };

      hardeningDisable = [ "bindnow" ];
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
    description = "ATSC A/52 stream decoder";
    homepage = http://liba52.sourceforge.net/;
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@ -36,5 +36,6 @@ stdenv.mkDerivation {
  meta = {
    description = "ASCII art graphics library";
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.lgpl2;
  };
 }
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ meson ninja pkgconfig ];
  buildInputs = [ at-spi2-core atk dbus glib libxml2 ];

+  doCheck = false; # fails with "No test data file provided"
+
  passthru = {
    updateScript = gnome3.updateScript {
      packageName = pname;
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
  buildInputs = [ dbus glib libX11 libXtst libXi ];

+  doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
+
  passthru = {
    updateScript = gnome3.updateScript {
      packageName = pname;
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@ -5,6 +5,7 @@
 , ninja
 , pkgconfig
 , fixDarwinDylibNames
+, python3
 }:

 stdenv.mkDerivation rec {
@ -12,16 +13,22 @@ stdenv.mkDerivation rec {
  pname = "fribidi";
  version = "1.0.4";

+  outputs = [ "out" "devdoc" ];
+
  # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
  src = fetchurl {
    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
    sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
  };

+  postPatch = ''
+    patchShebangs test
+  '';
+
  nativeBuildInputs = [ meson ninja pkgconfig ];
  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

-  outputs = [ "out" "devdoc" ];
+  checkInptus = [ python3 ];

  meta = with stdenv.lib; {
    homepage = https://github.com/fribidi/fribidi;
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
  propagatedBuildInputs = [ glib gupnp-igd ];

+  doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
+
  meta = {
    homepage = https://nice.freedesktop.org/wiki/;
    description = "The GLib ICE implementation";
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
+, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins
 }:

 stdenv.mkDerivation rec {
@ -11,14 +12,18 @@ stdenv.mkDerivation rec {
    sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
  };

-  preAutoreconf = "rm m4/*";
-  postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c";
+  postPatch = stdenv.lib.optionalString doCheck ''
+    sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
+  '';

+  preAutoreconf = "rm m4/*";
  nativeBuildInputs = [ autoreconfHook pkgconfig ];
  buildInputs = [ ladspaH openssl zlib ];

  propagatedBuildInputs = [ librdf_raptor2 ];

+  inherit doCheck;
+
  meta = {
    description = "Lightweight RDF library with special support for LADSPA plugins";
    homepage = https://sourceforge.net/projects/lrdf/;
--- a/pkgs/development/libraries/soil/default.nix
+++ b/pkgs/development/libraries/soil/default.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip, mesa_noglu, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "soil";
+
+  src = fetchurl {
+    url    = "http://www.lonesock.net/files/soil.zip";
+    sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52";
+  };
+
+  buildInputs = [ unzip mesa_noglu libX11 ];
+  
+  sourceRoot = "Simple OpenGL Image Library/projects/makefile";
+  preBuild   = "mkdir obj";
+  preInstall = "mkdir -p $out/lib $out/include";
+  makeFlags  = [ "LOCAL=$(out)" ];
+
+  meta = {
+    description     = "Simple OpenGL Image Library";
+    longDescription = ''
+      SOIL is a tiny C library used primarily for uploading textures
+      into OpenGL.
+    '';
+    homepage  = https://www.lonesock.net/soil.html;
+    license   = stdenv.lib.licenses.publicDomain;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml-migrate-parsetree }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "ppx_gen_rec";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ];
+
+  buildPhase = "jbuilder build -p ppx_gen_rec";
+
+  inherit (jbuilder) installPhase;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-ppx_gen_rec;
+    description = "ocaml preprocessor that generates a recursive module";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.frontsideair ];
+  };
+}
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "PyYAML";
-  version = "3.12";
+  version = "3.13";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab";
+    sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
  };

  propagatedBuildInputs = [ libyaml ];
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@ -3,11 +3,11 @@

 buildPythonPackage rec {
  pname = "salmon-mail";
-  version = "3.0.1";
+  version = "3.0.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "452557172901d6227a325bbc72fcf61002a53c2342d935457b729303dce71f7e";
+    sha256 = "1p4cv99jaszhfam9qj6parij94n7yzwz4bawfl9qh5syx77wkxg2";
  };

  checkInputs = [ nose jinja2 mock ];
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@ -3,14 +3,14 @@
 with lib;

 stdenv.mkDerivation rec {
-  version = "0.76.0";
+  version = "0.77.0";
  name = "flow-${version}";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "flow";
    rev = "v${version}";
-    sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6";
+    sha256 = "1wcbqw5vwb3wsz9dkhi2k159ms98kn1nw3g9lc2j9w1m8ki41lql";
  };

  installPhase = ''
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ libelf
  ] ++ (with ocamlPackages; [
-    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
+    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx ppx_deriving ppx_gen_rec lwt_log wtf8 dtoa
  ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];

  meta = with stdenv.lib; {
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
  name = "${pname}-${version}";
  pname = "circleci-cli";
-  version = "2018-05-12";
+  version = "0.1.0";

  src = fetchFromGitHub {
    owner = "circleci";
    repo = "local-cli";
-    rev = "2c7c1a74e3c3ffb8eebc03fccd782b1bfe9e940a";
-    sha256 = "0fp0fz0xr7ynp32lqcmaigl9p45wk1hd2gv9i5q5bj9syj3g7qzm";
+    rev = "v${version}";
+    sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@ -4,29 +4,26 @@ Date: Sat, 28 Oct 2017 17:58:17 +0200
 Subject: [PATCH] nix customization: patchelf installed binaries

 ---
- src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
+ src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)

 diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
-index 8aa63db9..4d219826 100644
+index 70c54dcd..f0318986 100644
 --- a/src/rustup-dist/src/component/package.rs
 +++ b/src/rustup-dist/src/component/package.rs
-@@ -99,7 +99,13 @@ impl Package for DirectoryPackage {
+@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
             let src_path = root.join(&path);
 
             match &*part.0 {
-                "file" => try!(builder.copy_file(path.clone(), &src_path)),
+-                "file" => builder.copy_file(path.clone(), &src_path)?,
 +                "file" => {
-+                    try!(builder.copy_file(path.clone(), &src_path));
-+                    nix_patchelf_if_needed(
-+                        &target.prefix().path().join(path.clone()),
-+                        &src_path,
-+                    )
+                    builder.copy_file(path.clone(), &src_path)?;
+                    nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
 +                }
-                 "dir" => try!(builder.copy_dir(path.clone(), &src_path)),
+                 "dir" => builder.copy_dir(path.clone(), &src_path)?,
                 _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
             }
-@@ -117,6 +123,22 @@ impl Package for DirectoryPackage {
+@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
     }
 }
 
@ -50,5 +47,5 @@ index 8aa63db9..4d219826 100644
 // binaries are executable and directories readable. This shouldn't be
 // necessary: the source files *should* have the right permissions,
 -- 
-2.14.1
+2.17.1

--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@ -4,17 +4,17 @@

 rustPlatform.buildRustPackage rec {
  name = "rustup-${version}";
-  version = "1.11.0";
-
-  cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr";
+  version = "1.13.0";

  src = fetchFromGitHub {
    owner = "rust-lang-nursery";
    repo = "rustup.rs";
    rev = version;
-    sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz";
+    sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
  };

+  cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
+
  nativeBuildInputs = [ pkgconfig ];

  buildInputs = [
@ -32,10 +32,12 @@ rustPlatform.buildRustPackage rec {
    '')
  ];

+  doCheck = !stdenv.isAarch64;
+
  postInstall = ''
    pushd $out/bin
    mv rustup-init rustup
-    for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do
+    for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt cargo-clippy; do
      ln -s rustup $link
    done
    popd
--- a/pkgs/games/runelite/default.nix
+++ b/pkgs/games/runelite/default.nix
@ -0,0 +1,53 @@
+{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
+
+  stdenv.mkDerivation rec {
+  name = "runelite-${version}";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar";
+    sha256 = "0q2xx0wrnlg5mrv8nnmnh300r8mqfm8k2p028m7mr09kn18xvkzx";
+  };
+
+  icon = fetchurl {
+    url = "https://github.com/runelite/runelite/raw/master/runelite-client/src/main/resources/runelite.png";
+    sha256 = "0fxzkpsin09giqp7h8z0plxznk5d5j60sv34v1lw61p7d5y2izvr";
+  };
+
+  desktop = makeDesktopItem {
+    name = "RuneLite";
+    type = "Application";
+    exec = "runelite";
+    icon = "${icon}";
+    comment = "Open source Old School RuneScape client";
+    terminal = "false";
+    desktopName = "RuneLite";
+    genericName = "Oldschool Runescape";
+    categories = "Application;Game";
+    startupNotify = null;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  # colon is bash form of no-op (do nothing)
+  unpackPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/share/runelite
+    mkdir -p $out/share/applications
+
+    ln -s ${src} $out/share/runelite/RuneLite.jar
+    ln -s ${desktop}/share/applications/* $out/share/applications
+
+    makeWrapper ${jre}/bin/java $out/bin/runelite \
+    --add-flags "-jar $out/share/runelite/RuneLite.jar"
+  '';
+
+  meta = {
+    description = "Open source Old School RuneScape client";
+    homepage = "https://runelite.net/";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.kmeakin ];
+    platforms = lib.platforms.all;
+  };
+  }
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
    homepage = http://xmoto.tuxfamily.org;
    maintainers = with maintainers; [ raskin viric pSub ];
    platforms = platforms.linux;
+    license = licenses.gpl2;
  };
 }
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ b/pkgs/misc/drivers/xwiimote/default.nix
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
    homepage = http://dvdhrm.github.io/xwiimote;
    description = "Userspace utilities to control connected Nintendo Wii Remotes";
    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mit;
  };

  postInstallPhase = ''
--- a/pkgs/misc/lollypop-portal/default.nix
+++ b/pkgs/misc/lollypop-portal/default.nix
@ -3,7 +3,7 @@
 , kid3, easytag, gobjectIntrospection, wrapGAppsHook }:

 stdenv.mkDerivation rec {
-  name = "lollypop-portal";
+  name = "lollypop-portal-${version}";
  version = "0.9.7";

  src = fetchFromGitLab {
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
    '';
    platforms = platforms.unix; # Cygwin had problems at one point
    maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
+    license = licenses.mit;
  };
 }
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:

 let
-  ver = "2018.1";
+  ver = "2018.2";
 in
 stdenv.mkDerivation rec {
  name = "alfred-${ver}";

  src = fetchurl {
    url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0";
+    sha256 = "0640p9zy1511pl30i5yybqa0s1yqz83291vw1z22jrcsq57rrgib";
  };

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, kernel }:

-let base = "batman-adv-2018.1"; in
+let base = "batman-adv-2018.2"; in

 stdenv.mkDerivation rec {
  name = "${base}-${kernel.version}";

  src = fetchurl {
    url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "12q48dw02p3dswdlrklqd2jxw9n51z1vnnnzpf527jg5pf6v4rmq";
+    sha256 = "1jdqlbn8mp9rycbnkgjsb98pb2c7jzw9mm30d3iga69ycwk5dqyq";
  };

  nativeBuildInputs = kernel.moduleBuildDependencies;
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.14.56";
+  version = "4.14.57";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0b647c9zs7srrxhk48aaln0q92kq7xhq9gvjc6g38fnlqvx6rxfl";
+    sha256 = "046qvgf44sn51g979whzvc6qrbz31gwxwm9xkka93vmqavr415aa";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.17.8";
+  version = "4.17.9";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hkqypjgvr8lyskwk8z3dac8pyi4wappnk25508vs3fy08365h0k";
+    sha256 = "1frsg1qli4922w172mx96n0l7yzhiw6kirzzw4svsq3qsfnxq57x";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.4.142";
+  version = "4.4.143";
  extraMeta.branch = "4.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai";
+    sha256 = "0n737jdk9ms7v7zkhf45nfdg2jcyap4qpzxm162f4q9zz3sh0dif";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.9.113";
+  version = "4.9.114";
  extraMeta.branch = "4.9";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yxwsaxnz0k03b1zj1l95ls8qm2rra9hygnjzh9z60sax56myn63";
+    sha256 = "1c3j82rcnj03bk5s2i11mhksv5l09hmkfs3rpbj5msnrn123ds76";
  };
 } // (args.argsOverride or {}))
--- 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-rc5";
-  modDirVersion = "4.18.0-rc5";
+  version = "4.18-rc6";
+  modDirVersion = "4.18.0-rc6";
  extraMeta.branch = "4.18";

  src = fetchurl {
    url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1r7ia0dc4p8xvyrl5kx9v7ii1m25ly0hg6xyz3zwhaailg1y4jzk";
+    sha256 = "18xz3pk8z87lk85s6q69ia1n4z03hif7yscnl6j8z85fjycwvf6b";
  };

  # Should the testing kernels ever be built on Hydra?
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "atlassian-jira-${version}";
-  version = "7.9.2";
+  version = "7.11.0";

  src = fetchurl {
    url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "05976h6033v2w7d05qnigxmsrm33bg7gmgyzpvis8910fkxrhvhh";
+    sha256 = "0w2fgs5n2zdvxgcx2rn010nz81z4q3z6cbq9hmpyzxy9ygjby2w4";
  };

  phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
    description = "Proprietary issue tracking product, also providing project management functions";
    homepage = https://www.atlassian.com/software/jira;
    license = licenses.unfree;
-    maintainers = with maintainers; [ fpletz globin ];
+    maintainers = with maintainers; [ fpletz globin ciil ];
  };
 }
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack";
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.asl20;
  };
 }
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/pkgs/tools/X11/xrestop/default.nix
@ -14,5 +14,6 @@ stdenv.mkDerivation rec {

  meta = {
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
  };
 }
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@ -14,5 +14,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.nongnu.org/atool;
    description = "Archive command line helper";
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
  };
 }
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
    homepage = https://frippery.org/uml/;
    description = "Zero free blocks from ext2, ext3 and ext4 file-systems";
    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.theuni ];
  };
 }
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    platforms = platforms.linux;
    maintainers = with maintainers; [ cstrahan ];
+    license = licenses.asl20;
  };
 }
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
    downloadPage = "http://ftp.gnu.org/gnu/barcode/";
    updateWalker = true;
    homepage = http://ftp.gnu.org/gnu/barcode/;
+    license = licenses.gpl3;
  };
 }
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@ -6,7 +6,7 @@

 let
  python = python3Packages.python;
-  version = "1.5";
+  version = "1.6";
 in
  stdenv.mkDerivation {
    name = "autorandr-${version}";
@ -48,7 +48,7 @@ in
      owner = "phillipberndt";
      repo = "autorandr";
      rev = "${version}";
-      sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq";
+      sha256 = "0m4lqqinr1mqf536gll7qyrnz86ca322pf99lagj00x0r8yj9liy";
    };

    meta = {
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {

    platforms = with stdenv.lib.platforms; linux;
    maintainers = with stdenv.lib.maintainers; [ smironov ];
+    license = stdenv.lib.licenses.gpl3;
  };
 }

--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
    homepage = http://axel.alioth.debian.org/;
    maintainers = with maintainers; [ pSub ];
    platforms = with platforms; linux;
+    license = licenses.gpl2;
  };
 }
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@ -3,7 +3,6 @@

 # for update.nix
 , writeScript
-, runCommand
 , common-updater-scripts
 , bash
 , coreutils
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
    inherit (stdenv) lib;
    inherit
      writeScript
-      runCommand
      common-updater-scripts
      bash
      coreutils
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@ -2,11 +2,11 @@

 pythonPackages.buildPythonApplication rec {
  pname = "vulnix";
-  version = "1.7";
+  version = "1.7.1";

  src = pythonPackages.fetchPypi {
    inherit pname version;
-    sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj";
+    sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m";
  };

  buildInputs = [ ronn ];
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@ -18,6 +18,6 @@ buildGoPackage rec {
    homepage = https://github.com/cjbassi/gotop;
    license = licenses.agpl3;
    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/tools/system/gptfdisk/cross-makefile.patch
+++ b/pkgs/tools/system/gptfdisk/cross-makefile.patch
@ -1,20 +0,0 @@
-commit a5381e8aaa67647a4ba0fb41b951125ae309b078
-Author: Shea Levy <shea@shealevy.com>
-Date:   Sat Feb 24 08:35:54 2018 -0500
-
-    Makefile: Don't hard-code CC and CXX.
-    
-    These variables should be provided by the Make implementation and the
-    build environment. In particular, this fixes cross-compilation of
-    gptfdisk.
-
-diff --git a/Makefile b/Makefile
-index a3576b3..d76fab4 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,3 @@
-CC=gcc
-CXX=g++
- CFLAGS+=-D_FILE_OFFSET_BITS=64
- #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
- CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@ -2,18 +2,16 @@

 stdenv.mkDerivation rec {
  name = "gptfdisk-${version}";
-  version = "1.0.3";
+  version = "1.0.4";

  src = fetchurl {
-    # http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
+    # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
    # page clearly implies a preference for using SourceForge's bandwidth:
    url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
-    sha256 = "0p0vr67lnqdsgdv2y144xmjqa1a2nijrrd3clc8dc2f46pn5mzc9";
+    sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
  };
-  # https://sourceforge.net/p/gptfdisk/code/merge-requests/9/
-  patches = [ ./cross-makefile.patch ];

-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
    substituteInPlace Makefile.mac --replace \
      "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
    substituteInPlace Makefile.mac --replace \
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
    license = licenses.gpl2;
-    homepage = http://www.rodsbooks.com/gdisk/;
+    homepage = https://www.rodsbooks.com/gdisk/;
    platforms = platforms.all;
  };
 }
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
    homepage = https://github.com/mvdan/xurls;
    maintainers = with maintainers; [ koral ndowens ];
    platforms = platforms.unix;
+    license = licenses.bsd3;
  };
 }
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
    description = "A console tool to create ZIM files";
    homepage = http://git.wikimedia.org/log/openzim;
    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; [ linux ];
  };
 }
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@ -32,6 +32,7 @@ let auctex = stdenv.mkDerivation ( rec {
    description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
    homepage = http://www.gnu.org/software/auctex;
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
  };
 });

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -4910,6 +4910,8 @@ with pkgs;

  rubocop = callPackage ../development/tools/rubocop { };

+  runelite = callPackages ../games/runelite { };
+
  runningx = callPackage ../tools/X11/runningx { };

  runzip = callPackage ../tools/archivers/runzip { };
@ -11826,6 +11828,8 @@ with pkgs;

  sofia_sip = callPackage ../development/libraries/sofia-sip { };

+  soil = callPackage ../development/libraries/soil { };
+  
  sonic = callPackage ../development/libraries/sonic { };

  soprano = callPackage ../development/libraries/soprano { };
@ -13769,11 +13773,6 @@ with pkgs;
        # kernelPatches.cpu-cgroup-v2."4.11"
        kernelPatches.modinst_arg_list_too_long
        kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
-        # https://github.com/NixOS/nixpkgs/issues/42755
-        # Remove these xen-netfront patches once they're included in
-        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
-        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
-        kernelPatches.xen-netfront_update_features_after_registering_netdev
      ];
  };

@ -20909,6 +20908,8 @@ with pkgs;

  spyder = pythonPackages.spyder;

+  openspace = callPackage ../applications/science/astronomy/openspace { };
+  
  stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { };

  tulip = callPackage ../applications/science/misc/tulip {
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -640,6 +640,8 @@ let

    ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};

+    ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
+
    ppx_import = callPackage ../development/ocaml-modules/ppx_import {};

    ppx_tools =
@ -1067,7 +1069,7 @@ in rec

  ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { });

-  ocamlPackages_latest = ocamlPackages_4_06;
+  ocamlPackages_latest = ocamlPackages_4_07;

  ocamlPackages =
    # OCaml 4.05 is broken on aarch64