diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5bf922d86d9..c655126cbdc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -393,6 +393,11 @@
github = "aneeshusa";
name = "Aneesh Agrawal";
};
+ angristan = {
+ email = "angristan@pm.me";
+ github = "angristan";
+ name = "Stanislas Lange";
+ };
ankhers = {
email = "justin.k.wood@gmail.com";
github = "ankhers";
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 0e067cf1f55..049d21d01b2 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -214,6 +214,11 @@
have a look at the official repo.
+
+
+ Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
+
+
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 89ddf80b575..bdbbfda2bb4 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -51,7 +51,7 @@ with lib;
systemd.packages = packages;
environment.variables = {
- GTK_USE_PORTAL = optional cfg.gtkUsePortal "1";
+ GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1";
XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
};
};
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 18b183eca9e..733b8f7636f 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -235,6 +235,7 @@ in
systemd.user.services.ssh-agent = mkIf cfg.startAgent
{ description = "SSH Agent";
wantedBy = [ "default.target" ];
+ unitConfig.ConditionUser = "!@system";
serviceConfig =
{ ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
ExecStart =
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 9fce9419a1a..2f3f76d79ff 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -502,6 +502,7 @@ in {
"d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -"
+ "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 802281e7164..03f3da75b14 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -28,6 +28,7 @@ let
"dovecot"
"fritzbox"
"json"
+ "mail"
"minio"
"nginx"
"node"
@@ -162,13 +163,19 @@ in
};
config = mkMerge ([{
- assertions = [{
+ assertions = [ {
assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null);
message = ''
Please ensure you have either `services.prometheus.exporters.snmp.configuration'
or `services.prometheus.exporters.snmp.configurationPath' set!
'';
- }];
+ } {
+ assertion = (cfg.mail.configFile == null) != (cfg.mail.configuration == {});
+ message = ''
+ Please specify either 'services.prometheus.exporters.mail.configuration'
+ or 'services.prometheus.exporters.mail.configFile'.
+ '';
+ } ];
}] ++ [(mkIf config.services.minio.enable {
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
new file mode 100644
index 00000000000..a1b46140d3e
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -0,0 +1,156 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.mail;
+
+ configurationFile = pkgs.writeText "prometheus-mail-exporter.conf" (builtins.toJSON (
+ # removes the _module attribute, null values and converts attrNames to lowercase
+ mapAttrs' (name: value:
+ if name == "servers"
+ then nameValuePair (toLower name)
+ ((map (srv: (mapAttrs' (n: v: nameValuePair (toLower n) v)
+ (filterAttrs (n: v: !(n == "_module" || v == null)) srv)
+ ))) value)
+ else nameValuePair (toLower name) value
+ ) (filterAttrs (n: _: !(n == "_module")) cfg.configuration)
+ ));
+
+ serverOptions.options = {
+ name = mkOption {
+ type = types.str;
+ description = ''
+ Value for label 'configname' which will be added to all metrics.
+ '';
+ };
+ server = mkOption {
+ type = types.str;
+ description = ''
+ Hostname of the server that should be probed.
+ '';
+ };
+ port = mkOption {
+ type = types.int;
+ example = 587;
+ description = ''
+ Port to use for SMTP.
+ '';
+ };
+ from = mkOption {
+ type = types.str;
+ example = "exporteruser@domain.tld";
+ description = ''
+ Content of 'From' Header for probing mails.
+ '';
+ };
+ to = mkOption {
+ type = types.str;
+ example = "exporteruser@domain.tld";
+ description = ''
+ Content of 'To' Header for probing mails.
+ '';
+ };
+ detectionDir = mkOption {
+ type = types.path;
+ example = "/var/spool/mail/exporteruser/new";
+ description = ''
+ Directory in which new mails for the exporter user are placed.
+ Note that this needs to exist when the exporter starts.
+ '';
+ };
+ login = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "exporteruser@domain.tld";
+ description = ''
+ Username to use for SMTP authentication.
+ '';
+ };
+ passphrase = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Password to use for SMTP authentication.
+ '';
+ };
+ };
+
+ exporterOptions.options = {
+ monitoringInterval = mkOption {
+ type = types.str;
+ example = "10s";
+ description = ''
+ Time interval between two probe attempts.
+ '';
+ };
+ mailCheckTimeout = mkOption {
+ type = types.str;
+ description = ''
+ Timeout until mails are considered "didn't make it".
+ '';
+ };
+ disableFileDelition = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Disables the exporter's function to delete probing mails.
+ '';
+ };
+ servers = mkOption {
+ type = types.listOf (types.submodule serverOptions);
+ default = [];
+ example = literalExample ''
+ [ {
+ name = "testserver";
+ server = "smtp.domain.tld";
+ port = 587;
+ from = "exporteruser@domain.tld";
+ to = "exporteruser@domain.tld";
+ detectionDir = "/path/to/Maildir/new";
+ } ]
+ '';
+ description = ''
+ List of servers that should be probed.
+ '';
+ };
+ };
+in
+{
+ port = 9225;
+ extraOpts = {
+ configFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Specify the mailexporter configuration file to use.
+ '';
+ };
+ configuration = mkOption {
+ type = types.submodule exporterOptions;
+ default = {};
+ description = ''
+ Specify the mailexporter configuration file to use.
+ '';
+ };
+ telemetryPath = mkOption {
+ type = types.str;
+ default = "/metrics";
+ description = ''
+ Path under which to expose metrics.
+ '';
+ };
+ };
+ serviceOpts = {
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.prometheus-mail-exporter}/bin/mailexporter \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ --config.file ${
+ if cfg.configuration != {} then configurationFile else cfg.configFile
+ } \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix
index 7b2eea3b585..263b70d04a5 100644
--- a/nixos/modules/services/network-filesystems/kbfs.nix
+++ b/nixos/modules/services/network-filesystems/kbfs.nix
@@ -48,6 +48,7 @@ in {
requires = [ "keybase.service" ];
after = [ "keybase.service" ];
path = [ "/run/wrappers" ];
+ unitConfig.ConditionUser = "!@system";
serviceConfig = {
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${cfg.mountPoint}";
ExecStart = "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${cfg.mountPoint}";
diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix
index a149f16a84c..85f52be8a6a 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixos/modules/services/networking/keybase.nix
@@ -26,6 +26,7 @@ in {
systemd.user.services.keybase = {
description = "Keybase service";
+ unitConfig.ConditionUser = "!@system";
serviceConfig = {
ExecStart = ''
${pkgs.keybase}/bin/keybase service --auto-forked
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 8148139c3a8..126f5b7b527 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -372,16 +372,18 @@ in {
systemd.packages = [ pkgs.syncthing ];
- users = mkIf (cfg.systemService && cfg.user == defaultUser) {
- users."${defaultUser}" =
+ users.users = mkIf (cfg.systemService && cfg.user == defaultUser) {
+ "${defaultUser}" =
{ group = cfg.group;
home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.syncthing;
description = "Syncthing daemon user";
};
+ };
- groups."${defaultUser}".gid =
+ users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
+ "${defaultUser}".gid =
config.ids.gids.syncthing;
};
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 2286d70be28..533054a4686 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -188,6 +188,48 @@ let
'';
};
+ mail = {
+ exporterConfig = {
+ enable = true;
+ user = "mailexporter";
+ configuration = {
+ monitoringInterval = "2s";
+ mailCheckTimeout = "10s";
+ servers = [ {
+ name = "testserver";
+ server = "localhost";
+ port = 25;
+ from = "mailexporter@localhost";
+ to = "mailexporter@localhost";
+ detectionDir = "/var/spool/mail/mailexporter/new";
+ } ];
+ };
+ };
+ metricProvider = {
+ services.postfix.enable = true;
+ systemd.services.prometheus-mail-exporter = {
+ after = [ "postfix.service" ];
+ requires = [ "postfix.service" ];
+ preStart = ''
+ mkdir -p 0600 mailexporter/new
+ '';
+ serviceConfig = {
+ ProtectHome = true;
+ ReadOnlyPaths = "/";
+ ReadWritePaths = "/var/spool/mail";
+ WorkingDirectory = "/var/spool/mail";
+ };
+ };
+ users.users.mailexporter.isSystemUser = true;
+ };
+ exporterTest = ''
+ waitForUnit("postfix.service")
+ waitForUnit("prometheus-mail-exporter.service")
+ waitForOpenPort(9225)
+ waitUntilSucceeds("curl -sSf http://localhost:9225/metrics | grep -q 'mail_deliver_success{configname=\"testserver\"} 1'")
+ '';
+ };
+
nginx = {
exporterConfig = {
enable = true;
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 77aa7994994..f7b24aa2824 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk
+, at-spi2-atk, at-spi2-core, apulse
}:
let
@@ -10,20 +10,22 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.0.96.181.gf6bc1b6b-12";
+ version = "1.1.10.546.ge08ef575-19";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "30";
+ rev = "36";
deps = [
alsaLib
+ apulse
atk
at-spi2-atk
+ at-spi2-core
cairo
cups
curl
@@ -72,7 +74,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
+ sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
};
buildInputs = [ squashfsTools makeWrapper ];
@@ -134,6 +136,8 @@ stdenv.mkDerivation {
librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \
--prefix LD_LIBRARY_PATH : "$librarypath" \
+ --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \
+ --set APULSE_PLAYBACK_DEVICE plug:dmix \
--prefix PATH : "${gnome3.zenity}/bin"
# fix Icon line in the desktop file (#48062)
@@ -158,7 +162,7 @@ stdenv.mkDerivation {
homepage = https://www.spotify.com/;
description = "Play music from the Spotify music service";
license = licenses.unfree;
- maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ];
+ maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 97681afbe15..20332a1bdd8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -233,6 +233,12 @@ self:
# upstream issue: missing file header
textmate = markBroken super.textmate;
+ treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or []) ++ [ external.git ];
+ });
+
# missing OCaml
utop = markBroken super.utop;
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index a65954d7d2a..1e07902365d 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }:
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "ghostwriter";
version = "1.8.0";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "wereturtle";
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 2957192f16e..b25ba8f567d 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "goxel-${version}";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
- sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw";
+ sha256 = "1mdw4bs7hvfn0yngd9ial5wzlfkcbhr3wzldb1w7s3s48agixkdr";
};
patches = [ ./disable-imgui_ini.patch ];
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 7a47a0e3bc0..e6e4ede6ac1 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -1,6 +1,6 @@
-{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }:
+{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }:
let
- runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ];
+ runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
in
stdenv.mkDerivation rec {
name = "clipmenu-${version}";
diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix
deleted file mode 100644
index 3d567603359..00000000000
--- a/pkgs/applications/misc/dmenu2/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "dmenu2-0.3pre-2014-07-08";
-
- src = fetchhg {
- url = "https://bitbucket.org/melek/dmenu2";
- rev = "36cb94a16edf928bdaaa636123392517ed469be0";
- sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv";
- };
-
- buildInputs = [ libX11 libXinerama zlib libXft ];
-
- postPatch = ''
- sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
- '';
-
- preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
-
- meta = {
- description = "A patched fork of the original dmenu - an efficient dynamic menu for X";
- homepage = https://bitbucket.org/melek/dmenu2;
- license = licenses.mit;
- maintainers = [ maintainers.cstrahan ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index af72e0a8d9a..585b4eef9ea 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -3,11 +3,9 @@
, gtk, girara, gettext, libxml2, check
, sqlite, glib, texlive, libintl, libseccomp
, file, librsvg
-, gtk-mac-integration, synctexSupport ? true
+, gtk-mac-integration
}:
-assert synctexSupport -> texlive != null;
-
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -29,7 +27,8 @@ stdenv.mkDerivation rec {
# "-Dseccomp=enabled"
"-Dmanpages=enabled"
"-Dconvert-icon=enabled"
- ] ++ optional synctexSupport "-Dsynctex=enabled";
+ "-Dsynctex=enabled"
+ ];
nativeBuildInputs = [
meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
@@ -38,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk girara libintl sqlite glib file librsvg
- ] ++ optional synctexSupport texlive.bin.core
- ++ optional stdenv.isLinux libseccomp
+ texlive.bin.core
+ ] ++ optional stdenv.isLinux libseccomp
++ optional stdenv.isDarwin gtk-mac-integration;
doCheck = true;
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index e3db15ca78d..1548b0581b6 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,7 +1,6 @@
{ config, pkgs
# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
-, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin)
-, synctexSupport ? true }:
+, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }:
let
callPackage = pkgs.newScope self;
@@ -9,9 +8,7 @@ let
self = rec {
gtk = pkgs.gtk3;
- zathura_core = callPackage ./core {
- inherit synctexSupport;
- };
+ zathura_core = callPackage ./core { };
zathura_pdf_poppler = callPackage ./pdf-poppler { };
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ea0e0184340..3e63389be02 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -67,7 +67,8 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
- "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+ "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng"
+ # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 89d969587a1..d8d2aff0d09 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0pq7q7plbmfg2f6m74wl2l19k15ik2mvw56bfzk4c9cdns8w6b8a";
- sha256bin64 = "09zf3kldvi8zh7arvl94vjmbvgsghwa51b5j0ic8ncdn880dlq0j";
- version = "76.0.3809.25";
+ sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
+ sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04";
+ version = "76.0.3809.87";
};
dev = {
- sha256 = "19v1i4ks5rpwdcwmfj8qqni4afyhnddb5hbbisabnjif3b8xrvjw";
- sha256bin64 = "0vsbxvqidrvw797h0and67pdb4maijsiv6jkpj3kqaxakiwnadxj";
- version = "76.0.3809.21";
+ sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw";
+ sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95";
+ version = "77.0.3860.5";
};
stable = {
- sha256 = "0f9qjhxvk8sajj7qa061crfmln65q7sniylrgp0qijwyw6xrmddi";
- sha256bin64 = "1xvqfrq119iwgvd2d4z2v2ladi2kl52kji55yxdmyi377dpk5rfa";
- version = "75.0.3770.90";
+ sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
+ sha256bin64 = "0hnfn2zxdrp96a4p98r08w4krzwkpb1kp4rjk03754akjyg1b3xx";
+ version = "76.0.3809.87";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index cb192bddcaf..02803daa219 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.5";
- sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap";
+ version = "0.12.6";
+ sha256 = "0vxvciv4amblxx50wivlm60fyj1ardfgdpj3l8cj9fhi79b3khxl";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/applications/networking/dsvpn/default.nix
new file mode 100644
index 00000000000..68198ae14e2
--- /dev/null
+++ b/pkgs/applications/networking/dsvpn/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "dsvpn";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jedisct1";
+ repo = pname;
+ rev = version;
+ sha256 = "1g747197zpg83ba9l9vxg8m3jv13wcprhnyr8asdxq745kzmynsr";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin dsvpn
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Dead Simple VPN";
+ homepage = "https://github.com/jedisct1/dsvpn";
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index bb8b721a8ac..0f1660096e6 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -1,36 +1,83 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
-, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:
+{ stdenv
+, fetchFromGitLab
+, fetchpatch
+, meson
+, ninja
+, gettext
+, cargo
+, rustc
+, python3
+, rustPlatform
+, pkgconfig
+, gtksourceview
+, hicolor-icon-theme
+, glib
+, libhandy
+, gtk3
+, dbus
+, openssl
+, sqlite
+, gst_all_1
+, cairo
+, gdk_pixbuf
+, gspell
+, wrapGAppsHook
+}:
rustPlatform.buildRustPackage rec {
- version = "4.0.0";
- name = "fractal-${version}";
+ pname = "fractal";
+ version = "4.2.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = version;
- sha256 = "05q47jdgbi5jz01280msb8gxnbsrgf2jvglfm6k40f1xw4wxkrzy";
+ sha256 = "0clwsmd6h759bzlazfq5ig56dbx7npx3h43yspk87j1rm2dp1177";
};
+ cargoSha256 = "1hwjajkphl5439dymglgj3h92hxgbf7xpipzrga7ga8m10nx1dhl";
+
nativeBuildInputs = [
- meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
- ];
- buildInputs = [
- glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
- gtksourceview hicolor-icon-theme libsecret
+ cargo
+ gettext
+ meson
+ ninja
+ pkgconfig
+ python3
+ rustc
+ wrapGAppsHook
];
- patches = [
- # Fixes build with >= gstreamer 1.15.1
+ buildInputs = [
+ cairo
+ dbus
+ gdk_pixbuf
+ glib
+ gspell
+ gst_all_1.gst-editing-services
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-base
+ gst_all_1.gstreamer
+ gtk3
+ gtksourceview
+ hicolor-icon-theme
+ libhandy
+ openssl
+ sqlite
+ ];
+
+ cargoPatches = [
+ # https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
(fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";
- sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";
+ url = "https://gitlab.gnome.org/GNOME/fractal/commit/2778acdc6c50bc6f034513029b66b0b092bc4c38.patch";
+ sha256 = "08v17xmbwrjw688ps4hsnd60d5fm26xj72an3zf6yszha2b97j6y";
})
];
postPatch = ''
- patchShebangs scripts/meson_post_install.py
+ chmod +x scripts/test.sh
+ patchShebangs scripts/meson_post_install.py scripts/test.sh
'';
# Don't use buildRustPackage phases, only use it for rust deps setup
@@ -39,13 +86,11 @@ rustPlatform.buildRustPackage rec {
checkPhase = null;
installPhase = null;
- cargoSha256 = "1ax5dv200v8mfx0418bx8sbwpbp6zj469xg75hp78kqfiv83pn1g";
-
meta = with stdenv.lib; {
description = "Matrix group messaging app";
homepage = https://gitlab.gnome.org/GNOME/fractal;
license = licenses.gpl3;
- maintainers = with maintainers; [ dtzWill ];
+ maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index a9ee4dd6aea..60a4dd39fb0 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
+{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha
, auth0ClientID, auth0Domain }:
stdenv.mkDerivation rec {
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9";
};
- nativeBuildInputs = [ nodejs-8_x ruby sencha ];
+ nativeBuildInputs = [ nodejs-10_x ruby sencha ];
node_modules = fetchNodeModules {
inherit src;
- nodejs = nodejs-8_x;
+ nodejs = nodejs-10_x;
sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy";
};
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index 1106aa86a0a..ffa55a88c8a 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -2,26 +2,19 @@
stdenv.mkDerivation rec {
pname = "rambox-pro";
- version = "1.1.2";
+ version = "1.1.4";
dontBuild = true;
dontStrip = true;
- buildInputs = [ nss xorg.libxkbfile ];
+ buildInputs = [ nss xorg.libXext xorg.libxkbfile xorg.libXScrnSaver ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
- sha256 = "0rrfpl371hp278b02b9b6745ax29yrdfmxrmkxv6d158jzlv0dlr";
+ sha256 = "0vwh3km3h46bgynd10s8ijl3aj5sskzncdj14h3k7h4sibd8r71a";
};
- postPatch = ''
- substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/vendor/depot_tools/create-chromium-git-src \
- --replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
- substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/node_modules/bloom-filter-cpp/vendor/depot_tools/create-chromium-git-src \
- --replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
- '';
-
installPhase = ''
mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications
asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index e5ebac2b896..94c02ab0226 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -6,7 +6,7 @@ at-spi2-atk, libuuid, nodePackages
let
- version = "4.0.0";
+ version = "4.0.1";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -51,7 +51,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e";
+ sha256 = "1g7c8jka750pblsfzjvfyf7sp1m409kybqagml9miif1v71scxv2";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
@@ -113,6 +113,7 @@ in stdenv.mkDerivation {
description = "Desktop client for Slack";
homepage = https://slack.com;
license = licenses.unfree;
+ maintainers = [ maintainers.mmahut ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 82af30811a6..8aa732fd6ba 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, mkDerivation, makeWrapper, makeDesktopItem, autoPatchelfHook
-, wrapQtAppsHook
+{ stdenv, fetchurl, mkDerivation, autoPatchelfHook
+, fetchFromGitHub
# Dynamic libraries
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
@@ -22,12 +22,20 @@ let
};
};
+ # Used for icons, appdata, and desktop file.
+ desktopIntegration = fetchFromGitHub {
+ owner = "flathub";
+ repo = "us.zoom.Zoom";
+ rev = "0d294e1fdd2a4ef4e05d414bc680511f24d835d7";
+ sha256 = "0rm188844a10v8d6zgl2pnwsliwknawj09b02iabrvjw5w1lp6wl";
+ };
+
in mkDerivation {
name = "zoom-us-${version}";
src = srcs.${stdenv.hostPlatform.system};
- nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
+ nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo
@@ -66,15 +74,26 @@ in mkDerivation {
runHook postInstall
'';
- postInstall = (makeDesktopItem {
- name = "zoom-us";
- exec = "$out/bin/zoom-us %U";
- icon = "$out/share/zoom-us/application-x-zoom.png";
- desktopName = "Zoom";
- genericName = "Video Conference";
- categories = "Network;Application;";
- mimeType = "x-scheme-handler/zoommtg;";
- }).buildCommand + ''
+ postInstall = ''
+ mkdir -p $out/share/{applications,appdata,icons}
+
+ # Desktop File
+ cp ${desktopIntegration}/us.zoom.Zoom.desktop $out/share/applications
+ substituteInPlace $out/share/applications/us.zoom.Zoom.desktop \
+ --replace "Exec=zoom" "Exec=$out/bin/zoom-us"
+
+ # Appdata
+ cp ${desktopIntegration}/us.zoom.Zoom.appdata.xml $out/share/appdata
+
+ # Icons
+ for icon_size in 64 96 128 256; do
+ path=$icon_size'x'$icon_size
+ icon=${desktopIntegration}/us.zoom.Zoom.$icon_size.png
+
+ mkdir -p $out/share/icons/hicolor/$path/apps
+ cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png
+ done
+
ln -s $out/share/zoom-us/zoom $out/bin/zoom-us
'';
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 9642c54a26a..9f641061bd8 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -14,7 +14,7 @@ assert iceSupport -> zeroc_ice != null;
with stdenv.lib;
let
- generic = overrides: source: stdenv.mkDerivation (source // overrides // {
+ generic = overrides: source: (if source.qtVersion == 5 then qt5.mkDerivation else stdenv.mkDerivation) (source // overrides // {
name = "${overrides.type}-${source.version}";
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
@@ -26,7 +26,7 @@ let
# protobuf is freezed to 3.6 because of this bug: https://github.com/mumble-voip/mumble/issues/3617
# this could be reverted to the latest version in a future release of mumble as it is already fixed in master
buildInputs = [ boost protobuf3_6 avahi ]
- ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
+ ++ optional (source.qtVersion == 4) qt4
++ (overrides.buildInputs or [ ]);
qmakeFlags = [
@@ -45,20 +45,23 @@ let
++ (overrides.configureFlags or [ ]);
preConfigure = ''
- qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib"
+ qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib/mumble"
patchShebangs scripts
'';
makeFlags = [ "release" ];
installPhase = ''
- mkdir -p $out/{lib,bin}
- find release -type f -not -name \*.\* -exec cp {} $out/bin \;
- find release -type f -name \*.\* -exec cp {} $out/lib \;
+ runHook preInstall
+ ${overrides.installPhase}
+
+ # doc stuff
mkdir -p $out/share/man/man1
- cp man/mum* $out/share/man/man1
- '' + (overrides.installPhase or "");
+ install -Dm644 man/mum* $out/share/man/man1/
+
+ runHook postInstall
+ '';
enableParallelBuilding = true;
@@ -74,7 +77,7 @@ let
client = source: generic {
type = "mumble";
- nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ];
+ nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
buildInputs = [ libopus libsndfile speex ]
++ optional (source.qtVersion == 5) qt5.qtsvg
++ optional stdenv.isLinux alsaLib
@@ -89,12 +92,19 @@ let
NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
installPhase = ''
- mkdir -p $out/share/applications
- cp scripts/mumble.desktop $out/share/applications
+ # bin stuff
+ install -Dm755 release/mumble $out/bin/mumble
+ install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay
- mkdir -p $out/share/icons{,/hicolor/scalable/apps}
- cp icons/mumble.svg $out/share/icons
- ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps
+ # lib stuff
+ mkdir -p $out/lib/mumble
+ cp -P release/libmumble.so* $out/lib
+ cp -P release/libcelt* $out/lib/mumble
+ cp -P release/plugins/* $out/lib/mumble
+
+ # icons
+ install -Dm644 scripts/mumble.desktop $out/share/applications/mumble.desktop
+ install -Dm644 icons/mumble.svg $out/share/icons/hicolor/scalable/apps/mumble.svg
'';
} source;
@@ -110,6 +120,11 @@ let
];
buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice;
+
+ installPhase = ''
+ # bin stuff
+ install -Dm755 release/murmurd $out/bin/murmurd
+ '';
};
stableSource = rec {
@@ -138,26 +153,24 @@ let
];
};
- gitSource = rec {
- version = "2019-07-10";
+ rcSource = rec {
+ version = "1.3.0-rc2";
qtVersion = 5;
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
- rev = "41b265584654c7ac216fd3ccb9c141734d3f839b";
+ rev = version;
sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr";
fetchSubmodules = true;
};
};
in {
mumble = client stableSource;
- mumble_git = client gitSource;
+ mumble_rc = client rcSource;
murmur = server stableSource;
- murmur_git = (server gitSource).overrideAttrs (old: {
+ murmur_rc = (server rcSource).overrideAttrs (old: {
meta = old.meta // { broken = iceSupport; };
-
- nativeBuildInputs = old.nativeBuildInputs or [] ++ [ qt5.wrapQtAppsHook ];
});
}
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index 1527f5d3dda..e7f5eab8bfa 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -2,16 +2,17 @@
stdenv.mkDerivation rec {
name = "strelka-${version}";
- version = "2.9.5";
+ version = "2.9.10";
src = fetchFromGitHub {
owner = "Illumina";
repo = "strelka";
rev = "v${version}";
- sha256 = "0x4a6nkx1jnyag9svghsdjz1fz6q7qx5pn77wphdfnk81f9yspf8";
+ sha256 = "1nykbmim1124xh22nrhrsn8xgjb3s2y7akrdapn9sl1gdych4ppf";
};
- buildInputs = [ cmake zlib python2 ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ zlib python2 ];
preConfigure = ''
sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 742babf721a..87b7be5bdd2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -345,8 +345,6 @@ lib.makeScope pkgs.newScope (self: with self; {
nautilus-python = callPackage ./misc/nautilus-python { };
- pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
-
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; };
pomodoro = callPackage ./misc/pomodoro { };
@@ -398,4 +396,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gtk = gtk3;
gtkmm = gtkmm3;
rest = librest;
+
+ pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
})
diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
new file mode 100644
index 00000000000..6f1cc3df409
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-extension-pidgin-im-integration";
+ version = "32";
+
+ src = fetchFromGitHub {
+ owner = "muffinmad";
+ repo = "pidgin-im-gnome-shell-extension";
+ rev = "v${version}";
+ sha256 = "1jyg8r0s1v83sgg6y0jbsj2v37mglh8rvd8vi27fxnjq9xmg8kpc";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ share_dir="$prefix/share"
+ extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
+ mkdir -p "$extensions_dir"
+ mv *.js metadata.json dbus.xml schemas locale "$extensions_dir"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension;
+ description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ ];
+ };
+}
diff --git a/pkgs/desktops/gnome-3/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
deleted file mode 100644
index c11fdfa6099..00000000000
--- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, glib }:
-
-stdenv.mkDerivation rec {
- version = "1.0.1";
- basename = "pidgin-im-gnome-shell-extension";
- name = "${basename}-${version}";
-
- src = fetchFromGitHub {
- owner = "muffinmad";
- repo = "${basename}";
- rev = "v${version}";
- sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr";
- };
-
- buildInputs = [ glib ];
-
- configurePhase = "";
- buildPhase = "";
- installPhase = ''
- share_dir="$prefix/share"
- extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
- mkdir -p "$extensions_dir"
- mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir"
-
- schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
- mkdir -p "$schemas_dir"
- mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
- glib-compile-schemas "$schemas_dir"
-
- locale_dir="$share_dir/locale"
- mkdir -p "$locale_dir"
- mv locale/* $locale_dir # fix Emacs syntax highlighting: */
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension;
- description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 1b84b934852..715b000f323 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
-, menhir, merlin_extend, ppx_tools_versioned, utop
+, menhir, merlin-extend, ppx_tools_versioned, utop
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
+ propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune utop menhir ];
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index c3b494783e7..ba65c00f1e9 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "joker-${version}";
- version = "0.12.2";
+ version = "0.12.4";
goPackagePath = "github.com/candid82/joker";
@@ -10,11 +10,13 @@ buildGoPackage rec {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "0cqz8k53fzz3xqx9czk3hgq164dsbvnk51s0j29g1bmkbl51c2vm";
+ sha256 = "1swi991khmyhxn6w6xsdqp1wbyx3qmd9d7yhpwvqasyxp8gg3szm";
};
preBuild = "go generate ./...";
+ postBuild = "rm go/bin/sum256dir";
+
dontInstallSrc = true;
excludedPackages = "gen"; # Do not install private generators.
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index c2d449ed13c..8a490bbc986 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -1,13 +1,17 @@
-{ callPackage }:
+{ pkgs }:
+let
+ inherit (pkgs) callPackage;
+ icu = pkgs.icu60;
+in
{
ticcutils = callPackage ./ticcutils.nix { };
- libfolia = callPackage ./libfolia.nix { };
- ucto = callPackage ./ucto.nix { };
+ libfolia = callPackage ./libfolia.nix { inherit icu; };
+ ucto = callPackage ./ucto.nix { inherit icu; };
uctodata = callPackage ./uctodata.nix { };
timbl = callPackage ./timbl.nix { };
timblserver = callPackage ./timblserver.nix { };
mbt = callPackage ./mbt.nix { };
- frog = callPackage ./frog.nix { };
+ frog = callPackage ./frog.nix { inherit icu; };
frogdata = callPackage ./frogdata.nix { };
test = callPackage ./test.nix { };
diff --git a/pkgs/development/libraries/protobuf/3.8.nix b/pkgs/development/libraries/protobuf/3.8.nix
new file mode 100644
index 00000000000..2ea03643b3a
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.8.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.8.0";
+ sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
+}
diff --git a/pkgs/development/libraries/protobuf/3.9.nix b/pkgs/development/libraries/protobuf/3.9.nix
new file mode 100644
index 00000000000..6652ba7648c
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.9.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.9.0";
+ sha256 = "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw";
+}
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index e29801c51f9..6821474c4d0 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -12,7 +12,7 @@ rec {
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv python which file jdk nodejs;
- inherit (pkgs.nodePackages_8_x) alloy titanium;
+ inherit (pkgs.nodePackages_10_x) alloy titanium;
inherit (androidenv) composeAndroidPackages;
inherit (xcodeenv) composeXcodeWrapper;
inherit titaniumsdk;
diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index fa4b4c3be56..9f723a6da47 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
{pkgs ? import {
inherit system;
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 880d72efd35..4f05009f3ef 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix
deleted file mode 100644
index 7fcc3f81133..00000000000
--- a/pkgs/development/node-packages/composition-v8.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
-
-let
- nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
- inherit nodejs;
- libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
- };
-in
-import ./node-packages-v8.nix {
- inherit (pkgs) fetchurl fetchgit;
- inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index 50b33f7effd..8a479924d46 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -7,15 +7,6 @@ let
};
in
nodePackages // {
- aws-azure-login = nodePackages.aws-azure-login.override {
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true";
-
- buildInputs = [ pkgs.makeWrapper ];
- postInstall = ''
- wrapProgram "$out/bin/aws-azure-login" --set PUPPETEER_EXECUTABLE_PATH "${pkgs.chromium}/bin/chromium"
- '';
- };
-
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
deleted file mode 100644
index d90c3ab3364..00000000000
--- a/pkgs/development/node-packages/default-v8.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, nodejs, stdenv }:
-
-let
- nodePackages = import ./composition-v8.nix {
- inherit pkgs nodejs;
- inherit (stdenv.hostPlatform) system;
- };
-in
-nodePackages // {
- pnpm = nodePackages.pnpm.override {
- nativeBuildInputs = [ pkgs.makeWrapper ];
- postInstall = let
- pnpmLibPath = stdenv.lib.makeBinPath [
- nodejs.passthru.python
- nodejs
- ];
- in ''
- for prog in $out/bin/*; do
- wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
- done
- '';
- };
-
- stf = nodePackages.stf.override {
- nativeBuildInputs = with pkgs; [ yasm czmq protobufc ];
- };
-}
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 5975cc8966b..dafbcb17f7e 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -4,6 +4,5 @@
set -eu -o pipefail
rm -f node-env.nix
-node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 670556bf271..720e0cc0850 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -11,7 +11,7 @@ let
cat > $out/bin/tar <=0.9.6" "plac>=0.9.6" \
- --replace "regex==" "regex>=" \
- --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0"
+ --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 05121f2b9b2..086218b8439 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -30,8 +30,6 @@ buildPythonPackage rec {
sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f";
};
- disabled = isPy27; # 2.7 requires backports.csv
-
propagatedBuildInputs = [
cachetools
cld2-cffi
@@ -64,5 +62,8 @@ buildPythonPackage rec {
homepage = "http://textacy.readthedocs.io/";
license = licenses.asl20;
maintainers = with maintainers; [ rvl ];
+ # ftfy and jellyfish no longer support python2
+ # latest scikitlearn not supported for this: https://github.com/chartbeat-labs/textacy/issues/260
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index 08b1d67ffee..9c9c932cabf 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zstd";
- version = "1.4.0.0";
+ version = "1.4.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "01prq9rwz1gh42idnj2162w79dzs8gf3ac8pn12lz347w280kjbk";
+ sha256 = "0laxg0pag1bzmqmg4x81jb32412pn98p9zg2b0li035m779nka95";
};
postPatch = ''
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index f8843c61582..58e72e4a9f4 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -41,6 +41,7 @@ let
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
+ meta = { platforms = ruby.meta.platforms; } // meta;
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index ae3246c9277..0770eea4ad4 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
rainbow (3.0.0)
reverse_markdown (1.1.0)
nokogiri
- rubocop (0.72.0)
+ rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
@@ -23,7 +23,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
- solargraph (0.34.2)
+ solargraph (0.35.1)
backport (~> 1.1)
bundler (>= 1.17.2)
htmlentities (~> 4.3, >= 4.3.4)
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index 0cfd8c5d66b..f5854a6533d 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -11,7 +11,7 @@ bundlerApp rec {
description = "IDE tools for the Ruby language";
homepage = http://www.github.com/castwide/solargraph;
license = licenses.mit;
- maintainers = with maintainers; [ worldofpeace nicknovitski ];
+ maintainers = with maintainers; [ worldofpeace nicknovitski angristan ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 5677801826a..7fa679fc162 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -118,10 +118,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2";
+ sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
type = "gem";
};
- version = "0.72.0";
+ version = "0.74.0";
};
ruby-progressbar = {
groups = ["default"];
@@ -139,10 +139,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r217wvspg7mmjvkng3ksas3pbcy90iiw46r4b8xzd08y8p66ssy";
+ sha256 = "00pq74a3zvb7x333mwcz7m73p7g4sjwzxmci94jwasl0h35fapzg";
type = "gem";
};
- version = "0.34.2";
+ version = "0.35.1";
};
thor = {
groups = ["default"];
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix
new file mode 100644
index 00000000000..4d1b22a72b5
--- /dev/null
+++ b/pkgs/development/tools/analysis/oclgrind/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
+
+stdenv.mkDerivation rec {
+ pname = "oclgrind";
+ version = "18.3"; # see comment in all-packages.nix
+
+ src = fetchFromGitHub {
+ owner = "jrprice";
+ repo = "oclgrind";
+ rev = "v${version}";
+ sha256 = "0s42z3dg684a0gk8qyx2h08cbh95zkrdaaj9y71rrc5bjsg8197x";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ];
+
+ cmakeFlags = [
+ "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "An OpenCL device simulator and debugger";
+ homepage = https://github.com/jrprice/oclgrind;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ athas ];
+ };
+}
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index 645cd62c3c4..af25f3f7595 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "mdsh-${version}";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
- sha256 = "17pd090wpnx7i8q9pp9rhps35ahm1xn4h6pm1cfsafm072qd7rff";
+ sha256 = "0m3f5mrdmnmkfsy7mc6x3jf4ainmq0z42mv935ikcdbjwwjbd5gq";
};
- cargoSha256 = "0a2d2qnb0wkxcs2l839p7jsr99ng2frahsfi2viy9fjynsjpvzlm";
+ cargoSha256 = "11kzl0ns84xhdacn0k7nilgzgpwazmaaqdjf2kcarxf2h01b0rjv";
meta = with stdenv.lib; {
description = "Markdown shell pre-processor";
diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index 5d18d344281..df5bee57be6 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
rainbow (3.0.0)
- rubocop (0.73.0)
+ rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index 9eaa50eff95..892d0d74d7b 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b5zc8xaqb5krchjrjqj7sc205awmnpksc4ng0rbckd6xcbr7n0f";
+ sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
type = "gem";
};
- version = "0.73.0";
+ version = "0.74.0";
};
ruby-progressbar = {
groups = ["default"];
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
deleted file mode 100644
index 90d88215d3f..00000000000
--- a/pkgs/development/web/nodejs/v8.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, enableNpm ? true }:
-
-let
- buildNodejs = callPackage ./nodejs.nix {};
-in
- buildNodejs {
- inherit enableNpm;
- version = "8.16.0";
- sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m";
- }
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 32c24174b5e..10fbc98d51a 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 9df36bde4b0..e7b4f81f7e0 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 41f3813b94b..4ccdb254daa 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
- version = "20190310";
- sha256 = "0mqzl7k9q7lfkmk8fk9dfzi2dm45h31mrid9265qh2d56nk28ali";
+ version = "20190615";
+ sha256 = "1bdvj363yjn7agqq1fxdfz31j1rrs2wc02v874jjx5sw1bfq5qsa";
owner = "Winetricks";
repo = "winetricks";
rev = version;
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index f1820d65ed0..cf4896bf56b 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "metabase-${version}";
- version = "0.32.9";
+ pname = "metabase";
+ version = "0.32.10";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "08iybb1m2pmimn0fs95kd948yf6c1xmg5kkzm9ykx4cpb9pn1yw0";
+ sha256 = "0dzwwwvsi9pr40xbqws02yzjgx89ygjiybjd0n73hj69v6j9f2rn";
};
nativeBuildInputs = [ makeWrapper ];
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
- homepage = https://metabase.com;
+ description = "The easy, open source way for everyone in your company to ask questions and learn from data";
+ homepage = "https://metabase.com";
license = licenses.agpl3;
platforms = platforms.all;
maintainers = with maintainers; [ schneefux thoughtpolice ];
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
new file mode 100644
index 00000000000..129c2b33372
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "mailexporter-${version}";
+ version = "2019-07-14";
+
+ goPackagePath = "github.com/cherti/mailexporter";
+
+ src = fetchFromGitHub {
+ rev = "c60d1970abbedb15e70d6fc858f7fd76fa061ffe";
+ owner = "cherti";
+ repo = "mailexporter";
+ sha256 = "0wlw7jvmhgvg1r2bsifxm2d0vj0iqhplnx6n446625sslvddx3vn";
+ };
+
+ goDeps = ./mail-exporter_deps.nix;
+
+ postInstall = ''
+ install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1
+ install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Export Prometheus-style metrics about mail server functionality";
+ homepage = "https://github.com/cherti/mailexporter";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ willibutz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix
new file mode 100644
index 00000000000..221f179940b
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter_deps.nix
@@ -0,0 +1,92 @@
+[
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d";
+ sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "a6c69798cccecfd43070693e4416838767f73e18";
+ sha256 = "0s6xprvkdyfvmx4540454972fn3gvrzy7fyv0yq42h32nw3l7p75";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "31bed53e4047fd6c510e43a941f90cb31be0972a";
+ sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "8f55e607908ea781ad9d08521730d73e047d9ac4";
+ sha256 = "023581b68mz89yhgnk4w08ch05ix60v0hv9jlqz65w43s4j7g4vb";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "04f50cda93cbb67f2afa353c52f342100e80e625";
+ sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+]
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 3c383591386..1c00f734c19 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -43,7 +43,7 @@ buildGoPackage rec {
description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
homepage = https://github.com/prometheus/pushgateway;
license = licenses.asl20;
- maintainers = with maintainers; [ benley fpletz ivan ];
+ maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 94cdf801ff2..de1b6ec0b12 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
+{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, scons
+, less
}:
with stdenv.lib;
@@ -11,6 +12,8 @@ let # in mariadb # spans the whole file
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
+mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]);
+
mariadb = everything // {
inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin
server = everything; # a full single-output build, including everything in `client` again
@@ -133,12 +136,13 @@ everything = stdenv.mkDerivation (common // {
outputs = [ "out" "dev" "man" ];
- nativeBuildInputs = common.nativeBuildInputs ++ [ bison ];
+ nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper;
buildInputs = common.buildInputs ++ [
xz lzo lz4 bzip2 snappy
libxml2 boost judy libevent cracklib
- ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl;
+ ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl
+ ++ optional (!stdenv.isDarwin) mytopEnv;
cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql"
@@ -161,6 +165,8 @@ everything = stdenv.mkDerivation (common // {
cmakeFlags="$cmakeFlags \
-DINSTALL_SHAREDIR=$dev/share/mysql
-DINSTALL_SUPPORTFILESDIR=$dev/share/mysql"
+ '' + optionalString (!stdenv.isDarwin) ''
+ patchShebangs scripts/mytop.sh
'';
postInstall = ''
@@ -181,6 +187,11 @@ everything = stdenv.mkDerivation (common // {
sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
'';
+ # perlPackages.DBDmysql is broken on darwin
+ postFixup = optionalString (!stdenv.isDarwin) ''
+ wrapProgram $out/bin/mytop --set PATH ${less}/bin/less
+ '';
+
CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
});
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index c77c01f8d20..77da47b00e0 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
name = "timescaledb-${version}";
- version = "1.4.0";
+ version = "1.4.1";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
- sha256 = "0xjl3pdm36pksbkhl44kixqkfv8qpdm4frfwxv0p4vvjmlhslz48";
+ sha256 = "1gbca0fyaxjkwijdp2ah4iykwq5xabz9kkf8ak76sif4lz64y54b";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
homepage = https://www.timescale.com/;
- maintainers = with maintainers; [ volth ];
+ maintainers = with maintainers; [ volth marsam ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;
};
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index bad068245f3..76c4bfc428e 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,8 +49,8 @@ in rec {
};
unifiStable = generic {
- version = "5.10.23";
- sha256 = "0ak8crx3anxsx4r3b9k0rihgafkgsxj7f64z48nrk1l8m7f0wwxg";
+ version = "5.10.25";
+ sha256 = "1v03r7qd09s6lz37wwlsrqiy1jcwxnvj1q87jwpmhdipjprcjfdx";
};
unifiTesting = generic {
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index cae300a53f4..75e28e2382e 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
@@ -14,4 +14,4 @@ in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index b896b8b088e..2c43bb420eb 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.8";
+ version = "0.9.9";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = "refs/tags/${version}";
- sha256 = "0lnvx1kdk1nwv988wrxyvbzb25xawz517amvi4pwzs22bymcdhws";
+ sha256 = "0c6ywzn72clcclawgf1khwaaj3snn49fmajz8qfhc5mpbnvdp7q0";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 8b3324ad66a..d82347fef8f 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jdupes-${version}";
- version = "1.13.1";
+ version = "1.13.2";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
- sha256 = "1f001l56dx7aixlpl7438shzh8b2vanx8k1sywm9ix6cak1k8rzr";
+ sha256 = "1dzw1h9x9addkxf7r8lb8y09wmdkx8i61f5m96589r88jjk965xy";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile
index ac6abd42c89..b2e34d5120e 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile
+++ b/pkgs/tools/misc/riemann-tools/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
-gem "riemann-tools", "0.2.13"
+gem "riemann-tools"
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock
index 65057156ad1..881b8aefcdf 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile.lock
+++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -4,21 +4,22 @@ GEM
beefcake (1.0.0)
json (1.8.6)
mtrc (0.0.4)
+ optimist (3.0.0)
riemann-client (0.2.6)
beefcake (>= 0.3.5, <= 1.0.0)
mtrc (>= 0.0.4)
trollop (>= 1.16.2)
- riemann-tools (0.2.13)
+ riemann-tools (0.2.14)
json (~> 1.8)
- riemann-client (>= 0.2.6)
- trollop (>= 1.16.2)
+ optimist (~> 3.0, >= 3.0.0)
+ riemann-client (~> 0.2, >= 0.2.6)
trollop (2.9.9)
PLATFORMS
ruby
DEPENDENCIES
- riemann-tools (= 0.2.13)
+ riemann-tools
BUNDLED WITH
1.17.2
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix
index 450fba80b72..e775de987d6 100644
--- a/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -29,6 +29,16 @@
};
version = "0.0.4";
};
+ optimist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
riemann-client = {
dependencies = ["beefcake" "mtrc" "trollop"];
groups = ["default"];
@@ -41,15 +51,15 @@
version = "0.2.6";
};
riemann-tools = {
- dependencies = ["json" "riemann-client" "trollop"];
+ dependencies = ["json" "optimist" "riemann-client"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa";
+ sha256 = "07w9x3iw32zwpzsm9l63vn0nv1778qls1blqysr45m7l7x6n5wjx";
type = "gem";
};
- version = "0.2.13";
+ version = "0.2.14";
};
trollop = {
groups = ["default"];
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index a4d322ae184..d5eecff7278 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -1,26 +1,18 @@
-{ stdenv, fetchurl, perl, perlPackages, makeWrapper }:
+{ stdenv, fetchurl, perl, perlPackages }:
let
pname = "stow";
- version = "2.3.0";
+ version = "2.3.1";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnu/stow/stow-${version}.tar.bz2";
- sha256 = "1fnn83wwx3yaxpqkq8xyya3aiibz19fwrfj30nsiikm7igmwgiv5";
+ sha256 = "0bs2b90wjkk1camcasy8kn403kazq6c7fj5m5msfl3navbgwz9i6";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = with perlPackages; [ perl IOStringy TestOutput HashMerge Clone CloneChoose ];
-
- postFixup = ''
- wrapProgram "$out"/bin/stow \
- --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; makePerlPath [
- HashMerge Clone CloneChoose
- ]}"
- '';
+ buildInputs = with perlPackages; [ perl IOStringy TestOutput ];
doCheck = true;
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index 9b0f5e477a1..aed902044f9 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = "v${version}";
- sha256 = "01n4x84rpmyjyfga90s2s63gdk17z944hz35fk95qnshc5fapfq8";
+ sha256 = "17klcw2iv7d636mp7fb80kjvqd3xqkzqhwz41ri1l029dxji4zzh";
};
dontBuild = true;
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 0983d3e127b..8fe405e1b3e 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 0983d3e127b..8fe405e1b3e 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix
index 6fb6421eb2d..ea2be5965aa 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages.nix
+++ b/pkgs/tools/security/bitwarden-cli/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 0878e058c3e..d68fd5e7e92 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -6,11 +6,11 @@
in stdenv.mkDerivation {
- name = "ghidra-9.0.2";
+ name = "ghidra-9.0.4";
src = fetchurl {
- url = https://ghidra-sre.org/ghidra_9.0.2_PUBLIC_20190403.zip;
- sha256 = "10ffd65c266e9f5b631c8ed96786c41ef30e2de939c3c42770573bb3548f8e9f";
+ url = https://ghidra-sre.org/ghidra_9.0.4_PUBLIC_20190516.zip;
+ sha256 = "1gqqxk57hswwgr97qisqivcfgjdxjipfdshyh4r76dyrfpa0q3d5";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index b86bb1a221c..3b916378bf5 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
other applications. A wealth of frontend applications and libraries are
available.
'';
- platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile b/pkgs/tools/system/hiera-eyaml/Gemfile
index 18c7cde2a08..2c2e8f27e40 100644
--- a/pkgs/tools/system/hiera-eyaml/Gemfile
+++ b/pkgs/tools/system/hiera-eyaml/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
-gem 'hiera-eyaml', '2.1.0'
+gem 'hiera-eyaml'
diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/tools/system/hiera-eyaml/Gemfile.lock
index a6d1c1f872e..259c2e170b0 100644
--- a/pkgs/tools/system/hiera-eyaml/Gemfile.lock
+++ b/pkgs/tools/system/hiera-eyaml/Gemfile.lock
@@ -1,17 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
- hiera-eyaml (2.1.0)
+ hiera-eyaml (3.0.0)
highline (~> 1.6.19)
- trollop (~> 2.0)
+ optimist
highline (1.6.21)
- trollop (2.1.2)
+ optimist (3.0.0)
PLATFORMS
ruby
DEPENDENCIES
- hiera-eyaml (= 2.1.0)
+ hiera-eyaml
BUNDLED WITH
- 1.11.2
+ 1.17.2
diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/tools/system/hiera-eyaml/gemset.nix
index ab6d5307ebb..d5aa722e5fc 100644
--- a/pkgs/tools/system/hiera-eyaml/gemset.nix
+++ b/pkgs/tools/system/hiera-eyaml/gemset.nix
@@ -1,11 +1,14 @@
{
hiera-eyaml = {
+ dependencies = ["highline" "optimist"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h25pfv89macjf3sjdrx7slhlq1af4zybai42ci3gj02b6hli4a6";
+ sha256 = "049rxnwyivqgyjl0sjg7cb2q44ic0wsml288caspd1ps8v31gl18";
type = "gem";
};
- version = "2.1.0";
+ version = "3.0.0";
};
highline = {
source = {
@@ -15,12 +18,14 @@
};
version = "1.6.21";
};
- trollop = {
+ optimist = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
type = "gem";
};
- version = "2.1.2";
+ version = "3.0.0";
};
}
\ No newline at end of file
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 5b61220d50a..e4595e64c08 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
# https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a
./CVE-2018-6951.patch
(fetchurl {
- url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Allow_input_files_to_be_missing_for_ed-style_patches.patch;
+ url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1;
sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64";
})
(fetchurl { # CVE-2018-1000156
- url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Fix_arbitrary_command_execution_in_ed-style_patches.patch;
+ url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d;
sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg";
})
# https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 311767a786f..4fa90441bdb 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "ripgrep";
- version = "11.0.1";
+ version = "11.0.2";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = pname;
rev = version;
- sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb";
+ sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
};
- cargoSha256 = "1k1wg27p7w8b3cgygnkr6yhsc4hpnvrpa227s612vy2zfcmgb1kx";
+ cargoSha256 = "11477l4l1y55klw5dp2kbsnv989vdz1547ml346hcfbkzv7m450v";
cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bb5fddf532b..09ca629d346 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -417,6 +417,10 @@ mapAliases ({
gst-plugins-good = pkgs.gst-plugins-good;
gst-plugins-ugly = pkgs.gst-plugins-ugly;
};
+
+ # added 2019-08-01
+ mumble_git = pkgs.mumble_rc;
+ murmur_git = pkgs.murmur_rc;
} // (with ocaml-ng; { # added 2016-09-14
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2906f85d15..e84099803a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -653,7 +653,7 @@ in
iamy = callPackage ../tools/admin/iamy { };
- azure-cli = nodePackages_8_x.azure-cli;
+ azure-cli = nodePackages_10_x.azure-cli;
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
@@ -1482,6 +1482,8 @@ in
gtk = gtk3;
};
+ dsvpn = callPackage ../applications/networking/dsvpn { };
+
dtools = callPackage ../development/tools/dtools { };
dtrx = callPackage ../tools/compression/dtrx { };
@@ -4313,9 +4315,6 @@ in
nodejs-slim = nodejs-slim-10_x;
- nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
- nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
-
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
openssl = openssl_1_1;
};
@@ -4350,10 +4349,6 @@ in
nodejs = pkgs.nodejs-10_x;
});
- nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix {
- nodejs = pkgs.nodejs-8_x;
- });
-
nodePackages = nodePackages_10_x;
now-cli = callPackage ../development/web/now-cli {};
@@ -7657,9 +7652,7 @@ in
haskell = callPackage ./haskell-packages.nix { };
- haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc865.override {
- overrides = haskell.packageOverrides;
- });
+ haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc865;
inherit (haskellPackages) ghc;
@@ -11272,7 +11265,9 @@ in
stdenv = gccStdenv;
};
- languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
+ languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix {
+ inherit pkgs;
+ });
lasem = callPackage ../development/libraries/lasem { };
@@ -12834,6 +12829,8 @@ in
protobuf = protobuf3_7;
+ protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { };
+ protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
@@ -14801,6 +14798,7 @@ in
prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
+ prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
@@ -16536,7 +16534,7 @@ in
iosevka = callPackage ../data/fonts/iosevka {
- nodejs = nodejs-8_x;
+ nodejs = nodejs-10_x;
};
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};
@@ -17549,7 +17547,11 @@ in
dmenu = callPackage ../applications/misc/dmenu { };
- dmenu2 = callPackage ../applications/misc/dmenu2 { };
+ # TODO (@primeos): Remove after the 19.09 branch-off:
+ dmenu2 = throw ''
+ The fork "dmenu2" is not maintained by upstream anymore. Please use the
+ original "dmenu" instead.
+ '';
dmensamenu = callPackage ../applications/misc/dmensamenu {
inherit (python3Packages) buildPythonApplication requests;
@@ -19424,7 +19426,7 @@ in
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
- }) mumble mumble_git murmur;
+ }) mumble mumble_rc murmur;
inherit (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
@@ -19432,7 +19434,7 @@ in
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = false;
- }) murmur_git;
+ }) murmur_rc;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux"
@@ -22412,6 +22414,7 @@ in
mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { };
nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
+ pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { };
system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { };
@@ -23903,6 +23906,10 @@ in
sndio = callPackage ../misc/sndio { };
+ # Oclgrind 18.3 does not work with newer LLVMs (but HEAD does, so
+ # fix this after next release).
+ oclgrind = callPackage ../development/tools/analysis/oclgrind { llvmPackages = llvmPackages_6; };
+
opkg = callPackage ../tools/package-management/opkg { };
opkg-utils = callPackage ../tools/package-management/opkg-utils { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 949c5b6a308..a543e31bdcb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -436,7 +436,7 @@ let
merlin = callPackage ../development/tools/ocaml/merlin { };
- merlin_extend = callPackage ../development/ocaml-modules/merlin_extend { };
+ merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
mezzo = callPackage ../development/compilers/mezzo { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 025564b0bd2..d581522a548 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -129,6 +129,8 @@ in {
py3to2 = callPackage ../development/python-modules/3to2 { };
+ pynamodb = callPackage ../development/python-modules/pynamodb { };
+
absl-py = callPackage ../development/python-modules/absl-py { };
adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };
@@ -482,7 +484,9 @@ in {
btchip = callPackage ../development/python-modules/btchip { };
- datatable = callPackage ../development/python-modules/datatable { };
+ datatable = callPackage ../development/python-modules/datatable {
+ inherit (pkgs.llvmPackages) openmp libcxx libcxxabi;
+ };
datamodeldict = callPackage ../development/python-modules/datamodeldict { };