Merge remote-tracking branch 'upstream/master' into staging

2018-04-12 01:50:17 +02:00 · 2018-04-12 01:50:17 +02:00 · fc3a467b22
commit fc3a467b22
parent 0884027ef5 d2ce3a9bda
61 changed files with 1576 additions and 1617 deletions
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@ -36,9 +36,6 @@ let
      ${cfg.extraConfig}
    '';

-  pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
-
-
 in

 {
@ -182,7 +179,7 @@ in
    services.postgresql.authentication = mkAfter
      ''
        # Generated file; do not edit!
-        local all all              ident ${optionalString pre84 "sameuser"}
+        local all all              ident
        host  all all 127.0.0.1/32 md5
        host  all all ::1/128      md5
      '';
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@ -452,7 +452,7 @@ in
                              }) snapshotNames);

      systemd.timers = let
-                         timer = name: if name == "frequent" then "*:15,30,45" else name;
+                         timer = name: if name == "frequent" then "*:0,15,30,45" else name;
                       in builtins.listToAttrs (map (snapName:
                            {
                              name = "zfs-snapshot-${snapName}";
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@ -1,5 +1,5 @@
-{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3,
-  tag ? "",
+{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
+  tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection,
  gst_all_1, withGstPlugins ? true,
  xineBackend ? false, xineLib,
  withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -7,38 +7,53 @@
  keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }:

 let optionals = stdenv.lib.optionals; in
-python2Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  name = "quodlibet${tag}-${version}";
-  version = "3.9.1";
+  version = "4.0.2";

  # XXX, tests fail
+  # https://github.com/quodlibet/quodlibet/issues/2820
  doCheck = false;

  src = fetchurl {
    url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
-    sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591";
+    sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz";
  };

  nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
-  # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps

-  buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ]
+  checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
+
+  buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ]
    ++ (if xineBackend then [ xineLib ] else with gst_all_1;
    [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

-  propagatedBuildInputs = with python2Packages;
-    [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ]
+  propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ]
      ++ optionals withDbusPython [ dbus-python ]
      ++ optionals withPyInotify [ pyinotify ]
      ++ optionals withMusicBrainzNgs [ musicbrainzngs ]
      ++ optionals stdenv.isDarwin [ pyobjc ]
      ++ optionals withPahoMqtt [ paho-mqtt ];

-  makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ];
+  LC_ALL = "en_US.UTF-8";

-  meta = {
+  checkPhase = ''
+    runHook preCheck
+    checkHomeDir=$(mktemp -d)
+    mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file
+    env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \
+      HOME=$checkHomeDir \
+      xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+        --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+        py.test
+    runHook postCheck
+  '';
+
+  preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)";
+
+  meta = with stdenv.lib; {
    description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2Plus;

    longDescription = ''
      Quod Libet is a GTK+-based audio player written in Python, using
@ -54,7 +69,7 @@ python2Packages.buildPythonApplication rec {
      & internet radio, and all major audio formats.
    '';

-    maintainers = with stdenv.lib.maintainers; [ coroa sauyon ];
+    maintainers = with maintainers; [ coroa sauyon ];
    homepage = https://quodlibet.readthedocs.io/en/latest/;
  };
 }
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@ -7,6 +7,11 @@ let
    };
    inherit (gnome2) GConf gnome_vfs;
  };
+  stableVersion = {
+    version = "3.1.1.0"; # "Android Studio 3.1.1"
+    build = "173.4697961";
+    sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8";
+  };
  latestVersion = {
    version = "3.2.0.9"; # "Android Studio 3.2 Canary 10"
    build = "181.4705630";
@ -18,12 +23,9 @@ in rec {

  # Attributes are named by the corresponding release channels

-  stable = mkStudio {
+  stable = mkStudio (stableVersion // {
    pname = "android-studio";
    #pname = "android-studio-stable"; # TODO: Rename and provide symlink
-    version = "3.1.0.16"; # "Android Studio 3.1"
-    build = "173.4670197";
-    sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";

    meta = with stdenv.lib; {
      description = "The Official IDE for Android (stable channel)";
@ -36,20 +38,17 @@ in rec {
      platforms = [ "x86_64-linux" ];
      maintainers = with maintainers; [ primeos ];
    };
-  };
+  });

-  beta = mkStudio {
+  beta = mkStudio (stableVersion // {
    pname = "android-studio-preview";
    #pname = "android-studio-beta"; # TODO: Rename and provide symlink
-    version = "3.1.0.16"; # "Android Studio 3.1"
-    build = "173.4670197";
-    sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";

    meta = stable.meta // {
      description = "The Official IDE for Android (beta channel)";
      homepage = https://developer.android.com/studio/preview/index.html;
    };
-  };
+  });

  dev = mkStudio (latestVersion // {
    pname = "android-studio-dev";
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@ -0,0 +1,30 @@
+{ lib, fetchurl, stdenv, coreutils, ncurses, lua }:
+
+stdenv.mkDerivation rec {
+  name = "dit-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz";
+    sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784";
+  };
+
+  buildInputs = [ coreutils ncurses lua ];
+
+  prePatch = ''
+    patchShebangs tools/GenHeaders
+  '';
+
+  # needs GNU tail for tail -r
+  postPatch = ''
+    substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A console text editor for Unix that you already know how to use";
+    homepage = https://hisham.hm/dit/;
+    license = licenses.gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -713,10 +713,10 @@
    ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
    elpaBuild {
        pname = "ebdb";
-        version = "0.5";
+        version = "0.5.2";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.5.tar";
-          sha256 = "1apsb08ml50nacqa6i86zwa2xxdfqry380bksp16zv63cj86b67g";
+          url = "https://elpa.gnu.org/packages/ebdb-0.5.2.tar";
+          sha256 = "09ff6kf74r6hg3m6lryrjr2rrczm9h702jpkap71xrj0fk4zfb5c";
        };
        packageRequires = [ cl-lib emacs seq ];
        meta = {
@ -768,10 +768,10 @@
    el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
    elpaBuild {
        pname = "el-search";
-        version = "1.6.3";
+        version = "1.6.5";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.6.3.tar";
-          sha256 = "1yd8qlq95fb5qfmg3m16i9d5nsmkkgr12q0981r5ng06pc0j4al6";
+          url = "https://elpa.gnu.org/packages/el-search-1.6.5.tar";
+          sha256 = "1iw13ifyrga2r2xz63zhjxiy541jy4p2rp3a8fgb22sjw1zi8n7w";
        };
        packageRequires = [ cl-print emacs stream ];
        meta = {
@ -931,10 +931,10 @@
    gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
    elpaBuild {
        pname = "gited";
-        version = "0.4.1";
+        version = "0.4.3";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.4.1.tar";
-          sha256 = "0080jcr10xvvf2rl7ar01c6zmzd0pafrs6w2l8v4cwwapyhv0dcd";
+          url = "https://elpa.gnu.org/packages/gited-0.4.3.tar";
+          sha256 = "07sjrh7900v5gkjzac2hh05ygywp6k4803ikc3wj3x22yrc9l8bx";
        };
        packageRequires = [ cl-lib emacs ];
        meta = {
--- 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
@ -94,9 +94,6 @@ self:
      # Expects bash to be at /bin/bash
      flycheck-rtags = markBroken super.flycheck-rtags;

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

@ -164,9 +161,6 @@ self:
      # upstream issue: missing file header
      qiita = markBroken super.qiita;

-      # upstream issue: missing package version
-      quack = markBroken super.quack;
-
      # upstream issue: missing file header
      railgun = markBroken super.railgun;

--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@ -2408,6 +2408,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "banner-comment";
+        version = "2.5";
+        src = fetchFromGitHub {
+          owner = "WJCFerguson";
+          repo = "banner-comment";
+          rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52";
+          sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment";
+          sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc";
+          name = "banner-comment";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/banner-comment";
+          license = lib.licenses.free;
+        };
+      }) {};
    base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "base16-theme";
@ -3608,12 +3629,12 @@
    caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "caml";
-        version = "4.6.1";
+        version = "4.7.0beta2";
        src = fetchFromGitHub {
          owner = "ocaml";
          repo = "ocaml";
-          rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56";
-          sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7";
+          rev = "c0bd6a27e138911560f43dc75d5fde2ade4d6cfe";
+          sha256 = "0z08mpvfa5jvbdxkx9wlarn1zpp01aaxasmy63cz452jr8zg0nll";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@ -4233,6 +4254,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }:
+    melpaBuild {
+        pname = "citeproc";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "andras-simonyi";
+          repo = "citeproc-el";
+          rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84";
+          sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc";
+          sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq";
+          name = "citeproc";
+        };
+        packageRequires = [ dash emacs f queue s string-inflection ];
+        meta = {
+          homepage = "https://melpa.org/#/citeproc";
+          license = lib.licenses.free;
+        };
+      }) {};
    cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "cl-format";
@ -5514,12 +5556,12 @@
    company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
    melpaBuild {
        pname = "company-web";
-        version = "2.0";
+        version = "2.1";
        src = fetchFromGitHub {
          owner = "osv";
          repo = "company-web";
-          rev = "935c65de0411ebbcb4f2223f31e756e093eaae07";
-          sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy";
+          rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a";
+          sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
@ -6522,12 +6564,12 @@
    daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "daemons";
-        version = "1.1.0";
+        version = "1.2.0";
        src = fetchFromGitHub {
          owner = "cbowdon";
          repo = "daemons.el";
-          rev = "75b54be70a909282b20c872b5f01d30e18e19f84";
-          sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c";
+          rev = "9e6868e2559ea7d70fbad8c419798124f406cc40";
+          sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
@ -7236,12 +7278,12 @@
    dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "dired-fdclone";
-        version = "1.5.2";
+        version = "1.5.4";
        src = fetchFromGitHub {
          owner = "knu";
          repo = "dired-fdclone.el";
-          rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf";
-          sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
+          rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c";
+          sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone";
@ -8250,12 +8292,12 @@
    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
    melpaBuild {
        pname = "easy-hugo";
-        version = "3.2.23";
+        version = "3.2.24";
        src = fetchFromGitHub {
          owner = "masasam";
          repo = "emacs-easy-hugo";
-          rev = "161354d0f06e2cdbe63610fb11880ae54e050181";
-          sha256 = "12dxb0kzb02h6zal65n6bviy3zdkqjfbzsf7ncsbbmq8f1xrajmc";
+          rev = "fbcd7dfd737e6ec90f7bee6a911ff66e86577a64";
+          sha256 = "1yabqf8mksadfab7pfk87a3yimda3x6la2kvrxf76kbzbl23h3dx";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8271,12 +8313,12 @@
    easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "easy-jekyll";
-        version = "1.6.12";
+        version = "1.6.13";
        src = fetchFromGitHub {
          owner = "masasam";
          repo = "emacs-easy-jekyll";
-          rev = "faeff895ab2aa0ee9c6df18046817e8a3f0b62a1";
-          sha256 = "1dp1r16rr5gqbh3aw900v2jz146c3qnlbjf5k75fazdglkbnagxk";
+          rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671";
+          sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@ -9140,12 +9182,12 @@
    elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "elfeed-protocol";
-        version = "0.5.2";
+        version = "0.5.3";
        src = fetchFromGitHub {
          owner = "fasheng";
          repo = "elfeed-protocol";
-          rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b";
-          sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs";
+          rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec";
+          sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@ -9840,12 +9882,12 @@
    emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "emms-player-mpv";
-        version = "0.0.13";
+        version = "0.1.0";
        src = fetchFromGitHub {
          owner = "dochang";
          repo = "emms-player-mpv";
-          rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7";
-          sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564";
+          rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3";
+          sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@ -10777,22 +10819,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "eslintd-fix";
-        version = "1.0.0";
+        version = "1.1.0";
        src = fetchFromGitHub {
          owner = "aaronjensen";
          repo = "eslintd-fix";
-          rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773";
-          sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33";
+          rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec";
+          sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
          sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
          name = "eslintd-fix";
        };
-        packageRequires = [];
+        packageRequires = [ dash emacs ];
        meta = {
          homepage = "https://melpa.org/#/eslintd-fix";
          license = lib.licenses.free;
@ -11344,22 +11386,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "evil-nerd-commenter";
-        version = "3.1.3";
+        version = "3.2.2";
        src = fetchFromGitHub {
          owner = "redguardtoo";
          repo = "evil-nerd-commenter";
-          rev = "41d43709210711c07de69497c5f7db646b7e7a96";
-          sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
+          rev = "8f6fafcce901a7a588f946b26d2e21c65e36e843";
+          sha256 = "0pldzwvkic9ikrgzrvmcaq6y0yjplxinvyh61iqlgw2k7k8jld1f";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
          sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
          name = "evil-nerd-commenter";
        };
-        packageRequires = [];
+        packageRequires = [ emacs ];
        meta = {
          homepage = "https://melpa.org/#/evil-nerd-commenter";
          license = lib.licenses.free;
@ -12047,12 +12089,12 @@
    eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "eziam-theme";
-        version = "0.4.5";
+        version = "1.0";
        src = fetchFromGitHub {
          owner = "thblt";
          repo = "eziam-theme-emacs";
-          rev = "4a79230739cfaa607f39fbfe53339692b83c3933";
-          sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8";
+          rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1";
+          sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@ -12358,6 +12400,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fill-function-arguments";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "fill-function-arguments";
+          rev = "e819fca19a138ae67201220e41fe1d4384fb2a42";
+          sha256 = "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments";
+          sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0";
+          name = "fill-function-arguments";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fill-function-arguments";
+          license = lib.licenses.free;
+        };
+      }) {};
    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "finalize";
@ -12403,12 +12466,12 @@
    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
    melpaBuild {
        pname = "find-file-in-project";
-        version = "5.6.0";
+        version = "5.6.4";
        src = fetchFromGitHub {
          owner = "technomancy";
          repo = "find-file-in-project";
-          rev = "ad6c8fce30ac927b4c2297894b6436e1cf724501";
-          sha256 = "1mq544h03laphwvcff2qaxdbb7krmnw1vxmnc9jchz8ascx2x28n";
+          rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361";
+          sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -13208,12 +13271,12 @@
    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
    melpaBuild {
        pname = "flycheck-objc-clang";
-        version = "2.0.1";
+        version = "2.0.2";
        src = fetchFromGitHub {
          owner = "GyazSquare";
          repo = "flycheck-objc-clang";
-          rev = "07f17d1dbe878fdcabac791a8916ddf643571a68";
-          sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9";
+          rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5";
+          sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@ -13334,12 +13397,12 @@
    flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
    melpaBuild {
        pname = "flycheck-pycheckers";
-        version = "0.7.1";
+        version = "0.8";
        src = fetchFromGitHub {
          owner = "msherry";
          repo = "flycheck-pycheckers";
-          rev = "bb814165f12ad25d93f6c224502887c89089e750";
-          sha256 = "14g3ia2nr12068rq1695lz5xnm30x8ngbcq1pxqf0pmaka4akf8l";
+          rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7";
+          sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@ -14024,27 +14087,6 @@
          license = lib.licenses.free;
        };
      }) {};
-    fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fm";
-        version = "1.0";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "fm";
-          rev = "6266840de17ac396dd7275a71da72cd5120c35a6";
-          sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm";
-          sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
-          name = "fm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/fm";
-          license = lib.licenses.free;
-        };
-      }) {};
    fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "fn";
@ -14087,48 +14129,6 @@
          license = lib.licenses.free;
        };
      }) {};
-    fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fold-dwim";
-        version = "1.2";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "fold-dwim";
-          rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0";
-          sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim";
-          sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d";
-          name = "fold-dwim";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/fold-dwim";
-          license = lib.licenses.free;
-        };
-      }) {};
-    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fold-dwim-org";
-        version = "0.6";
-        src = fetchFromGitHub {
-          owner = "mattfidler";
-          repo = "fold-dwim-org";
-          rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
-          sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org";
-          sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
-          name = "fold-dwim-org";
-        };
-        packageRequires = [ fold-dwim ];
-        meta = {
-          homepage = "https://melpa.org/#/fold-dwim-org";
-          license = lib.licenses.free;
-        };
-      }) {};
    fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "fold-this";
@ -14518,12 +14518,12 @@
    futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "futhark-mode";
-        version = "0.3.1";
+        version = "0.4.0";
        src = fetchFromGitHub {
          owner = "HIPERFIT";
          repo = "futhark";
-          rev = "631c493b97b3e2f928892fb25fa29daca4927f83";
-          sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68";
+          rev = "7b3af8ea3d4985682464bfeb174376da8f90c5da";
+          sha256 = "02q6gc7wj02vmxnhh58a6yy5wdjhd2fmk935dh70dl3fs0yqr52p";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@ -17319,12 +17319,12 @@
    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
    melpaBuild {
        pname = "helm";
-        version = "2.9.0";
+        version = "2.9.2";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69";
-          sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy";
+          rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28";
+          sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -17655,12 +17655,12 @@
    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "helm-core";
-        version = "2.9.0";
+        version = "2.9.2";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69";
-          sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy";
+          rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28";
+          sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -18768,12 +18768,12 @@
    helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
    melpaBuild {
        pname = "helm-system-packages";
-        version = "1.8.0";
+        version = "1.9.0";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm-system-packages";
-          rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3";
-          sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz";
+          rev = "f1aeafd3de4d434fb89b9f65b863c9a53a7d2feb";
+          sha256 = "194f2in1k4g9fm66q63ayqmrg5shj807nq4phmkgfm02p1hj7v5w";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@ -19332,27 +19332,6 @@
          license = lib.licenses.free;
        };
      }) {};
-    hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "hl-sexp";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "hl-sexp";
-          rev = "0606100422321c18db51ceda80f25cd7717c2e01";
-          sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp";
-          sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm";
-          name = "hl-sexp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/hl-sexp";
-          license = lib.licenses.free;
-        };
-      }) {};
    hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "hl-todo";
@ -21098,12 +21077,12 @@
    ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
    melpaBuild {
        pname = "ivy-mpdel";
-        version = "0.3.0";
+        version = "0.4.0";
        src = fetchFromGitHub {
          owner = "mpdel";
          repo = "ivy-mpdel";
-          rev = "271673afc60fdb78052cbee390f2f4e6db0f83ec";
-          sha256 = "02ijq7z3j3hzaazpgdf38n02w1yid2702nc7n46bg0zs2dl10p53";
+          rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d";
+          sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
@ -21978,12 +21957,12 @@
    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "kaolin-themes";
-        version = "1.3.1";
+        version = "1.3.2";
        src = fetchFromGitHub {
          owner = "ogdenwebb";
          repo = "emacs-kaolin-themes";
-          rev = "8a229fcd1d73876920a063f0eba906a5080275a7";
-          sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911";
+          rev = "0a80628e083db6e9d4b4af73be5d917d7d667330";
+          sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@ -24289,12 +24268,12 @@
    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
    melpaBuild {
        pname = "meghanada";
-        version = "0.9.2";
+        version = "1.0.0";
        src = fetchFromGitHub {
          owner = "mopemope";
          repo = "meghanada-emacs";
-          rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0";
-          sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8";
+          rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788";
+          sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@ -24939,12 +24918,12 @@
    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "monokai-theme";
-        version = "3.5.2";
+        version = "3.5.3";
        src = fetchFromGitHub {
          owner = "oneKelvinSmith";
          repo = "monokai-emacs";
-          rev = "da23ef64d4848636e47a026259526575381bd164";
-          sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf";
+          rev = "1143c072f5153ae1a69807e5e8af163069b947d2";
+          sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@ -25820,12 +25799,12 @@
    neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "neon-mode";
-        version = "1.2.2";
+        version = "1.3.0";
        src = fetchFromGitHub {
          owner = "Fuco1";
          repo = "neon-mode";
-          rev = "044040df9e83a015ddfe58940b503b6197fc29ce";
-          sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa";
+          rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d";
+          sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@ -25967,12 +25946,12 @@
    nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "nix-mode";
-        version = "1.2.1";
+        version = "1.2.2";
        src = fetchFromGitHub {
          owner = "NixOS";
          repo = "nix-mode";
-          rev = "d5e839692a1273b128003eaed543318e7e5965a7";
-          sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
+          rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660";
+          sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
@ -26132,11 +26111,11 @@
      }) {};
    notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
        pname = "notmuch";
-        version = "0.26";
+        version = "0.26.1";
        src = fetchgit {
          url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583";
-          sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f";
+          rev = "ea690a44d1a5af3da496b0d9482471cbd9623231";
+          sha256 = "0c9ihkwg2p2sq1zkribbc4k60sl5zdi3sgcy0v2amydsk5kkfy3r";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
@ -27336,6 +27315,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-index";
+        version = "5.8.7";
+        src = fetchFromGitHub {
+          owner = "marcihm";
+          repo = "org-index";
+          rev = "2cbd9da2c7a6e4039e32665675370ae4e2b8e6cb";
+          sha256 = "10gm329bnbzjr8d0syw90iniann46mb5mirviy9r2q9w6xqjkbd0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
+          sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5";
+          name = "org-index";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-index";
+          license = lib.licenses.free;
+        };
+      }) {};
    org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
    melpaBuild {
        pname = "org-jira";
@ -27357,22 +27357,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-journal";
-        version = "1.13.0";
+        version = "1.13.3";
        src = fetchFromGitHub {
          owner = "bastibe";
          repo = "org-journal";
-          rev = "5fddd231b9848f09daab3f0928e4d6e570b15174";
-          sha256 = "1xl5nkndvlxv5in6x2lq9lkvafqh7zwyyzr6vrcdp1wv4qb207m2";
+          rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800";
+          sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
          sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
          name = "org-journal";
        };
-        packageRequires = [];
+        packageRequires = [ emacs ];
        meta = {
          homepage = "https://melpa.org/#/org-journal";
          license = lib.licenses.free;
@ -27811,12 +27811,12 @@
    org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-static-blog";
-        version = "1.1.1";
+        version = "1.1.2";
        src = fetchFromGitHub {
          owner = "bastibe";
          repo = "org-static-blog";
-          rev = "8ea4456b0ca5642fff5868e54fe23f3b5109a579";
-          sha256 = "0zh1vb6q8xwaawizv9rq86ahpvxsmrjrzhgh6k4xv6rx8k7k1i7g";
+          rev = "ab4ad93a23e5402b5276c061945872dd6d586e75";
+          sha256 = "07j4gyw22372nlfbaf94w6a7pza01zp6ivsg9iq2hcnx5pniv7hz";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
@ -28342,27 +28342,6 @@
          license = lib.licenses.free;
        };
      }) {};
-    osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "osx-plist";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "osx-plist";
-          rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0";
-          sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist";
-          sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
-          name = "osx-plist";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/osx-plist";
-          license = lib.licenses.free;
-        };
-      }) {};
    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "osx-pseudo-daemon";
@ -30990,22 +30969,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "psession";
-        version = "1.3";
+        version = "1.4";
        src = fetchFromGitHub {
          owner = "thierryvolpiatto";
          repo = "psession";
-          rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc";
-          sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53";
+          rev = "c48b0574e1477437b4427e78d018f858b49fd0ff";
+          sha256 = "1ffgnkdvrryc84cw1m5k37zx22dd5l7z882zgfh1p3dfzh8rqpqb";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
          sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
          name = "psession";
        };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ async cl-lib emacs ];
        meta = {
          homepage = "https://melpa.org/#/psession";
          license = lib.licenses.free;
@ -32560,12 +32539,12 @@
    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
    melpaBuild {
        pname = "rg";
-        version = "1.4.2";
+        version = "1.4.3";
        src = fetchFromGitHub {
          owner = "dajva";
          repo = "rg.el";
-          rev = "562ac6fd6291f828ee6116db62982c77ddd52956";
-          sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw";
+          rev = "63226e8c93e55538855c9b24bfa03c86dc23b79d";
+          sha256 = "1zzh2cf6lsrsh6nzlcfxqs4il9dw5fc70x5apvrvp08mpqdzcj1r";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@ -33295,12 +33274,12 @@
    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "sayid";
-        version = "0.0.15";
+        version = "0.0.16";
        src = fetchFromGitHub {
          owner = "bpiel";
          repo = "sayid";
-          rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298";
-          sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d";
+          rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f";
+          sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@ -34889,12 +34868,12 @@
    solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "solidity-mode";
-        version = "0.1.8";
+        version = "0.1.9";
        src = fetchFromGitHub {
          owner = "ethereum";
          repo = "emacs-solidity";
-          rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048";
-          sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p";
+          rev = "d0ff4dea49540f37301d869f2797fca2492f55d5";
+          sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@ -36168,12 +36147,12 @@
    system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "system-packages";
-        version = "1.0.1";
+        version = "1.0.2";
        src = fetchFromGitHub {
          owner = "jabranham";
          repo = "system-packages";
-          rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d";
-          sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4";
+          rev = "fff67d190440fb076104f0f52d55a5e098207e31";
+          sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@ -36882,12 +36861,12 @@
    tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
    melpaBuild {
        pname = "tidal";
-        version = "0.9.6";
+        version = "0.9.7";
        src = fetchFromGitHub {
          owner = "tidalcycles";
          repo = "Tidal";
-          rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
-          sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
+          rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98";
+          sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@ -96,9 +96,6 @@ self:
      # Expects bash to be at /bin/bash
      flycheck-rtags = markBroken super.flycheck-rtags;

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

--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -1,10 +1,10 @@
 { callPackage }: {
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20180402";
+        version = "20180409";
        src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20180402.tar";
-          sha256 = "0gb8hh26jzjqy262ll8jl3ym0cpw6s17id2gizv5qvw18knxs751";
+          url = "https://orgmode.org/elpa/org-20180409.tar";
+          sha256 = "0vnyh30pqnpfwmkm2gmidw00mgrwsbvxmjv40yhrv7144392iisl";
        };
        packageRequires = [];
        meta = {
@ -14,10 +14,10 @@
      }) {};
    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org-plus-contrib";
-        version = "20180402";
+        version = "20180409";
        src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20180402.tar";
-          sha256 = "09q5nr0ka7z719mi626wj5d51bcvdb08gk4zf94dzpks0gsqiikr";
+          url = "https://orgmode.org/elpa/org-plus-contrib-20180409.tar";
+          sha256 = "18zb6vx06gwxgy85a5fmvjwb8fqb4cn74n1mfk64p3acnsnwikkg";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@ -9,11 +9,11 @@

 mkDerivation rec {
  name = "krita-${version}";
-  version = "4.0.0";
+  version = "4.0.1";

  src = fetchurl {
    url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz";
+    sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc";
  };

  nativeBuildInputs = [ cmake extra-cmake-modules ];
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "dmenu-4.8";

  src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
    sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy";
  };

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
      description = "A generic, highly customizable, and efficient menu for the X Window System";
-      homepage = http://tools.suckless.org/dmenu;
+      homepage = https://tools.suckless.org/dmenu;
      license = licenses.mit;
      maintainers = with maintainers; [ viric pSub ];
      platforms = platforms.all;
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@ -1,32 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintl
-, withBuildColors ? true
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl
 }:

-assert withBuildColors -> ncurses != null;
-
 stdenv.mkDerivation rec {
  name = "girara-${version}";
-  version = "0.2.8";
+  version = "0.2.9";

  src = fetchurl {
-    url    = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
+    url = "http://pwmt.org/projects/girara/download/${name}.tar.xz";
+    sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8";
  };

-  preConfigure = ''
-    substituteInPlace colors.mk \
-      --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk gettext libintl libiconv ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    (if withBuildColors
-      then "TPUT=${ncurses.out}/bin/tput"
-      else "TPUT_AVAILABLE=0")
-  ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+  buildInputs = [ libintl libiconv ];
+  propagatedBuildInputs = [ glib gtk ];

  meta = with stdenv.lib; {
    homepage = https://pwmt.org/projects/girara/;
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
  name = "st-0.8.1";

  src = fetchurl {
-    url = "http://dl.suckless.org/st/${name}.tar.gz";
+    url = "https://dl.suckless.org/st/${name}.tar.gz";
    sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
  };

--- a/pkgs/applications/misc/wmname/default.nix
+++ b/pkgs/applications/misc/wmname/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "wmname-0.1";

  src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
    sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
  };

--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@ -1,6 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
-, gtk, girara, ncurses, gettext, docutils
-, file, sqlite, glib, texlive, libintl
+{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig
+, appstream-glib, desktop-file-utils, python3
+, gtk, girara, ncurses, gettext, libxml2
+, file, sqlite, glib, texlive, libintl, libseccomp
 , gtk-mac-integration, synctexSupport ? true
 }:

@ -9,52 +10,42 @@ assert synctexSupport -> texlive != null;
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name    = "zathura-core-${version}";
-  version = "0.3.8";
+  name = "zathura-core-${version}";
+  version = "0.3.9";

  src = fetchurl {
-    url    = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6";
+    url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
+    sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g";
  };

-  icon = ./icon.xpm;
+  patches = [
+    (fetchpatch {
+      url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch;
+      sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw";
+    })
+  ];

  nativeBuildInputs = [
-    pkgconfig libintl
+    meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
+    gettext makeWrapper libxml2
  ];

  buildInputs = [
-    file gtk girara
-    gettext makeWrapper sqlite glib
+    file gtk girara libintl libseccomp
+    sqlite glib
  ] ++ optional synctexSupport texlive.bin.core
    ++ optional stdenv.isDarwin [ gtk-mac-integration ];

-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
-  makeFlags = [
-    "PREFIX=$(out)"
-    "RSTTOMAN=${docutils}/bin/rst2man.py"
-    "VERBOSE=1"
-    "TPUT=${ncurses.out}/bin/tput"
-    (optionalString synctexSupport "WITH_SYNCTEX=1")
-  ];
-
  postInstall = ''
    wrapProgram "$out/bin/zathura" \
-      --prefix PATH ":" "${makeBinPath [ file ]}" \
-      --prefix XDG_CONFIG_DIRS ":" "$out/etc"
-
-    install -Dm644 $icon $out/share/pixmaps/pwmt.xpm
-    mkdir -pv $out/etc
-    echo "set window-icon $out/share/pixmaps/pwmt.xpm" > $out/etc/zathurarc
-    echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
+      --prefix PATH ":" "${makeBinPath [ file ]}"
  '';

  meta = {
-    homepage    = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura/;
    description = "A core component for zathura PDF viewer";
-    license     = licenses.zlib;
-    platforms   = platforms.unix;
+    license = licenses.zlib;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ garbas ];
  };
 }
--- a/pkgs/applications/misc/zathura/core/icon.xpm
+++ b/pkgs/applications/misc/zathura/core/icon.xpm
@ -1,120 +0,0 @@
-/* XPM */
-static char *freeimage[] = {
-/* width height num_colors chars_per_pixel */
-"16 16 96 2",
-/* colors */
-"   c #1e1e1e",
-" . c #222222",
-" X c #212121",
-" o c #535353",
-" O c #a4a4a4",
-" + c #202020",
-" @ c #252525",
-" # c #3c3c3c",
-" $ c #292929",
-" % c #979797",
-" & c #cccccc",
-" * c #303030",
-" = c #1f1f1f",
-" - c #494949",
-" ; c #dddddd",
-" : c #696969",
-" > c #232323",
-" , c #262626",
-" < c #adadad",
-" 1 c #bbbbbb",
-" 2 c #1d1d1d",
-" 3 c #1c1c1c",
-" 4 c #5e5e5e",
-" 5 c #e8e8e8",
-" 6 c #9c9c9c",
-" 7 c #242424",
-" 8 c #b1b1b1",
-" 9 c #b3b3b3",
-" 0 c #090909",
-" q c #161616",
-" w c #131313",
-" e c #4d4d4d",
-" r c #dedede",
-" t c #afafaf",
-" y c #282828",
-" u c #393939",
-" i c #c4c4c4",
-" p c #dcdcdc",
-" a c #9a9a9a",
-" s c #a2a2a2",
-" d c #ababab",
-" f c #313131",
-" g c #a7a7a7",
-" h c #e4e4e4",
-" j c #f2f2f2",
-" k c #eaeaea",
-" l c #e2e2e2",
-" z c #f0f0f0",
-" x c #d5d5d5",
-" c c #737373",
-" v c #323232",
-" b c #808080",
-" n c #7a7a7a",
-" m c #d3d3d3",
-" M c #e5e5e5",
-" N c #8a8a8a",
-" B c #cbcbcb",
-" V c #b5b5b5",
-" C c #b9b9b9",
-" Z c #272727",
-" A c #b4b4b4",
-" S c #bababa",
-" D c #2d2d2d",
-" F c #414141",
-" G c #444444",
-" H c #f4f4f4",
-" J c #838383",
-" K c #cfcfcf",
-" L c #fafafa",
-" P c #efefef",
-" I c #e3e3e3",
-" U c #8d8d8d",
-" Y c #656565",
-" T c #ffffff",
-" R c #fbfbfb",
-" E c #e9e9e9",
-" W c #bdbdbd",
-" Q c #e1e1e1",
-" ! c #dfdfdf",
-" ~ c #646464",
-" ^ c #3a3a3a",
-" / c #a1a1a1",
-" ( c #999999",
-" ) c #c0c0c0",
-" _ c #3b3b3b",
-" ` c #acacac",
-" ' c #050505",
-" ] c #151515",
-" [ c #1b1b1b",
-" { c #1a1a1a",
-" } c #b2b2b2",
-" | c #a5a5a5",
-".  c #c5c5c5",
-".. c #a6a6a6",
-".X c #bfbfbf",
-".o c #747474",
-/* pixels */
-"                                ",
-"   . . . X X X X . o O + X . .  ",
-"   . . X @ # $ . @ % & * = . .  ",
-"   . .   - ; : > , < 1 2 X . .  ",
-"   . . 3 4 5 6 7 7 8 9 0 q q 3  ",
-"   . + w e r t y u i p a s d 4  ",
-"   X f g h j k p l z z x g c v  ",
-"   X f b n m M N c B V 3 , > X  ",
-"   X X   w V C $ Z A S + $ , .  ",
-"   D F G u S H 1 J K L P I U @  ",
-"   Y T T T R E & W Q ! d g ~ 7  ",
-"   ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X  ",
-"   + > 7 { A } 7 @ |.  $ + . .  ",
-"   X X X ].. 8 Z 7 n.X + X . .  ",
-"   . . . { n.o 7 . @ y X X . .  ",
-"                                "
-};
-
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@ -1,29 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:

 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.7";
+  name = "zathura-djvu-0.2.8";

  src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
  buildInputs = [ djvulibre gettext zathura_core gtk girara ];

-  patches = [ ./gtkflags.patch ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
-    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
-    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
-    echo "''${makefileC1/$string1/$string2}" > Makefile
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
+  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

  meta = with stdenv.lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura-djvu/;
    description = "A zathura DJVU plugin";
    longDescription = ''
      The zathura-djvu plugin adds DjVu support to zathura by using the
--- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/djvu/gtkflags.patch
@ -1,23 +0,0 @@
--- zathura-djvu-0.2.7.orig/config.mk	2017-12-21 14:20:24.000000000 +0100
-+++ zathura-djvu-0.2.7/config.mk	2017-12-31 00:41:02.580154770 +0100
-@@ -16,6 +16,9 @@
- DESKTOPPREFIX ?= ${PREFIX}/share/applications
- 
- # libs
-+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
-+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0)
-+
- CAIRO_INC ?= $(shell pkg-config --cflags cairo)
- CAIRO_LIB ?= $(shell pkg-config --libs cairo)
- 
-@@ -34,8 +37,8 @@
- PLUGINDIR = ${LIBDIR}/zathura
- endif
- 
-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB}
-+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB}
- 
- # pre-processor flags
- CPPFLAGS += -D_FILE_OFFSET_BITS=64
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@ -1,35 +1,28 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk,
+{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo,
 gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
 openjpeg, fetchpatch }:

 stdenv.mkDerivation rec {
-  version = "0.3.2";
+  version = "0.3.3";
  name = "zathura-pdf-mupdf-${version}";

  src = fetchurl {
-    url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
-    sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck";
+    url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz";
+    sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];

  buildInputs = [
-    zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
+    zathura_core girara mupdf cairo
  ] ++ stdenv.lib.optional stdenv.isDarwin [
    gtk-mac-integration
  ];

-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
-    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
-    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
-    echo "''${makefileC1/$string1/$string2}" > Makefile
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
+  PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";

  meta = with lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura-pdf-mupdf/;
    description = "A zathura PDF plugin (mupdf)";
    longDescription = ''
      The zathura-pdf-mupdf plugin adds PDF support to zathura by
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@ -1,28 +1,21 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
+{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }:

 stdenv.mkDerivation rec {
-  version = "0.2.8";
+  version = "0.2.9";
  name = "zathura-pdf-poppler-${version}";

  src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y";
  };

-  nativeBuildInputs = [ pkgconfig zathura_core ];
+  nativeBuildInputs = [ meson ninja pkgconfig zathura_core ];
  buildInputs = [ poppler girara ];

-  makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
-    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
-    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
-    echo "''${makefileC1/$string1/$string2}" > Makefile
-  '';
+  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

  meta = with lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura-pdf-poppler/;
    description = "A zathura PDF plugin (poppler)";
    longDescription = ''
      The zathura-pdf-poppler plugin adds PDF support to zathura by
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@ -1,29 +1,20 @@
-{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }:
+{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }:

 stdenv.mkDerivation rec {
-  name = "zathura-ps-0.2.5";
+  name = "zathura-ps-0.2.6";

  src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y";
  };

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libspectre gettext zathura_core gtk2 girara ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+  buildInputs = [ libspectre zathura_core girara ];

-  patches = [ ./gtkflags.patch ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
-    makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' )
-    echo "$makefileC2" > Makefile
-    echo "$makefileC2"
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
+  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

  meta = with lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura-ps/;
    description = "A zathura PS plugin";
    longDescription = ''
      The zathura-ps plugin adds PS support to zathura by using the
--- a/pkgs/applications/misc/zathura/ps/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/ps/gtkflags.patch
@ -1,23 +0,0 @@
--- zathura-ps-0.2.5.orig/config.mk	2017-12-21 14:21:17.000000000 +0100
-+++ zathura-ps-0.2.5/config.mk	2017-12-31 01:05:17.507268817 +0100
-@@ -16,6 +16,9 @@
- DESKTOPPREFIX ?= ${PREFIX}/share/applications
- 
- # libs
-+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
-+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0)
-+
- CAIRO_INC ?= $(shell pkg-config --cflags cairo)
- CAIRO_LIB ?= $(shell pkg-config --libs cairo)
- 
-@@ -34,8 +37,8 @@
- PLUGINDIR = ${LIBDIR}/zathura
- endif
- 
-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
-+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB}
- 
- # compiler flags
- CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@ -1,7 +1,7 @@
 { symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }:

 let
-  pluginsPath = lib.makeLibraryPath plugins;
+  pluginsPath = lib.makeSearchPath "lib/zathura" plugins;

 in symlinkJoin {
  name = "zathura-with-plugins-${zathura_core.version}";
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "ii-1.8";

  src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
    sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
  };

--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {

  makeFlags = "PREFIX=$(out)";
  src = fetchurl {
-    url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
+    url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
    sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
  };

--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@ -2,13 +2,13 @@

 python2Packages.buildPythonApplication rec {
  name = "syncplay-${version}";
-  version = "1.5.2";
+  version = "1.5.3";

  format = "other";

  src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz;
-    sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla";
+    url = https://github.com/Syncplay/syncplay/archive/v1.5.3.tar.gz;
+    sha256 = "1yk0aajskhk6czpjshf9a9pzp3rafh5cgdcyyz8pwpk4ca9zyzfv";
  };

  propagatedBuildInputs = with python2Packages; [ pyside twisted ];
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@ -2,15 +2,15 @@

 rustPlatform.buildRustPackage rec {
  name = "elan-${version}";
-  version = "0.1.0";
+  version = "0.3.0";

-  cargoSha256 = "04cxwklfgz4q28grva52ws3lslaiq67fwqf6pglbzdrfbgdjjwb6";
+  cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";

  src = fetchFromGitHub {
    owner = "kha";
    repo = "elan";
    rev = "v${version}";
-    sha256 = "065l9a1g974n8i44mz37sx88fl65h5hml611m4p81cy6av2x85sm";
+    sha256 = "116v9v1v5a6fr6h4dgxzwczpy4pbf96cnx6nss6a5y8vbhx9c1mj";
  };

  nativeBuildInputs = [ pkgconfig ];
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
  postInstall = ''
    pushd $out/bin
    mv elan-init elan
-    for link in lean leanpkg; do
+    for link in lean leanpkg leanchecker; do
      ln -s elan $link
    done
    popd
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@ -1,29 +1,80 @@
-{ stdenv, fetchurl, m4, gmp }:
-
-let
-  baseName = "gap";
-  version = "4r8p3";
-
-  pkgVer = "2016_03_19-22_17";
-in
+{ stdenv
+, fetchurl
+, fetchpatch
+, m4
+, gmp
+# don't remove any packages -- results in a ~1.3G size increase
+# see https://github.com/NixOS/nixpkgs/pull/38754 for a discussion
+, keepAllPackages ? true
+}:

 stdenv.mkDerivation rec {
-  name = "${baseName}-${version}";
+  pname = "gap";
+  # https://www.gap-system.org/Releases/
+  # newer versions (4.9.0) are available, but still considered beta (https://github.com/gap-system/gap/wiki/GAP-4.9-release-notes)
+  version = "4r8p10";
+  pkgVer = "2018_01_15-13_02";
+  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "ftp://ftp.gap-system.org/pub/gap/gap48/tar.gz/${baseName}${version}_${pkgVer}.tar.gz";
-    sha256 = "1rmb0lj43avv456sjwb7ia3y0wwk5shlqylpkdwnnqpjnvjbnzv6";
+  src = let
+    # 4r8p10 -> 48
+    majorminor = stdenv.lib.replaceStrings ["r"] [""] (
+      builtins.head (stdenv.lib.splitString "p" version) # 4r8p10 -> 4r8
+    );
+  in
+    fetchurl {
+    url = "https://www.gap-system.org/pub/gap/gap${majorminor}/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
+    sha256 = "0wzfdjnn6sfiaizbk5c7x44rhbfayis4lf57qbqqg84c7dqlwr6f";
  };

+  # remove all non-essential packages (which take up a lot of space)
+  preConfigure = stdenv.lib.optionalString (!keepAllPackages) ''
+    find pkg -type d -maxdepth 1 -mindepth 1 \
+       -not -name 'GAPDoc-*' \
+       -not -name 'autpgrp*' \
+       -exec echo "Removing package {}" \; \
+       -exec rm -r {} \;
+  '';
+
  configureFlags = [ "--with-gmp=system" ];
  buildInputs = [ m4 gmp ];
-  
+
+  patches = [
+    #  fix infinite loop in writeandcheck() when writing an error message fails.
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1";
+    })
+  ];
+
+  doCheck = true;
+  checkTarget = "testinstall";
+  # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
+  # tests are run twice, once with all packages loaded and once without
+  # checkTarget = "teststandard";
+
+  preCheck = ''
+    # gap tests check that the home directory exists
+    export HOME="$TMP/gap-home"
+    mkdir -p "$HOME"
+  '';
+
+  postCheck = ''
+    # The testsuite doesn't exit with a non-zero exit code on failure.
+    # It leaves its logs in dev/log however.
+
+    # grep for error messages
+    if grep ^##### dev/log/*; then
+        exit 1
+    fi
+  '';
+
  postBuild = ''
    pushd pkg
    bash ../bin/BuildPackages.sh
    popd
  '';
-  
+
  installPhase = ''
    mkdir -p "$out/bin" "$out/share/gap/"

@ -31,7 +82,7 @@ stdenv.mkDerivation rec {

    sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh"

-    ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin"
+    ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap"
  '';

  meta = with stdenv.lib; {
@ -42,6 +93,10 @@ stdenv.mkDerivation rec {
      chrisjefferson
    ];
    platforms = platforms.all;
+    # keeping all packages increases the package size considerably, wchich
+    # is why a local build is preferable in that situation. The timeframe
+    # is reasonable and that way the binary cache doesn't get overloaded.
+    hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) meta.platforms;
    license = licenses.gpl2;
    homepage = http://gap-system.org/;
  };
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@ -7,7 +7,7 @@ stdenv.mkDerivation {
  inherit name;
 
  src = fetchurl {
-    url = "http://dl.suckless.org/dwm/${name}.tar.gz";
+    url = "https://dl.suckless.org/dwm/${name}.tar.gz";
    sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
  };
 
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  name = "tabbed-20160425";

  src = fetchgit {
-    url = http://git.suckless.org/tabbed;
+    url = https://git.suckless.org/tabbed;
    rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164";
    sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri";
  };
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  ];

  meta = {
-    homepage = http://tools.suckless.org/tabbed;
+    homepage = https://tools.suckless.org/tabbed;
    description = "Simple generic tabbed fronted to xembed aware applications";
    license = licenses.mit;
    maintainers = with maintainers; [ viric vrthra ];
--- a/pkgs/applications/window-managers/velox/dmenu.nix
+++ b/pkgs/applications/window-managers/velox/dmenu.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "A generic, highly customizable, and efficient menu for the X Window System";
-    homepage = http://tools.suckless.org/dmenu;
+    homepage = https://tools.suckless.org/dmenu;
    license = stdenv.lib.licenses.mit;
    maintainers = with stdenv.lib.maintainers; [ ];
    platforms = with stdenv.lib.platforms; all;
--- a/pkgs/applications/window-managers/velox/st.nix
+++ b/pkgs/applications/window-managers/velox/st.nix
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  meta = {
-    homepage = http://st.suckless.org/;
+    homepage = https://st.suckless.org/;
    license = licenses.mit;
    maintainers = with maintainers; [ ];
    platforms = with platforms; linux;
--- a/pkgs/build-support/build-setupcfg/default.nix
+++ b/pkgs/build-support/build-setupcfg/default.nix
@ -0,0 +1,23 @@
+# Build a python package from info made available by setupcfg2nix.
+#
+# * src: The source of the package.
+# * info: The package information generated by setupcfg2nix.
+# * meta: Standard nixpkgs metadata.
+# * application: Whether this package is a python library or an
+#   application which happens to be written in python.
+pythonPackages: { src, info, meta ? {}, application ? false }: let
+  build = if application
+    then pythonPackages.buildPythonApplication
+  else pythonPackages.buildPythonPackage;
+in build {
+  inherit (info) pname version;
+
+  inherit src meta;
+
+  nativeBuildInputs = map (p: pythonPackages.${p}) (
+    (info.setup_requires or []) ++
+    (info.tests_require or []));
+
+  propagatedBuildInputs = map (p: pythonPackages.${p})
+    (info.install_requires or []);
+}
--- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
@ -9,7 +9,7 @@ mkXfceDerivation rec {

  nativeBuildInputs = [ autoreconfHook ];

-  propagatedNativeBuildInputs = [
+  propagatedBuildInputs = [
    autoconf
    automake
    glib
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@ -1,5 +1,4 @@
 { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
-, fetchpatch
 , targets ? []
 , targetToolchains ? []
 , targetPatches ? []
@ -23,11 +22,6 @@ in rec {

    patches = [
      ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
-      # Adapted from https://github.com/rust-lang/rust/pull/47912
-      (fetchpatch {
-        url = "https://src.fedoraproject.org/rpms/rust/raw/1bb4d24c060915c304c9a9f86a438388e599f9c6/f/0002-Use-a-range-to-identify-SIGSEGV-in-stack-guards.patch";
-        sha256 = "16hc170qzzcb9lcabk0ln005zji2h1gq0knbr9avbbzlbg9jha2q";
-      })
    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch
      # https://github.com/rust-lang/rust/issues/45410
      ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -508,7 +508,7 @@ self: super: {
  # https://github.com/alphaHeavy/lzma-enumerator/issues/3
  lzma-enumerator = dontCheck super.lzma-enumerator;

-  # https://github.com/haskell-hvr/lzma/issues/8
+  # https://github.com/haskell-hvr/lzma/pull/11
  lzma = appendPatch super.lzma ./patches/lzma-tests.patch;

  # https://github.com/BNFC/bnfc/issues/140
@ -1040,4 +1040,4 @@ self: super: {
  amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides;
 in {
  inherit amazonka amazonka-core amazonka-test;
-})
+})
--- a/pkgs/development/haskell-modules/patches/lzma-tests.patch
+++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch
@ -1,13 +1,11 @@
 --- a/lzma.cabal
 +++ b/lzma.cabal
-@@ -70,8 +70,8 @@ test-suite lzma-tests
-                      , base
-                      , bytestring
+@@ -76,7 +76,7 @@
   -- additional dependencies that require version bounds
-  build-depends:       HUnit                      >= 1.2      && <1.4
-                     , QuickCheck                 >= 2.8      && <2.9
-+  build-depends:       HUnit                      >= 1.2      && <2
-+                     , QuickCheck                 >= 2.8      && <3
-                      , tasty                      >= 0.10     && <0.12
-                      , tasty-hunit                == 0.9.*
-                      , tasty-quickcheck           >= 0.8.3.2  && < 0.9
+   build-depends:       HUnit                      >= 1.2      && <1.7
+                      , QuickCheck                 >= 2.8      && <2.11
+-                     , tasty                      >= 0.10     && <0.13
+                     , tasty                      >= 0.10     && <1.1
+                      , tasty-hunit                >= 0.9      && <0.11
+                      , tasty-quickcheck           >= 0.8.3.2  && <0.10
+ 
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  name = "farbfeld-${version}";
-  version = "3";
+  version = "4";

  src = fetchgit {
-    url = "http://git.suckless.org/farbfeld";
+    url = "https://git.suckless.org/farbfeld";
    rev = "refs/tags/${version}";
-    sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl";
+    sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870";
  };

  buildInputs = [ libpng libjpeg ];
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig }:
-let version = "3.0.1"; in
+{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
+let version = "4.0.2"; in
 stdenv.mkDerivation {
  name = "nix-plugins-${version}";

@ -7,12 +7,12 @@ stdenv.mkDerivation {
    owner = "shlevy";
    repo = "nix-plugins";
    rev = version;
-    sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r";
+    sha256 = "0cr1lz788rw7kxfs2acplhdl5cv8qrfh4kdqxi0p63ajnd303k8c";
  };

  nativeBuildInputs = [ cmake pkgconfig ];

-  buildInputs = [ nix ];
+  buildInputs = [ nix boost ];

  meta = {
    description = "Collection of miscellaneous plugins for the nix expression language";
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub, lib }:
+
+stdenv.mkDerivation rec {
+  pname = "openbsm";
+  name = "${pname}-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}";
+    sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
+  };
+
+  meta = {
+    homepage = http://www.openbsm.org/;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ matthewbauer ];
+  };
+}
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  name = "openpam-${version}";
+  version = "20170430";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz";
+    sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
+  };
+
+  meta = {
+    homepage = https://www.openpam.org;
+    description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ matthewbauer ];
+  };
+}
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@ -1,20 +1,19 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
  six, pytest, pytestrunner, pytestcov, coverage
 }:
 buildPythonPackage rec {
  pname = "libais";
-  name = "${pname}-${version}";
-  version = "0.16";
+  version = "0.17";

-  src = fetchurl {
-    url = "mirror://pypi/l/libais/${name}.tar.bz2";
-    sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb";
  };

  # data files missing
  doCheck = false;

-  buildInputs = [ pytest pytestrunner pytestcov coverage ];
+  checkInputs = [ pytest pytestrunner pytestcov coverage ];
  propagatedBuildInputs = [ six ];

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hypothesis
+, pycodestyle
+, pyflakes
+, pytest
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "mutagen";
+  version = "1.40.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj";
+  };
+
+  checkInputs = [
+    pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
+    pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis
+  ];
+  LC_ALL = "en_US.UTF-8";
+
+  meta = with lib; {
+    description = "Python multimedia tagging library";
+    homepage = https://mutagen.readthedocs.io/;
+    license = licenses.lgpl2Plus;
+  };
+}
--- a/pkgs/development/tools/setupcfg2nix/default.nix
+++ b/pkgs/development/tools/setupcfg2nix/default.nix
@ -0,0 +1,19 @@
+{ buildSetupcfg, fetchFromGitHub, lib }:
+
+buildSetupcfg rec {
+  info = import ./info.nix;
+  src = fetchFromGitHub {
+    owner = "target";
+    repo = "setupcfg2nix";
+    rev = info.version;
+    sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6";
+  };
+  application = true;
+  meta = {
+    description = "Generate nix expressions from setup.cfg for a python package.";
+    homepage = https://github.com/target/setupcfg2nix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.shlevy ];
+  };
+}
--- a/pkgs/development/tools/setupcfg2nix/info.nix
+++ b/pkgs/development/tools/setupcfg2nix/info.nix
@ -0,0 +1,7 @@
+{
+  pname = ''setupcfg2nix'';
+  version = ''1.1.0'';
+  install_requires = [
+    ''setuptools''
+  ];
+}
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, writeText
 , xproto, libX11, libXext, libXrandr
 # default header can be obtained from
-# http://git.suckless.org/slock/tree/config.def.h
+# https://git.suckless.org/slock/tree/config.def.h
 , conf ? null }:

 with stdenv.lib;
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  name = "slock-1.4";

  src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
    sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
  };

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  '';

  meta = {
-    homepage = http://tools.suckless.org/slock;
+    homepage = https://tools.suckless.org/slock;
    description = "Simple X display locker";
    longDescription = ''
      Simple X display locker. This is the simplest X screen locker.
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@ -1,37 +1,104 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuild, lib, hostPlatform
+, Librpcsvc, apple_sdk, pam, CF, openbsm }:

 appleDerivation rec {
  # xcbuild fails with:
  # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1:  9083 Segmentation fault: 11  xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build
+  # see issue facebook/xcbuild#188
  # buildInputs = [ xcbuild ];

-  # # temporary install phase until xcodebuild has "install" support
-  # installPhase = ''
-  #   mkdir -p $out/bin/
-  #   install system_cmds-*/Build/Products/Release/* $out/bin/
+  buildInputs = [ Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF
+                  apple_sdk.frameworks.IOKit openbsm ];
+  # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__"
+  #                    + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__"
+  #                    + lib.optionalString hostPlatform.isArm "-D__arm__";
+  NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
+                         "-DDAEMON_GID=1"
+                         "-DDEFAULT_AT_QUEUE=\'a\'"
+                         "-DDEFAULT_BATCH_QUEUE=\'b\'"
+                         "-DPERM_PATH=\"/usr/lib/cron/\""
+                         "-DOPEN_DIRECTORY"
+                         "-DNO_DIRECT_RPC"
+                         "-DAPPLE_GETCONF_UNDERSCORE"
+                         "-DAPPLE_GETCONF_SPEC"
+                         "-DUSE_PAM"
+                         "-DUSE_BSM_AUDIT"
+                         "-D_PW_NAME_LEN=MAXLOGNAME"
+                         "-D_PW_YPTOKEN=\"__YP!\""
+                         "-DAHZV1=64 "
+                         "-DAU_SESSION_FLAG_HAS_TTY=0x4000"
+                         "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000"
+                       ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ ";

-  #   for n in 1 5 8; do
-  #     mkdir -p $out/share/man/man$n
-  #     install */*.$n $out/share/man/man$n
-  #   done
-  # '';
+  patchPhase = ''
+    substituteInPlace login.tproj/login.c \
+      --replace bsm/audit_session.h bsm/audit.h
+    substituteInPlace login.tproj/login_audit.c \
+      --replace bsm/audit_session.h bsm/audit.h
+  '';

-  # For now we just build sysctl because that's all I need... Please open a
-  # PR if you need any other utils before we fix the xcodebuild.
-  buildPhase = "cc sysctl.tproj/sysctl.c -o sysctl";
+  buildPhase = ''
+    for dir in *.tproj; do
+      name=$(basename $dir)
+      name=''${name%.tproj}

-  installPhase =
-    ''
-      mkdir -p $out/bin
-      install sysctl $out/bin
-      for n in 5 8; do
-        mkdir -p $out/share/man/man$n
-        install sysctl.tproj/*.$n $out/share/man/man$n
+      CFLAGS=""
+      case $name in
+           arch) CFLAGS="-framework CoreFoundation";;
+           atrun) CFLAGS="-Iat.tproj";;
+           chkpasswd)
+             CFLAGS="-framework OpenDirectory -framework CoreFoundation -lpam";;
+           getconf)
+               for f in getconf.tproj/*.gperf; do
+                   cfile=''${f%.gperf}.c
+                   LC_ALL=C awk -f getconf.tproj/fake-gperf.awk $f > $cfile
+               done
+           ;;
+           iostat) CFLAGS="-framework IOKit -framework CoreFoundation";;
+           login) CFLAGS="-lbsm -lpam";;
+           nvram) CFLAGS="-framework CoreFoundation -framework IOKit";;
+           sadc) CFLAGS="-framework IOKit -framework CoreFoundation";;
+           sar) CFLAGS="-Isadc.tproj";;
+      esac
+
+      echo "Building $name"
+
+      case $name in
+
+           # These are all broken currently.
+           arch) continue;;
+           chpass) continue;;
+           dirhelper) continue;;
+           dynamic_pager) continue;;
+           fs_usage) continue;;
+           latency) continue;;
+           pagesize) continue;;
+           passwd) continue;;
+           reboot) continue;;
+           sc_usage) continue;;
+           shutdown) continue;;
+           trace) continue;;
+
+           *) cc $dir/*.c -I''${dir} $CFLAGS -o $name ;;
+      esac
+    done
+  '';
+
+  installPhase = ''
+    for dir in *.tproj; do
+      name=$(basename $dir)
+      name=''${name%.tproj}
+      [ -x $name ] && install -D $name $out/bin/$name
+      for n in 1 2 3 4 5 6 7 8 9; do
+        for f in $dir/*.$n; do
+          install -D $f $out/share/man/man$n/$(basename $f)
+        done
      done
-    '';
+    done
+  '';

  meta = {
    platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
+    maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ];
  };
 }
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@ -5,7 +5,7 @@ let
    baseName="sinit";
    version="1.0";
    name="${baseName}-${version}";
-    url="http://git.suckless.org/sinit/";
+    url="https://git.suckless.org/sinit/";
    sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";
    rev = "refs/tags/v${version}";
  };
@ -32,6 +32,6 @@ stdenv.mkDerivation {
    maintainers = [stdenv.lib.maintainers.raskin];
    platforms = stdenv.lib.platforms.linux;
    homepage = https://tools.suckless.org/sinit;
-    downloadPage = "http://git.suckless.org/sinit";
+    downloadPage = "https://git.suckless.org/sinit";
  };
 }
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@ -1,17 +1,16 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:

 stdenv.mkDerivation rec {
-    name = "pg_repack-${version}.1";
-    version = "1.4.0";
-    rev = "ver_${version}.1";
+    name = "pg_repack-${version}";
+    version = "1.4.2";

    buildInputs = [ postgresql openssl zlib readline ];

    src = fetchFromGitHub {
-      owner = "reorg";
-      repo = "pg_repack";
-      inherit rev;
-      sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74";
+      owner  = "reorg";
+      repo   = "pg_repack";
+      rev    = "refs/tags/ver_${version}";
+      sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q";
    };

    installPhase = ''
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
  name = "sselp-${version}";
 
  src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
    sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
  };
 
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "bubblewrap-${version}";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchurl {
    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc";
+    sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l";
  };

  nativeBuildInputs = [ libcap libxslt docbook_xsl ];
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@ -1,4 +1,6 @@
-{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
+{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python
+, boost, lzma
+, withGog ? false, unar ? null }:

 stdenv.mkDerivation rec {
  name = "innoextract-1.6";
@ -8,14 +10,23 @@ stdenv.mkDerivation rec {
    sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6";
  };

-  buildInputs = [ python doxygen lzma boost ];
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ python lzma boost ];
+
+  nativeBuildInputs = [ cmake makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  # we need unar to for multi-archive extraction
+  postFixup = stdenv.lib.optionalString withGog ''
+    wrapProgram $out/bin/innoextract \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]}
+  '';

  meta = with stdenv.lib; {
    description = "A tool to unpack installers created by Inno Setup";
    homepage = http://constexpr.org/innoextract/;
-    platforms = platforms.linux;
    license = licenses.zlib;
    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/archivers/unar/default.nix
+++ b/pkgs/tools/archivers/unar/default.nix
@ -1,8 +1,10 @@
 { stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }:

-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
  pname = "unar";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
  version = "1.10.1";

  src = fetchurl {
@ -10,23 +12,20 @@ stdenv.mkDerivation rec {
    sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0";
  };

-  buildInputs = [
-    gnustep.make unzip gnustep.base bzip2.dev
-    zlib.dev icu.dev openssl.dev
-  ];
+  buildInputs = [ gnustep.base bzip2 icu openssl zlib ];
+
+  nativeBuildInputs = [ gnustep.make unzip ];
+
+  enableParallelBuilding = true;

  postPatch = ''
-    substituteInPlace Makefile.linux \
-      --replace "CC = gcc" "CC=cc" \
-      --replace "CXX = g++" "CXX=c++" \
-      --replace "OBJCC = gcc" "OBJCC=cc" \
-      --replace "OBJCXX = g++" "OBJCXX=c++"
-
-    substituteInPlace ../UniversalDetector/Makefile.linux \
-      --replace "CC = gcc" "CC=cc" \
-      --replace "CXX = g++" "CXX=c++" \
-      --replace "OBJCC = gcc" "OBJCC=c" \
-      --replace "OBJCXX = g++" "OBJCXX=c++"
+    for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
+      substituteInPlace $f \
+        --replace "CC = gcc"     "CC=cc" \
+        --replace "CXX = g++"    "CXX=c++" \
+        --replace "OBJCC = gcc"  "OBJCC=cc" \
+        --replace "OBJCXX = g++" "OBJCXX=c++"
+    done
  '';

  makefile = "Makefile.linux";
@ -34,17 +33,16 @@ stdenv.mkDerivation rec {
  sourceRoot = "./The Unarchiver/XADMaster";

  installPhase = ''
-    mkdir -p $out/bin
-    cp lsar $out/bin
-    cp unar $out/bin
+    runHook preInstall

-    mkdir -p $out/share/man/man1
-    cp ../Extra/lsar.1 $out/share/man/man1
-    cp ../Extra/unar.1 $out/share/man/man1
+    install -Dm755 -t $out/bin lsar unar
+    install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1

    mkdir -p $out/etc/bash_completion.d
    cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar
    cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar
+
+    runHook postInstall
  '';

  meta = with stdenv.lib; {
@ -55,7 +53,7 @@ stdenv.mkDerivation rec {
      zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \
      and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \
      Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \
-      ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. 
+      ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats.
    '';
    license = with licenses; [ lgpl21Plus ];
    platforms = with platforms; linux;
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@ -4,7 +4,10 @@

 with python.pkgs;

-buildPythonApplication rec {
+#We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
+#This is needed for services.bepasty
+#https://github.com/NixOS/nixpkgs/pull/38300
+buildPythonPackage rec {
  pname = "bepasty";
  version = "0.4.0";
  name = "${pname}-${version}";
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "babeld-1.8.0";
+  name = "babeld-1.8.1";

  src = fetchurl {
    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i";
+    sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w";
  };

  preBuild = ''
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
+, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
 , libseccomp, busybox-sandbox-shell
 , hostPlatform, buildPlatform
@ -35,7 +35,8 @@ let
          (aws-sdk-cpp.override {
            apis = ["s3"];
            customMemoryManagement = false;
-          });
+          })
+      ++ lib.optional fromGit boost;

    propagatedBuildInputs = [ boehmgc ];

@ -135,19 +136,16 @@ in rec {
    };
  }) // { perl-bindings = perl-bindings { nix = nixStable; }; };

-  nixUnstable = nix;
-/*
  nixUnstable = (lib.lowPrio (common rec {
    name = "nix-2.0${suffix}";
-    suffix = "pre5968_a6c0b773";
+    suffix = "pre6137_e3cdcf89";
    src = fetchFromGitHub {
      owner = "NixOS";
      repo = "nix";
-      rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1";
-      sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346";
+      rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0";
+      sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s";
    };
    fromGit = true;
  })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
-*/

 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -7230,6 +7230,8 @@ with pkgs;
    pythonPackages = python3Packages;
  };

+  setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {};
+
  # These pyside tools do not provide any Python modules and are meant to be here.
  # See ../development/python-modules/pyside/default.nix for details.
  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
@ -10684,7 +10686,9 @@ with pkgs;
  };
  libnghttp2 = nghttp2.lib;

-  nix-plugins = callPackage ../development/libraries/nix-plugins { };
+  nix-plugins = callPackage ../development/libraries/nix-plugins {
+    nix = nixUnstable;
+  };

  nlohmann_json = callPackage ../development/libraries/nlohmann_json { };

@ -13765,13 +13769,19 @@ with pkgs;

  gogoclient = callPackage ../os-specific/linux/gogoclient { };

+  linux-pam = callPackage ../os-specific/linux/pam { };
+
  nss_ldap = callPackage ../os-specific/linux/nss_ldap { };

  odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };

+  openpam = callPackage ../development/libraries/openpam { };
+
+  openbsm = callPackage ../development/libraries/openbsm { };
+
  pagemon = callPackage ../os-specific/linux/pagemon { };

-  pam = callPackage ../os-specific/linux/pam { };
+  pam = if stdenv.isLinux then linux-pam else openpam;

  # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )

@ -15149,6 +15159,8 @@ with pkgs;

  distrho = callPackage ../applications/audio/distrho {};

+  dit = callPackage ../applications/editors/dit { };
+
  djvulibre = callPackage ../applications/misc/djvulibre { };

  djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
@ -15853,12 +15865,6 @@ with pkgs;
    gtk = gtk3;
  };

-  girara-light = callPackage ../applications/misc/girara {
-    gtk = gtk3;
-    withBuildColors = false;
-    ncurses = null;
-  };
-
  gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});

  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt;
@ -17439,8 +17445,8 @@ with pkgs;

  quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; };

-  quodlibet-full = callPackage ../applications/audio/quodlibet {
-    inherit (gnome2) gtksourceview;
+  quodlibet-full = quodlibet.override {
+    inherit (gnome3) gtksourceview webkitgtk;
    withDbusPython = true;
    withPyInotify = true;
    withMusicBrainzNgs = true;
@ -17448,7 +17454,6 @@ with pkgs;
    keybinder3 = keybinder3;
    libmodplug = libmodplug;
    kakasi = kakasi;
-    webkitgtk = webkitgtk24x-gtk3;
    libappindicator-gtk3 = libappindicator-gtk3;
    tag = "-full";
  };
@ -20119,6 +20124,8 @@ with pkgs;

  gap = callPackage ../applications/science/math/gap { };

+  gap-minimal = lowPrio (gap.override { keepAllPackages = false; });
+
  geogebra = callPackage ../applications/science/math/geogebra { };

  maxima = callPackage ../applications/science/math/maxima {
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -66,6 +66,9 @@ let
    toPythonModule = x: x; # Application does not provide modules.
  }));

+  # See build-setupcfg/default.nix for documentation.
+  buildSetupcfg = import ../build-support/build-setupcfg self;
+
  graphiteVersion = "1.0.2";

  fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs:
@ -133,6 +136,7 @@ in {
  inherit fetchPypi callPackage;
  inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
  inherit toPythonModule toPythonApplication;
+  inherit buildSetupcfg;

  # helpers

@ -8132,26 +8136,7 @@ in {
    };
  };

-  mutagen = buildPythonPackage (rec {
-    name = "mutagen-1.36";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mutagen/${name}.tar.gz";
-      sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp";
-    };
-
-    # Needed for tests only
-    buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
-      pkgs.glibcLocales pytest
-    ];
-    LC_ALL = "en_US.UTF-8";
-
-    meta = {
-      description = "Python multimedia tagging library";
-      homepage = http://code.google.com/p/mutagen;
-      license = licenses.lgpl2;
-    };
-  });
+  mutagen = callPackage ../development/python-modules/mutagen { };


  muttils = buildPythonPackage (rec {
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@ -59,7 +59,7 @@ in rec {
    darwin = pkgs.getopt;
  };
  hexdump = singleBinary "hexdump" {
-    linux = pkgs.procps;
+    linux = pkgs.utillinux;
    darwin = pkgs.darwin.shell_cmds;
  };
  hostname = singleBinary "hostname" {