NixOS · May 24, 2019 · May 28, 2019 · May 28, 2019 · May 29, 2019 · May 29, 2019
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
@@ -91,5 +91,7 @@ in
 
   config = mkIf (cfg.provider != "libc") {
     environment.variables.LD_PRELOAD = providerLibPath;
+    systemd.extraConfig = "DefaultEnvironment=\"LD_PRELOAD=${providerLibPath}\"";
+    systemd.user.extraConfig = "DefaultEnvironment=\"LD_PRELOAD=${providerLibPath}\"";
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -127,6 +127,8 @@ let
 
   gitflow = callPackage ./gitflow { };
 
+  gitstatus = callPackage ./gitstatus { };
+
   grv = callPackage ./grv { };
 
   hub = callPackage ./hub {

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -0,0 +1,30 @@
+{callPackage, stdenv, fetchFromGitHub, ...}:
+
+stdenv.mkDerivation rec {
+  pname = "gitstatus";
+  version = "unstable-2019-05-06";
+
+  src = fetchFromGitHub {
+    owner = "romkatv";
+    repo = "gitstatus";
+    rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424";
+    sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6";
+  };
+
+  buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
+  patchPhase = ''
+    sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
+  '';
+  installPhase = ''
+    install -Dm755 gitstatusd $out/bin/gitstatusd
+    install -Dm444 gitstatus.plugin.zsh $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "10x faster implementation of `git status` command";
+    homepage = https://github.com/romkatv/gitstatus;
+    license = [ licenses.gpl3 ];
+
+    maintainers = [ maintainers.mmlb ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -0,0 +1,19 @@
+{fetchFromGitHub, libgit2_0_27, ...}:
+
+libgit2_0_27.overrideAttrs (oldAttrs: rec {
+  cmakeFlags = oldAttrs.cmakeFlags ++ [
+    "-DUSE_BUNDLED_ZLIB=ON"
+    "-DUSE_ICONV=OFF"
+    "-DBUILD_CLAR=OFF"
+    "-DUSE_SSH=OFF"
+    "-DUSE_HTTPS=OFF"
+    "-DBUILD_SHARED_LIBS=OFF"
+    "-DUSE_EXT_HTTP_PARSER=OFF"
+  ];
+  src = fetchFromGitHub {
+    owner = "romkatv";
+    repo = "libgit2";
+    rev = "aab6c56e6766fa752bef00c745067d875925fc89";
+    sha256 = "1yqqhpi5xi6s86411sixw4yq5c6n2v8pdh447c8b7q5lfc089lvl";
+  };
+})
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
       sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
     })
   ];
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
 
   nativeBuildInputs = [
     meson
@@ -64,10 +68,9 @@ stdenv.mkDerivation rec {
     json-glib
   ];
 
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
+  # Fix parallel building: missing dependency from src/gtd-application.c
+  # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170
+  preBuild = "ninja src/gtd-vcs-identifier.h";
 
   passthru = {
     updateScript = gnome3.updateScript {

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, mautrix-telegram }:
 
 with python3.pkgs;
 
@@ -11,11 +11,15 @@ buildPythonPackage rec {
     sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112";
   };
 
+  postPatch = ''
+    sed -i -e '/alembic>/d' setup.py
+  '';
+
   propagatedBuildInputs = [
+    Mako
     aiohttp
     mautrix-appservice
     sqlalchemy
-    alembic
     CommonMark
     ruamel_yaml
     future-fstrings
@@ -26,6 +30,18 @@ buildPythonPackage rec {
     lxml
   ];
 
+  # `alembic` (a database migration tool) is only needed for the initial setup,
+  # and not needed during the actual runtime. However `alembic` requires `mautrix-telegram`
+  # in its environment to create a database schema from all models.
+  #
+  # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic`
+  # which has `mautrix-telegram` in its environment.
+  passthru.alembic = alembic.overrideAttrs (old: {
+    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+      mautrix-telegram
+    ];
+  });
+
   checkInputs = [
     pytest
     pytestrunner
@@ -37,6 +53,6 @@ buildPythonPackage rec {
     homepage = https://github.com/tulir/mautrix-telegram;
     description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ nyanloutre ];
+    maintainers = with maintainers; [ nyanloutre ma27 ];
   };
 }
diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix
@@ -1,27 +1,32 @@
-{ stdenv, fetchurl, lz4, snappy, openmp }:
+{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium
+# For testing
+, coreutils, gawk
+}:
 
 stdenv.mkDerivation rec {
   pname = "dedup";
-  version = "1.0";
+  version = "2.0";
 
   src = fetchurl {
     url = "https://dl.2f30.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "0wd4cnzhqk8l7byp1y16slma6r3i1qglwicwmxirhwdy1m7j5ijy";
+    sha256 = "0n5kkni4d6blz3s94y0ddyhijb74lxv7msr2mvdmj8l19k0lrfh1";
   };
 
   makeFlags = [
     "CC:=$(CC)"
     "PREFIX=${placeholder "out"}"
     "MANPREFIX=${placeholder "out"}/share/man"
-    # These are likely wrong on some platforms, please report!
-    "OPENMPCFLAGS=-fopenmp"
-    "OPENMPLDLIBS=-lgomp"
   ];
 
-  buildInputs = [ lz4 snappy openmp ];
+  buildInputs = [ lz4 snappy libsodium ];
+
+  doCheck = true;
+
+  checkInputs = [ coreutils gawk ];
+  checkTarget = "test";
 
   meta = with stdenv.lib; {
-    description = "data deduplication program";
+    description = "Data deduplication program";
     homepage = https://git.2f30.org/dedup/file/README.html;
     license = with licenses; [ bsd0 isc ];
     maintainers = with maintainers; [ dtzWill ];

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
 
   # for python cross-compiling
   _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
-  postConfigure = ''
+  # The i686 case is a quick hack; I don't know what's wrong.
+  postConfigure = stdenv.lib.optionalString (!stdenv.isi686) ''
     export LDSHARED="$LD -shared"
   '';
 

diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, curl, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "hcxtools";
+  version = "5.1.4";
+
+  src = fetchFromGitHub {
+    owner = "ZerBea";
+    repo = pname;
+    rev = version;
+    sha256 = "1bkl0j6m5q091fas99s83aclcc5kfwacmkgmyg8565z2npvnj7nf";
+  };
+
+  buildInputs = [ curl openssl zlib ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Tools for capturing wlan traffic and conversion to hashcat and John the Ripper formats";
+    homepage = https://github.com/ZerBea/hcxtools;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dywedir ];
+  };
+}
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     gnugrep
     gnused
     libnotify
-    pass
+    (pass.withExtensions (ext: [ ext.pass-otp ]))
     pwgen
     rofi
     utillinux

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1362,9 +1362,7 @@ in
 
   ddate = callPackage ../tools/misc/ddate { };
 
-  dedup = callPackage ../tools/backup/dedup {
-    inherit (llvmPackages) openmp;
-  };
+  dedup = callPackage ../tools/backup/dedup { };
 
   dehydrated = callPackage ../tools/admin/dehydrated { };
 
@@ -3533,6 +3531,8 @@ in
 
   hardinfo = callPackage ../tools/system/hardinfo { };
 
+  hcxtools = callPackage ../tools/security/hcxtools { };
+
   hdapsd = callPackage ../os-specific/linux/hdapsd { };
 
   hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
@@ -4082,7 +4082,7 @@ in
 
   matrix-synapse = callPackage ../servers/matrix-synapse { };
 
-  mautrix-telegram = callPackage ../servers/mautrix-telegram { };
+  mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
 
   mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };