diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a761915d8ae..058561eb624a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1109,10 +1109,6 @@
githubId = 977929;
name = "Cody Allen";
};
- cf6b88f = {
- email = "elmo.todurov@eesti.ee";
- name = "Elmo Todurov";
- };
cfouche = {
email = "chaddai.fouche@gmail.com";
github = "Chaddai";
@@ -1219,6 +1215,12 @@
githubId = 3956062;
name = "Simon Lackerbauer";
};
+ cizra = {
+ email = "todurov+nix@gmail.com";
+ github = "cizra";
+ githubId = 2131991;
+ name = "Elmo Todurov";
+ };
ck3d = {
email = "ck3d@gmx.de";
github = "ck3d";
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 4c20cfcdd7d2..a83c4fb965eb 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -7,10 +7,12 @@
NixOS
+
nixos-rebuild
reconfigure a NixOS machine
+
nixos-rebuild
@@ -74,6 +76,7 @@
builder-spec
+
@@ -121,8 +124,10 @@
+
Description
+
This command updates the system so that it corresponds to the configuration
specified in /etc/nixos/configuration.nix. Thus, every
@@ -133,9 +138,11 @@
(re)starts any system services if needed. Please note that user services need
to be started manually as they aren't detected by the activation script at the moment.
+
This command has one required argument, which specifies the desired
operation. It must be one of the following:
+
@@ -152,6 +159,7 @@
+
@@ -165,6 +173,7 @@
+
@@ -179,6 +188,7 @@
+
@@ -197,6 +207,7 @@
+
@@ -208,6 +219,7 @@
+
@@ -222,6 +234,7 @@
+
@@ -232,6 +245,7 @@
+
@@ -249,12 +263,14 @@
$ ./result/bin/run-*-vm
+
The VM is implemented using the qemu package. For
best performance, you should load the kvm-intel or
kvm-amd kernel modules to get hardware
virtualisation.
+
The VM mounts the Nix store of the host through the 9P file system. The
host Nix store is read-only, so Nix commands that modify the Nix store
@@ -262,6 +278,7 @@
nixos-rebuild; to change the VM’s configuration,
you must halt the VM and re-run the commands above.
+
The VM has its own ext3 root file system, which is
automatically created when the VM is first started, and is persistent
@@ -272,6 +289,7 @@
+
@@ -294,11 +312,13 @@
+
Options
This command accepts the following options:
+
@@ -310,6 +330,7 @@
+
@@ -321,6 +342,7 @@
+
@@ -336,6 +358,7 @@
+
@@ -349,6 +372,7 @@
+
@@ -363,6 +387,7 @@
+
builder-spec
@@ -382,6 +407,7 @@
+
@@ -412,6 +438,7 @@
+
@@ -437,6 +464,7 @@
+
@@ -449,6 +477,7 @@
be accessible over ssh, and for the commands ,
and you need root access.
+
If is not explicitly specified,
will implicitly be set to the same value as
@@ -457,6 +486,7 @@
place remotely (and no build artifacts will be copied to the local
machine).
+
You can include a remote user name in the host name
(user@host). You can also set ssh options by
@@ -465,6 +495,7 @@
+
In addition, nixos-rebuild accepts various Nix-related
flags, including / ,
@@ -473,8 +504,10 @@
. See the Nix manual for details.
+
Environment
+
@@ -487,6 +520,7 @@
+
NIX_SSHOPTS
@@ -500,9 +534,12 @@
+
Files
+
+
/run/current-system
@@ -513,6 +550,7 @@
+
/nix/var/nix/profiles/system
@@ -524,8 +562,10 @@
+
+
Bugs
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d1303f90ad8d..0c7c45a4708b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -273,20 +273,6 @@ with lib;
(mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
(mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
- # Redshift
- (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
- (config:
- let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
- in if value == null then
- throw "services.redshift.latitude is set to null, you can remove this"
- else builtins.fromJSON value))
- (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
- (config:
- let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
- in if value == null then
- throw "services.redshift.longitude is set to null, you can remove this"
- else builtins.fromJSON value))
-
# Redis
(mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
(mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 5f5469e48507..db5dc915c89f 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -120,16 +120,24 @@ in {
'';
};
- poolConfig = mkOption {
- type = types.lines;
- default = ''
- pm = dynamic
- pm.max_children = 32
- pm.start_servers = 2
- pm.min_spare_servers = 2
- pm.max_spare_servers = 4
- pm.max_requests = 500
+ poolSettings = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool ]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = "32";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "2";
+ "pm.max_spare_servers" = "4";
+ "pm.max_requests" = "500";
+ };
+ description = ''
+ Options for nextcloud's PHP pool. See the documentation on php-fpm.conf for details on configuration directives.
'';
+ };
+
+ poolConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
description = ''
Options for nextcloud's PHP pool. See the documentation on php-fpm.conf for details on configuration directives.
'';
@@ -287,6 +295,11 @@ in {
message = "Please specify exactly one of adminpass or adminpassFile";
}
];
+
+ warnings = optional (cfg.poolConfig != null) ''
+ Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
+ Please migrate your configuration to config.services.nextcloud.poolSettings.
+ '';
}
{ systemd.timers.nextcloud-cron = {
@@ -423,7 +436,7 @@ in {
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
- };
+ } // cfg.poolSettings;
extraConfig = cfg.poolConfig;
};
};
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 6ddb4c83764a..21b0b33553ac 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -9,6 +9,22 @@ let
in {
+ imports = [
+ (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
+ (config:
+ let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
+ in if value == null then
+ throw "services.redshift.latitude is set to null, you can remove this"
+ else builtins.fromJSON value))
+ (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
+ (config:
+ let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
+ in if value == null then
+ throw "services.redshift.longitude is set to null, you can remove this"
+ else builtins.fromJSON value))
+ (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
+ ];
+
options.services.redshift = {
enable = mkOption {
type = types.bool;
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 74c150a848d1..ddfd1af4a319 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -218,7 +218,7 @@ in
systemd.user = {
services.nixos-activation = {
- description = "Run user specific NixOS activation";
+ description = "Run user-specific NixOS activation";
script = config.system.userActivationScripts.script;
unitConfig.ConditionUser = "!@system";
serviceConfig.Type = "oneshot";
diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 18753ae0c1ae..7fe066991918 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -88,7 +88,7 @@ let cfg = config.system.autoUpgrade; in
HOME = "/root";
} // config.networking.proxy.envVars;
- path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gitMinimal config.nix.package.out ];
+ path = with pkgs; [ coreutils gnutar xz.bin gzip gitMinimal config.nix.package.out ];
script = let
nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 41510eebff60..6a5532f92c95 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
- sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j";
+ sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm";
};
dontBuild = true;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 40d16733db27..6f7e3ad0ba4b 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
- x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
+ x86_64-linux = "1wxaxz2q4qizh6f23ipz8ihay6bpjdq0545vijqd84fqazcji6sq";
+ x86_64-darwin = "1gb9w3hvw3avn852an5v8m1ia64fkavnvaawjfc3455b248iiqvk";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.38.0";
+ version = "1.38.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 02d0396a94f5..b526d8fe327e 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
- x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
+ x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
+ x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.38.0";
+ version = "1.38.1";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index fa75dd1eb97a..b7c691e9594b 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -70,10 +70,13 @@ mkDerivation {
kpurpose
kdeclarative
];
+ patches = [ ./mlt-path.patch ];
+ inherit mlt;
postPatch =
# Module Qt5::Concurrent must be included in `find_package` before it is used.
''
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+ substituteAllInPlace src/kdenlivesettings.kcfg
'';
meta = {
license = with lib.licenses; [ gpl2Plus ];
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index a58b3b8c45d8..ab24f15a14bc 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -7,7 +7,7 @@
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
- messagelib, pim-sieve-editor, qtscript, qtwebengine,
+ messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi
}:
mkDerivation {
@@ -25,6 +25,6 @@ mkDerivation {
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
];
- propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
+ propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
patches = [ ./kmail.patch ];
}
diff --git a/pkgs/applications/kde/mlt-path.patch b/pkgs/applications/kde/mlt-path.patch
new file mode 100644
index 000000000000..9bfb66c1a839
--- /dev/null
+++ b/pkgs/applications/kde/mlt-path.patch
@@ -0,0 +1,22 @@
+diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
+--- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400
++++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400
+@@ -378,14 +378,14 @@
+
+
+
+-
++
+
+-
++ @mlt@/share/mlt/profiles
+
+
+-
++
+
+-
++ @mlt@/bin/melt
+
+
+
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 5f4e24f4d3cc..1c33a92987c1 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -22,17 +22,21 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ glib libxml2 exiv2 imagemagick ];
+ prePatch = ''
+ sed -i 's|#include |#include |' src/jpeg-utils.cpp
+ '';
+
installPhase = ''
mkdir $out/{bin,share} -p
cp src/cgg{,-dirgen} $out/bin/
'';
- meta = {
- homepage = http://cgg.bzatek.net/;
- description = "a simple static web photo gallery, designed to be clean and easily usable";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
+ meta = with stdenv.lib; {
+ homepage = "http://cgg.bzatek.net/";
+ description = "A simple static web photo gallery, designed to be clean and easily usable";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.matthiasbeyer ];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 0016f89746d6..af47afcc601d 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -7,15 +7,15 @@ let
else
[ wxGTK ];
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "diff-pdf";
- version = "2017-12-30";
+ version = "0.3";
src = fetchFromGitHub {
owner = "vslavik";
repo = "diff-pdf";
- rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc";
- sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m";
+ rev = "v${version}";
+ sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
@@ -24,9 +24,10 @@ stdenv.mkDerivation {
preConfigure = "./bootstrap";
meta = with stdenv.lib; {
- homepage = http://vslavik.github.io/diff-pdf;
+ homepage = "https://vslavik.github.io/diff-pdf/";
description = "Simple tool for visually comparing two PDF files";
license = licenses.gpl2;
+ platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
};
}
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6f380114a276..8381f182e5d3 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -5,13 +5,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "gcalcli";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "insanum";
repo = pname;
rev = "v${version}";
- sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf";
+ sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72";
};
postPatch = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6e9296da267b..4b2ed9af24e0 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
- version = "7.12";
+ version = "7.13";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc";
+ sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
};
nativeBuildInputs = [ qmake ];
@@ -28,7 +28,7 @@ mkDerivation rec {
all common GPS log file formats.
'';
license = licenses.gpl3;
- maintainers = [ maintainers.womfoo ];
+ maintainers = with maintainers; [ womfoo sikmir ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index 410b04d5dcbd..ff0332e1e5ff 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "joplin-desktop";
- version = "1.0.158";
+ version = "1.0.167";
in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage";
- sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q";
+ sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw";
};
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 60ff84ffe593..fa865dcc16c4 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "wtf";
- version = "0.21.0";
+ version = "0.22.0";
overrideModAttrs = _oldAttrs : _oldAttrs // {
preBuild = ''export GOPROXY="https://gocenter.io"'';
@@ -17,17 +17,18 @@ buildGoModule rec {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
- sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
- };
+ sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb";
+ };
- modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic";
+ modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
- wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin"
+ mv "$out/bin/wtf" "$out/bin/wtfutil"
+ wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index e1b5a4425d51..3d75ef543bcc 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.12.0"; in
+let version = "0.12.5"; in
buildGoPackage {
pname = "kubecfg";
@@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
- sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";
+ sha256 = "0pn37qkwn3kdsd0z3qxk95lqjn2zak7gkk0pwlqp26jmrx0vv18l";
};
goPackagePath = "github.com/bitnami/kubecfg";
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 9a4ab636c5fe..4ebb5bf86cb3 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,13 +3,13 @@
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let
- version = "5.3.1";
+ version = "5.3.2";
in stdenv.mkDerivation {
pname = "franz";
inherit version;
src = fetchurl {
url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
- sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d";
+ sha256 = "19mfw0wgjdhq38p0xvixdxvk07j3rdwlw87p8gjh4yi1qv0paj4i";
};
# don't remove runtime deps
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 29b314417c76..314a3bb64571 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -1,49 +1,40 @@
{ stdenv, fetchgit
-, pkgconfig, makeWrapper
-, qmake, qtbase, qtquickcontrols2, qtmultimedia
+, pkgconfig, wrapQtAppsHook
+, cmake
+, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
, libpulseaudio
# Not mentioned but seems needed
, qtgraphicaleffects
, qtdeclarative
, qtmacextras
+, olm, cmark
}:
-let
- # Following "borrowed" from yubikey-manager-qt
- qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
-
- inherit (stdenv) lib;
-
- qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
- qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
- ];
-
+let qtkeychain-qt5 = qtkeychain.override {
+ inherit qtbase qttools;
+ withQt5 = true;
+};
in stdenv.mkDerivation {
pname = "spectral";
- version = "2019-03-03";
+ version = "unstable-2019-08-30";
src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";
- rev = "0473f25d38a064ee4e18203ec16eeae84fea4866";
- sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw";
+ rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
+ sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
fetchSubmodules = true;
};
- qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
+ #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
- postInstall = ''
- wrapProgram $out/bin/spectral \
- --set QML2_IMPORT_PATH "${qml2ImportPath}"
- '';
-
- nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
- buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
+ nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
+ buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
meta = with stdenv.lib; {
- description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
- homepage = https://gitlab.com/b0/spectral;
+ description = "A glossy cross-platform Matrix client.";
+ homepage = "https://gitlab.com/b0/spectral";
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ dtzWill ];
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index a04ec0bb16ce..99e9d856a717 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -28,7 +28,7 @@ let
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
- "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
+ "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 8c8c09d25a0a..8ed3deed804c 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cytoscape";
- version = "3.7.1";
+ version = "3.7.2";
src = fetchurl {
url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
+ sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc";
};
buildInputs = [jre makeWrapper];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index fa93ff41a4ae..0299d4ab48ec 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "6.1.4";
+ version = "6.2.0";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr";
+ sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k";
};
libPath = makeLibraryPath [
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index a15a4cd5999a..2e216369de9c 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -2,10 +2,14 @@
#
# Derivation patches HandBrake to use Nix closure dependencies.
#
+# NOTE: 2019-07-19: This derivation does not currently support the native macOS
+# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
+# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
+# requires invoking the Xcode build system, which is non-trivial for now.
{ stdenv, lib, fetchurl,
# Main build tools
- python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
+ python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma,
# Processing, video codecs, containers
ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
# Codecs, audio
@@ -14,20 +18,34 @@
libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
# Optical media
libdvdread, libdvdnav, libdvdcss, libbluray,
- useGtk ? true, wrapGAppsHook ? null,
- intltool ? null,
- glib ? null,
- gtk3 ? null,
- libappindicator-gtk3 ? null,
- libnotify ? null,
- gst_all_1 ? null,
- dbus-glib ? null,
- udev ? null,
- libgudev ? null,
- hicolor-icon-theme ? null,
+ # Darwin-specific
+ AudioToolbox ? null,
+ Foundation ? null,
+ libobjc ? null,
+ VideoToolbox ? null,
+ # GTK
+ # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
+ # which in turn depends on systemd. systemd is not supported on Darwin, so
+ # for now we disable GTK GUI support on Darwin. (It may be possible to remove
+ # this restriction later.)
+ useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null,
+ intltool ? null,
+ glib ? null,
+ gtk3 ? null,
+ libappindicator-gtk3 ? null,
+ libnotify ? null,
+ gst_all_1 ? null,
+ dbus-glib ? null,
+ udev ? null,
+ libgudev ? null,
+ hicolor-icon-theme ? null,
+ # FDK
useFdk ? false, fdk_aac ? null
}:
+assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
+ && libobjc != null && VideoToolbox != null;
+
stdenv.mkDerivation rec {
pname = "handbrake";
version = "1.2.2";
@@ -45,12 +63,13 @@ stdenv.mkDerivation rec {
ffmpeg-full libogg libtheora x264 x265 libvpx
libopus lame libvorbis a52dec speex libsamplerate
libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
- libdvdread libdvdnav libdvdcss libbluray
+ libdvdread libdvdnav libdvdcss libbluray lzma
] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
libgudev hicolor-icon-theme
] ++ lib.optional useFdk fdk_aac
+ ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ]
# NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
# look at ./make/configure.py search "enable_nvenc"
++ lib.optional stdenv.isLinux nv-codec-headers;
@@ -59,13 +78,16 @@ stdenv.mkDerivation rec {
# (default distribution bundles&builds 3rd party libs),
# don't trigger cmake build
dontUseCmakeConfigure = true;
- enableParallelBuilding = true;
+ # cp: cannot create regular file './internal_defaults.json': File exists
+ enableParallelBuilding = false;
preConfigure = ''
patchShebangs scripts
substituteInPlace libhb/module.defs \
--replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
+ substituteInPlace libhb/module.defs \
+ --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2
# Force using nixpkgs dependencies
sed -i '/MODULES += contrib/d' make/include/main.defs
@@ -75,8 +97,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-df-fetch"
"--disable-df-verify"
- (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
- (if useFdk then "--enable-fdk-aac" else "")
+ (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
+ (if useFdk then "--enable-fdk-aac" else "")
+ (if stdenv.isDarwin then "--disable-xcode" else "")
];
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 176c4be4946d..c41ba899ddd1 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -7,13 +7,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
mkDerivation rec {
pname = "shotcut";
- version = "19.08.16";
+ version = "19.09.14";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
- sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801";
+ sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
};
enableParallelBuilding = true;
@@ -36,7 +36,7 @@ mkDerivation rec {
qtWrapperArgs = [
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
- "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}"
+ "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}"
"--prefix PATH : ${mlt}/bin"
];
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 0d2d0278cc3b..07b6d0249904 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,7 +17,7 @@
buildGoPackage rec {
project = "cri-o";
- version = "1.15.1";
+ version = "1.15.2";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@@ -26,7 +26,7 @@ buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0";
+ sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4";
};
outputs = [ "bin" "out" ];
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index bea5fea0f9d3..5186b9fe4a5e 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,9 +1,11 @@
{ lib, fetchzip }:
-fetchzip {
- name = "source-sans-pro-2.045";
+let
+ version = "3.006";
+in fetchzip {
+ name = "source-sans-pro-${version}";
- url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip;
+ url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip";
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
@@ -12,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
- sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
+ sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr";
meta = with lib; {
homepage = https://adobe-fonts.github.io/source-sans-pro/;
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 2964b8692dcc..f8830bbd2116 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
let
pname = "spleen";
- version = "1.0.5";
+ version = "1.3.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -10,14 +10,13 @@ in fetchurl {
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
- tar xf $downloadedFile --strip=1
+ tar xvf $downloadedFile --strip=1
d="$out/share/fonts/X11/misc/spleen"
gzip -n9 *.pcf
- install -Dm644 *.pcf.gz -t $d
- install -Dm644 *.bdf -t $d
+ install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
install -m644 fonts.alias-spleen $d/fonts.alias
'';
- sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb";
+ sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q";
meta = with lib; {
description = "Monospaced bitmap fonts";
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 5d68396a4980..869f08154bbb 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -38,7 +38,9 @@ let
};
deepin-turbo = callPackage ./deepin-turbo { };
deepin-wallpapers = callPackage ./deepin-wallpapers { };
- deepin-wm = callPackage ./deepin-wm { };
+ deepin-wm = callPackage ./deepin-wm {
+ vala = pkgs.vala_0_42;
+ };
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { };
dtkwidget = callPackage ./dtkwidget { };
diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
new file mode 100644
index 000000000000..0e1c33773b0e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
@@ -0,0 +1,147 @@
+From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001
+From: worldofpeace
+Date: Sun, 15 Sep 2019 20:14:16 -0400
+Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the
+ next relayout/repaint"
+
+This causes issues for users of mutter like in gala[0].
+
+Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
+[0]: https://github.com/elementary/gala/issues/605
+---
+ clutter/clutter/clutter-actor.c | 35 +++++----------------------------
+ 1 file changed, 5 insertions(+), 30 deletions(-)
+
+diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
+index e70892308..8cb60fa07 100644
+--- a/clutter/clutter/clutter-actor.c
++++ b/clutter/clutter/clutter-actor.c
+@@ -24,7 +24,7 @@
+
+ /**
+ * SECTION:clutter-actor
+- * @short_description: The basic element of the scene graph
++ * @short_description: The basic element of the scene graph
+ *
+ * The ClutterActor class is the basic element of the scene graph in Clutter,
+ * and it encapsulates the position, size, and transformations of a node in
+@@ -840,7 +840,6 @@ struct _ClutterActorPrivate
+ guint needs_compute_expand : 1;
+ guint needs_x_expand : 1;
+ guint needs_y_expand : 1;
+- guint needs_paint_volume_update : 1;
+ guint had_effects_on_last_paint_volume_update : 1;
+ };
+
+@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self)
+
+ CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
+
+- self->priv->needs_paint_volume_update = TRUE;
+-
+ stage = _clutter_actor_get_stage_internal (self);
+ priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);
+
+@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self)
+ priv->needs_width_request = TRUE;
+ priv->needs_height_request = TRUE;
+ priv->needs_allocation = TRUE;
+- priv->needs_paint_volume_update = TRUE;
+
+ /* reset the cached size requests */
+ memset (priv->width_requests, 0,
+@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor *self,
+ ClutterRotateAxis axis,
+ const ClutterVertex *center)
+ {
+- ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO;
++ ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO;
+ GObject *obj = G_OBJECT (self);
+ ClutterTransformInfo *info;
+
+@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self)
+ priv->needs_width_request = TRUE;
+ priv->needs_height_request = TRUE;
+ priv->needs_allocation = TRUE;
+- priv->needs_paint_volume_update = TRUE;
+
+ priv->cached_width_age = 1;
+ priv->cached_height_age = 1;
+@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor *self,
+ return;
+ }
+
+- if (CLUTTER_ACTOR_IS_MAPPED (self))
+- self->priv->needs_paint_volume_update = TRUE;
+-
+ if (!stage_allocation_changed)
+ {
+ /* If the actor didn't move but needs_allocation is set, we just
+@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor *self,
+ child->priv->needs_height_request = TRUE;
+ child->priv->needs_allocation = TRUE;
+
+- if (CLUTTER_ACTOR_IS_MAPPED (child))
+- child->priv->needs_paint_volume_update = TRUE;
+-
+ /* we only queue a relayout here, because any possible
+ * redraw has already been queued either by show() or
+ * by our call to queue_redraw() above
+@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self)
+ *
+ * Since: 0.6
+ *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+ * clutter_actor_set_translation() instead.
+ */
+ void
+@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self,
+ *
+ * Since: 0.6
+ *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+ * clutter_actor_set_translation() instead.
+ */
+ void
+@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor *self,
+ *
+ * Since: 0.6
+ *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and
++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+ * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set
+ * pivot_point to (0.5,0.5) and the translation to (width/2,height/2).
+ */
+@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+
+ if (priv->paint_volume_valid)
+ {
+- /* If effects are applied, the actor paint volume
+- * needs to be recomputed on each paint, since those
+- * paint volumes could change over the duration of the
+- * effect.
+- *
+- * We also need to update the paint volume if we went
+- * from having effects to not having effects on the last
+- * paint volume update. */
+- if (!priv->needs_paint_volume_update &&
+- priv->current_effect == NULL &&
+- !has_paint_volume_override_effects &&
+- !priv->had_effects_on_last_paint_volume_update)
+- return &priv->paint_volume;
+ clutter_paint_volume_free (&priv->paint_volume);
+ }
+
+@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+ if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
+ {
+ priv->paint_volume_valid = TRUE;
+- priv->needs_paint_volume_update = FALSE;
+ return &priv->paint_volume;
+ }
+ else
+--
+2.22.1
+
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 41527298ffbe..cc00fc5ece44 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch";
sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh";
})
+ # See patch commit message
+ ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
];
configureFlags = [
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index ea305cc5c84c..6c47cbcd3a57 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "dtc";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
- sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh";
+ sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
};
nativeBuildInputs = [ flex bison pkgconfig swig which ];
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index c8bef546b6d9..ce18200943ea 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -56,6 +56,8 @@ let
*/
elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
+ elm-language-server = elmNodePackages."@elm-tooling/elm-language-server";
+
# elm-analyse@0.16.4 build is not working
elm-analyse = elmNodePackages."elm-analyse-0.16.3";
inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref;
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 870ad900210a..1ffd758ac82e 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let
nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json
index 5ba7e49bfa62..9faaaced709e 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/pkgs/development/compilers/elm/packages/node-packages.json
@@ -5,5 +5,6 @@
"elm-upgrade",
{ "elm-analyse": "0.16.3" },
"elm-live",
- "elm-xref"
+ "elm-xref",
+ "@elm-tooling/elm-language-server"
]
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 7605c377057f..45fb96ed6934 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -13,6 +13,33 @@ let
sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
};
};
+ "@nodelib/fs.scandir-2.1.2" = {
+ name = "_at_nodelib_slash_fs.scandir";
+ packageName = "@nodelib/fs.scandir";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz";
+ sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==";
+ };
+ };
+ "@nodelib/fs.stat-2.0.2" = {
+ name = "_at_nodelib_slash_fs.stat";
+ packageName = "@nodelib/fs.stat";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz";
+ sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==";
+ };
+ };
+ "@nodelib/fs.walk-1.2.3" = {
+ name = "_at_nodelib_slash_fs.walk";
+ packageName = "@nodelib/fs.walk";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz";
+ sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==";
+ };
+ };
"@sindresorhus/is-0.7.0" = {
name = "_at_sindresorhus_slash_is";
packageName = "@sindresorhus/is";
@@ -22,6 +49,42 @@ let
sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
};
};
+ "@types/events-3.0.0" = {
+ name = "_at_types_slash_events";
+ packageName = "@types/events";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
+ sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
+ };
+ };
+ "@types/glob-7.1.1" = {
+ name = "_at_types_slash_glob";
+ packageName = "@types/glob";
+ version = "7.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+ sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
+ };
+ };
+ "@types/minimatch-3.0.3" = {
+ name = "_at_types_slash_minimatch";
+ packageName = "@types/minimatch";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
+ sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+ };
+ };
+ "@types/node-12.7.5" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "12.7.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz";
+ sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==";
+ };
+ };
"accepts-1.3.7" = {
name = "accepts";
packageName = "accepts";
@@ -85,13 +148,13 @@ let
sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
};
};
- "anymatch-3.0.3" = {
+ "anymatch-3.1.0" = {
name = "anymatch";
packageName = "anymatch";
- version = "3.0.3";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz";
- sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==";
+ url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz";
+ sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==";
};
};
"arr-diff-4.0.0" = {
@@ -130,6 +193,15 @@ let
sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
};
};
+ "array-union-2.1.0" = {
+ name = "array-union";
+ packageName = "array-union";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz";
+ sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
+ };
+ };
"array-unique-0.3.2" = {
name = "array-unique";
packageName = "array-unique";
@@ -517,13 +589,13 @@ let
sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==";
};
};
- "chokidar-3.0.0" = {
+ "chokidar-3.0.2" = {
name = "chokidar";
packageName = "chokidar";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz";
- sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g==";
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz";
+ sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
};
};
"chownr-1.1.2" = {
@@ -544,15 +616,6 @@ let
sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
};
};
- "cli-color-1.2.0" = {
- name = "cli-color";
- packageName = "cli-color";
- version = "1.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz";
- sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1";
- };
- };
"cliui-5.0.0" = {
name = "cliui";
packageName = "cliui";
@@ -616,22 +679,13 @@ let
sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
};
};
- "commander-2.9.0" = {
+ "commander-3.0.1" = {
name = "commander";
packageName = "commander";
- version = "2.9.0";
+ version = "3.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
- sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
- };
- };
- "commander-3.0.0" = {
- name = "commander";
- packageName = "commander";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz";
- sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==";
+ url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz";
+ sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ==";
};
};
"component-emitter-1.3.0" = {
@@ -670,15 +724,6 @@ let
sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
};
};
- "connect-pushstate-1.1.0" = {
- name = "connect-pushstate";
- packageName = "connect-pushstate";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz";
- sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24";
- };
- };
"content-disposition-0.5.2" = {
name = "content-disposition";
packageName = "content-disposition";
@@ -778,6 +823,15 @@ let
sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
};
};
+ "crocks-0.12.1" = {
+ name = "crocks";
+ packageName = "crocks";
+ version = "0.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz";
+ sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ==";
+ };
+ };
"cross-spawn-4.0.0" = {
name = "cross-spawn";
packageName = "cross-spawn";
@@ -814,15 +868,6 @@ let
sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
};
};
- "d-1.0.1" = {
- name = "d";
- packageName = "d";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
- sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
- };
- };
"dashdash-1.14.1" = {
name = "dashdash";
packageName = "dashdash";
@@ -886,13 +931,13 @@ let
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
- "default-gateway-2.7.2" = {
+ "default-gateway-4.2.0" = {
name = "default-gateway";
packageName = "default-gateway";
- version = "2.7.2";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz";
- sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==";
+ url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
+ sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
};
};
"define-properties-1.1.3" = {
@@ -967,6 +1012,15 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
+ "dir-glob-3.0.1" = {
+ name = "dir-glob";
+ packageName = "dir-glob";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
+ sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
+ };
+ };
"duplexer3-0.1.4" = {
name = "duplexer3";
packageName = "duplexer3";
@@ -994,13 +1048,23 @@ let
sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
};
};
- "elm-serve-0.4.0" = {
- name = "elm-serve";
- packageName = "elm-serve";
- version = "0.4.0";
+ "elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" = {
+ name = "elm-analyse";
+ packageName = "elm-analyse";
+ version = "0.16.4";
+ src = fetchgit {
+ url = "git://github.com/elm-tooling/elm-analyse";
+ rev = "f2a983fc7bab262a3e44b46732735d8510d18876";
+ sha256 = "ce2770330503a0b8fe56eb369a95e9bad13b46676ff76f5303570d731cea4de2";
+ };
+ };
+ "elm-hot-1.1.1" = {
+ name = "elm-hot";
+ packageName = "elm-hot";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz";
- sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw==";
+ url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz";
+ sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA==";
};
};
"elm-test-0.19.0-rev6" = {
@@ -1048,13 +1112,13 @@ let
sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
};
};
- "es-abstract-1.13.0" = {
+ "es-abstract-1.14.2" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.13.0";
+ version = "1.14.2";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
- sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz";
+ sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==";
};
};
"es-to-primitive-1.2.0" = {
@@ -1066,24 +1130,6 @@ let
sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
};
};
- "es5-ext-0.10.50" = {
- name = "es5-ext";
- packageName = "es5-ext";
- version = "0.10.50";
- src = fetchurl {
- url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz";
- sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==";
- };
- };
- "es6-iterator-2.0.3" = {
- name = "es6-iterator";
- packageName = "es6-iterator";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
- sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
- };
- };
"es6-promisify-6.0.2" = {
name = "es6-promisify";
packageName = "es6-promisify";
@@ -1093,24 +1139,6 @@ let
sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
};
};
- "es6-symbol-3.1.1" = {
- name = "es6-symbol";
- packageName = "es6-symbol";
- version = "3.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
- sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
- };
- };
- "es6-weak-map-2.0.3" = {
- name = "es6-weak-map";
- packageName = "es6-weak-map";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
- sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
- };
- };
"escape-html-1.0.3" = {
name = "escape-html";
packageName = "escape-html";
@@ -1138,15 +1166,6 @@ let
sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
};
};
- "event-emitter-0.3.5" = {
- name = "event-emitter";
- packageName = "event-emitter";
- version = "0.3.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
- sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
- };
- };
"eventemitter3-3.1.2" = {
name = "eventemitter3";
packageName = "eventemitter3";
@@ -1165,15 +1184,6 @@ let
sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
};
};
- "execa-0.10.0" = {
- name = "execa";
- packageName = "execa";
- version = "0.10.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz";
- sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==";
- };
- };
"execa-1.0.0" = {
name = "execa";
packageName = "execa";
@@ -1183,6 +1193,15 @@ let
sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
};
};
+ "execa-2.0.4" = {
+ name = "execa";
+ packageName = "execa";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz";
+ sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ==";
+ };
+ };
"expand-brackets-2.1.4" = {
name = "expand-brackets";
packageName = "expand-brackets";
@@ -1282,6 +1301,24 @@ let
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
};
};
+ "fast-diff-1.2.0" = {
+ name = "fast-diff";
+ packageName = "fast-diff";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz";
+ sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==";
+ };
+ };
+ "fast-glob-3.0.4" = {
+ name = "fast-glob";
+ packageName = "fast-glob";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz";
+ sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==";
+ };
+ };
"fast-json-stable-stringify-2.0.0" = {
name = "fast-json-stable-stringify";
packageName = "fast-json-stable-stringify";
@@ -1291,6 +1328,15 @@ let
sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
};
};
+ "fastq-1.6.0" = {
+ name = "fastq";
+ packageName = "fastq";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz";
+ sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==";
+ };
+ };
"fb-watchman-2.0.0" = {
name = "fb-watchman";
packageName = "fb-watchman";
@@ -1399,13 +1445,13 @@ let
sha1 = "b88673c42009f8821fac2926e99720acee924fae";
};
};
- "follow-redirects-1.8.1" = {
+ "follow-redirects-1.9.0" = {
name = "follow-redirects";
packageName = "follow-redirects";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz";
- sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw==";
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz";
+ sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==";
};
};
"for-in-1.0.2" = {
@@ -1597,6 +1643,15 @@ let
sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
};
};
+ "get-stream-5.1.0" = {
+ name = "get-stream";
+ packageName = "get-stream";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz";
+ sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==";
+ };
+ };
"get-value-2.0.6" = {
name = "get-value";
packageName = "get-value";
@@ -1651,6 +1706,15 @@ let
sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
};
};
+ "globby-10.0.1" = {
+ name = "globby";
+ packageName = "globby";
+ version = "10.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz";
+ sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==";
+ };
+ };
"got-6.7.1" = {
name = "got";
packageName = "got";
@@ -1678,15 +1742,6 @@ let
sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
};
};
- "graceful-readlink-1.0.1" = {
- name = "graceful-readlink";
- packageName = "graceful-readlink";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
- sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
- };
- };
"har-schema-2.0.0" = {
name = "har-schema";
packageName = "har-schema";
@@ -1840,6 +1895,15 @@ let
sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
};
};
+ "http-errors-1.7.3" = {
+ name = "http-errors";
+ packageName = "http-errors";
+ version = "1.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
+ sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
+ };
+ };
"http-proxy-1.17.0" = {
name = "http-proxy";
packageName = "http-proxy";
@@ -1876,6 +1940,15 @@ let
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
+ "ignore-5.1.4" = {
+ name = "ignore";
+ packageName = "ignore";
+ version = "5.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
+ sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
+ };
+ };
"inflight-1.0.6" = {
name = "inflight";
packageName = "inflight";
@@ -1912,13 +1985,13 @@ let
sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
};
};
- "internal-ip-3.0.1" = {
+ "internal-ip-4.3.0" = {
name = "internal-ip";
packageName = "internal-ip";
- version = "3.0.1";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz";
- sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==";
+ url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
+ sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
};
};
"into-stream-3.1.0" = {
@@ -2155,15 +2228,6 @@ let
sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
};
};
- "is-promise-2.1.0" = {
- name = "is-promise";
- packageName = "is-promise";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
- sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
- };
- };
"is-redirect-1.0.0" = {
name = "is-redirect";
packageName = "is-redirect";
@@ -2182,13 +2246,13 @@ let
sha1 = "5517489b547091b0930e095654ced25ee97e9491";
};
};
- "is-retry-allowed-1.1.0" = {
+ "is-retry-allowed-1.2.0" = {
name = "is-retry-allowed";
packageName = "is-retry-allowed";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
- sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+ url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+ sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
};
};
"is-stream-1.1.0" = {
@@ -2200,6 +2264,15 @@ let
sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
};
};
+ "is-stream-2.0.0" = {
+ name = "is-stream";
+ packageName = "is-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+ sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+ };
+ };
"is-symbol-1.0.2" = {
name = "is-symbol";
packageName = "is-symbol";
@@ -2452,6 +2525,15 @@ let
sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
};
};
+ "lodash-4.17.15" = {
+ name = "lodash";
+ packageName = "lodash";
+ version = "4.17.15";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+ sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+ };
+ };
"lowercase-keys-1.0.0" = {
name = "lowercase-keys";
packageName = "lowercase-keys";
@@ -2479,15 +2561,6 @@ let
sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
};
};
- "lru-queue-0.1.0" = {
- name = "lru-queue";
- packageName = "lru-queue";
- version = "0.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
- sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
- };
- };
"makeerror-1.0.11" = {
name = "makeerror";
packageName = "makeerror";
@@ -2533,15 +2606,6 @@ let
sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
};
};
- "memoizee-0.4.14" = {
- name = "memoizee";
- packageName = "memoizee";
- version = "0.4.14";
- src = fetchurl {
- url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz";
- sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==";
- };
- };
"merge-descriptors-1.0.1" = {
name = "merge-descriptors";
packageName = "merge-descriptors";
@@ -2551,6 +2615,24 @@ let
sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
};
};
+ "merge-stream-2.0.0" = {
+ name = "merge-stream";
+ packageName = "merge-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
+ sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+ };
+ };
+ "merge2-1.3.0" = {
+ name = "merge2";
+ packageName = "merge2";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
+ sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==";
+ };
+ };
"methods-1.1.2" = {
name = "methods";
packageName = "methods";
@@ -2569,6 +2651,15 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
+ "micromatch-4.0.2" = {
+ name = "micromatch";
+ packageName = "micromatch";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
+ sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
+ };
+ };
"mime-1.4.1" = {
name = "mime";
packageName = "mime";
@@ -2587,6 +2678,15 @@ let
sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
};
};
+ "mime-2.4.3" = {
+ name = "mime";
+ packageName = "mime";
+ version = "2.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz";
+ sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
+ };
+ };
"mime-db-1.40.0" = {
name = "mime-db";
packageName = "mime-db";
@@ -2605,6 +2705,15 @@ let
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
};
};
+ "mimic-fn-2.1.0" = {
+ name = "mimic-fn";
+ packageName = "mimic-fn";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+ };
+ };
"mimic-response-1.0.1" = {
name = "mimic-response";
packageName = "mimic-response";
@@ -2641,22 +2750,22 @@ let
sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
};
};
- "minipass-2.4.0" = {
+ "minipass-2.5.1" = {
name = "minipass";
packageName = "minipass";
- version = "2.4.0";
+ version = "2.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz";
- sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA==";
+ url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz";
+ sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q==";
};
};
- "minizlib-1.2.1" = {
+ "minizlib-1.2.2" = {
name = "minizlib";
packageName = "minizlib";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";
- sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==";
+ url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz";
+ sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ==";
};
};
"mixin-deep-1.3.2" = {
@@ -2713,13 +2822,13 @@ let
sha1 = "5041049269c96633c866386960b2f4289e75e5b0";
};
};
- "mustache-3.0.3" = {
+ "mustache-3.1.0" = {
name = "mustache";
packageName = "mustache";
- version = "3.0.3";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz";
- sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA==";
+ url = "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz";
+ sha512 = "3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ==";
};
};
"nan-2.14.0" = {
@@ -2749,15 +2858,6 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
- "next-tick-1.0.0" = {
- name = "next-tick";
- packageName = "next-tick";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
- sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
- };
- };
"nice-try-1.0.5" = {
name = "nice-try";
packageName = "nice-try";
@@ -2839,6 +2939,15 @@ let
sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
};
};
+ "npm-run-path-3.1.0" = {
+ name = "npm-run-path";
+ packageName = "npm-run-path";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz";
+ sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==";
+ };
+ };
"npx-10.2.0" = {
name = "npx";
packageName = "npx";
@@ -2875,6 +2984,15 @@ let
sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
};
};
+ "object-inspect-1.6.0" = {
+ name = "object-inspect";
+ packageName = "object-inspect";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+ sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+ };
+ };
"object-keys-1.1.1" = {
name = "object-keys";
packageName = "object-keys";
@@ -2929,13 +3047,22 @@ let
sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
};
};
- "opn-5.3.0" = {
- name = "opn";
- packageName = "opn";
- version = "5.3.0";
+ "onetime-5.1.0" = {
+ name = "onetime";
+ packageName = "onetime";
+ version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
- sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
+ url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz";
+ sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==";
+ };
+ };
+ "open-6.4.0" = {
+ name = "open";
+ packageName = "open";
+ version = "6.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz";
+ sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==";
};
};
"opn-5.4.0" = {
@@ -3001,6 +3128,15 @@ let
sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
};
};
+ "p-finally-2.0.1" = {
+ name = "p-finally";
+ packageName = "p-finally";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz";
+ sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==";
+ };
+ };
"p-is-promise-1.1.0" = {
name = "p-is-promise";
packageName = "p-is-promise";
@@ -3109,6 +3245,15 @@ let
sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
};
};
+ "path-key-3.1.0" = {
+ name = "path-key";
+ packageName = "path-key";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+ sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+ };
+ };
"path-to-regexp-0.1.7" = {
name = "path-to-regexp";
packageName = "path-to-regexp";
@@ -3118,13 +3263,22 @@ let
sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
};
};
- "pem-1.13.2" = {
+ "path-type-4.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+ sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+ };
+ };
+ "pem-1.14.2" = {
name = "pem";
packageName = "pem";
- version = "1.13.2";
+ version = "1.14.2";
src = fetchurl {
- url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz";
- sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg==";
+ url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz";
+ sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA==";
};
};
"performance-now-2.1.0" = {
@@ -3226,13 +3380,13 @@ let
sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
};
};
- "psl-1.3.0" = {
+ "psl-1.4.0" = {
name = "psl";
packageName = "psl";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz";
- sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==";
+ url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+ sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
};
};
"pump-3.0.0" = {
@@ -3298,15 +3452,6 @@ let
sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
};
};
- "querystringify-2.1.1" = {
- name = "querystringify";
- packageName = "querystringify";
- version = "2.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
- sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
- };
- };
"range-parser-1.2.1" = {
name = "range-parser";
packageName = "range-parser";
@@ -3523,6 +3668,15 @@ let
sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
};
};
+ "reusify-1.0.4" = {
+ name = "reusify";
+ packageName = "reusify";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz";
+ sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
+ };
+ };
"rimraf-2.2.8" = {
name = "rimraf";
packageName = "rimraf";
@@ -3550,6 +3704,24 @@ let
sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
};
};
+ "run-parallel-1.1.9" = {
+ name = "run-parallel";
+ packageName = "run-parallel";
+ version = "1.1.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+ sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+ };
+ };
+ "rxjs-6.5.3" = {
+ name = "rxjs";
+ packageName = "rxjs";
+ version = "6.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
+ sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
+ };
+ };
"safe-buffer-5.1.1" = {
name = "safe-buffer";
packageName = "safe-buffer";
@@ -3757,6 +3929,15 @@ let
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
};
};
+ "slash-3.0.0" = {
+ name = "slash";
+ packageName = "slash";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz";
+ sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
+ };
+ };
"snapdragon-0.8.2" = {
name = "snapdragon";
packageName = "snapdragon";
@@ -3901,6 +4082,24 @@ let
sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
};
};
+ "string.prototype.trimleft-2.1.0" = {
+ name = "string.prototype.trimleft";
+ packageName = "string.prototype.trimleft";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
+ sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+ };
+ };
+ "string.prototype.trimright-2.1.0" = {
+ name = "string.prototype.trimright";
+ packageName = "string.prototype.trimright";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
+ sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+ };
+ };
"string_decoder-0.10.31" = {
name = "string_decoder";
packageName = "string_decoder";
@@ -3946,6 +4145,15 @@ let
sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
};
};
+ "strip-final-newline-2.0.0" = {
+ name = "strip-final-newline";
+ packageName = "strip-final-newline";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+ sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==";
+ };
+ };
"strip-json-comments-2.0.1" = {
name = "strip-json-comments";
packageName = "strip-json-comments";
@@ -3964,15 +4172,6 @@ let
sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93";
};
};
- "supervisor-0.12.0" = {
- name = "supervisor";
- packageName = "supervisor";
- version = "0.12.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz";
- sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1";
- };
- };
"supports-color-2.0.0" = {
name = "supports-color";
packageName = "supports-color";
@@ -4063,15 +4262,6 @@ let
sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
};
};
- "timers-ext-0.1.7" = {
- name = "timers-ext";
- packageName = "timers-ext";
- version = "0.1.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz";
- sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==";
- };
- };
"tmp-0.0.31" = {
name = "tmp";
packageName = "tmp";
@@ -4171,6 +4361,15 @@ let
sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
};
};
+ "tslib-1.10.0" = {
+ name = "tslib";
+ packageName = "tslib";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
+ sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+ };
+ };
"tunnel-agent-0.6.0" = {
name = "tunnel-agent";
packageName = "tunnel-agent";
@@ -4189,15 +4388,6 @@ let
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
};
- "type-1.0.3" = {
- name = "type";
- packageName = "type";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
- sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
- };
- };
"type-is-1.6.18" = {
name = "type-is";
packageName = "type-is";
@@ -4288,13 +4478,13 @@ let
sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==";
};
};
- "upath-1.1.2" = {
+ "upath-1.2.0" = {
name = "upath";
packageName = "upath";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz";
- sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==";
+ url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
+ sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
};
};
"uri-js-4.2.2" = {
@@ -4315,15 +4505,6 @@ let
sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
};
};
- "url-parse-1.4.3" = {
- name = "url-parse";
- packageName = "url-parse";
- version = "1.4.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz";
- sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==";
- };
- };
"url-parse-lax-1.0.0" = {
name = "url-parse-lax";
packageName = "url-parse-lax";
@@ -4414,6 +4595,60 @@ let
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
};
};
+ "vscode-jsonrpc-4.0.0" = {
+ name = "vscode-jsonrpc";
+ packageName = "vscode-jsonrpc";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz";
+ sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
+ };
+ };
+ "vscode-languageserver-5.2.1" = {
+ name = "vscode-languageserver";
+ packageName = "vscode-languageserver";
+ version = "5.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz";
+ sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==";
+ };
+ };
+ "vscode-languageserver-protocol-3.14.1" = {
+ name = "vscode-languageserver-protocol";
+ packageName = "vscode-languageserver-protocol";
+ version = "3.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz";
+ sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
+ };
+ };
+ "vscode-languageserver-types-3.14.0" = {
+ name = "vscode-languageserver-types";
+ packageName = "vscode-languageserver-types";
+ version = "3.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz";
+ sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
+ };
+ };
+ "vscode-uri-1.0.8" = {
+ name = "vscode-uri";
+ packageName = "vscode-uri";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz";
+ sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
+ };
+ };
+ "vscode-uri-2.0.3" = {
+ name = "vscode-uri";
+ packageName = "vscode-uri";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz";
+ sha512 = "4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==";
+ };
+ };
"walker-1.0.7" = {
name = "walker";
packageName = "walker";
@@ -4423,6 +4658,15 @@ let
sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
};
};
+ "web-tree-sitter-0.15.9" = {
+ name = "web-tree-sitter";
+ packageName = "web-tree-sitter";
+ version = "0.15.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.9.tgz";
+ sha512 = "1lf4lnmi8oxuEzI6gpUok2FQlHXOmV1iipltkQvmR785JWnUbjhw1sZnwSCkisQP+/g/aezpMGcW3mjz0uVhMw==";
+ };
+ };
"which-1.3.1" = {
name = "which";
packageName = "which";
@@ -4477,15 +4721,6 @@ let
sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==";
};
};
- "ws-5.2.0" = {
- name = "ws";
- packageName = "ws";
- version = "5.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz";
- sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==";
- };
- };
"ws-5.2.2" = {
name = "ws";
packageName = "ws";
@@ -4504,6 +4739,24 @@ let
sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
};
};
+ "ws-7.1.1" = {
+ name = "ws";
+ packageName = "ws";
+ version = "7.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz";
+ sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
+ };
+ };
+ "ws-7.1.2" = {
+ name = "ws";
+ packageName = "ws";
+ version = "7.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz";
+ sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==";
+ };
+ };
"xmlbuilder-8.2.2" = {
name = "xmlbuilder";
packageName = "xmlbuilder";
@@ -4780,12 +5033,12 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
- (sources."minipass-2.4.0" // {
+ (sources."minipass-2.5.1" // {
dependencies = [
sources."yallist-3.0.3"
];
})
- sources."minizlib-1.2.1"
+ sources."minizlib-1.2.2"
sources."mixin-deep-1.3.2"
(sources."mkdirp-0.5.1" // {
dependencies = [
@@ -4794,7 +5047,7 @@ in
})
sources."ms-2.0.0"
sources."murmur-hash-js-1.0.0"
- sources."mustache-3.0.3"
+ sources."mustache-3.1.0"
sources."nan-2.14.0"
sources."nanomatch-1.2.13"
sources."node-elm-compiler-5.0.3"
@@ -4824,7 +5077,7 @@ in
sources."posix-character-classes-0.1.1"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."psl-1.3.0"
+ sources."psl-1.4.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."readable-stream-2.3.6"
@@ -4949,7 +5202,7 @@ in
];
})
sources."unzip-stream-0.3.0"
- sources."upath-1.1.2"
+ sources."upath-1.2.0"
sources."uri-js-4.2.2"
sources."urix-0.1.0"
sources."use-3.1.1"
@@ -5193,12 +5446,12 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
- (sources."minipass-2.4.0" // {
+ (sources."minipass-2.5.1" // {
dependencies = [
sources."yallist-3.0.3"
];
})
- sources."minizlib-1.2.1"
+ sources."minizlib-1.2.2"
sources."mixin-deep-1.3.2"
(sources."mkdirp-0.5.1" // {
dependencies = [
@@ -5207,7 +5460,7 @@ in
})
sources."ms-2.0.0"
sources."murmur-hash-js-1.0.0"
- sources."mustache-3.0.3"
+ sources."mustache-3.1.0"
sources."nan-2.14.0"
sources."nanomatch-1.2.13"
sources."node-elm-compiler-5.0.3"
@@ -5241,7 +5494,7 @@ in
sources."posix-character-classes-0.1.1"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."psl-1.3.0"
+ sources."psl-1.4.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."readable-stream-2.3.6"
@@ -5372,7 +5625,7 @@ in
];
})
sources."unzip-stream-0.3.0"
- sources."upath-1.1.2"
+ sources."upath-1.2.0"
sources."uri-js-4.2.2"
sources."urix-0.1.0"
sources."use-3.1.1"
@@ -5465,7 +5718,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."commander-3.0.0"
+ sources."commander-3.0.1"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."content-disposition-0.5.3"
@@ -5488,7 +5741,7 @@ in
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.1"
- sources."es-abstract-1.13.0"
+ sources."es-abstract-1.14.2"
sources."es-to-primitive-1.2.0"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
@@ -5587,7 +5840,7 @@ in
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
sources."is-regex-1.0.4"
- sources."is-retry-allowed-1.1.0"
+ sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
sources."is-symbol-1.0.2"
sources."is-windows-1.0.2"
@@ -5642,6 +5895,7 @@ in
sources."kind-of-3.2.2"
];
})
+ sources."object-inspect-1.6.0"
sources."object-keys-1.1.1"
sources."object-visit-1.0.1"
sources."object.getownpropertydescriptors-2.0.3"
@@ -5760,6 +6014,8 @@ in
})
sources."statuses-1.5.0"
sources."strict-uri-encode-1.1.0"
+ sources."string.prototype.trimleft-2.1.0"
+ sources."string.prototype.trimright-2.1.0"
sources."string_decoder-1.1.1"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
@@ -5844,7 +6100,7 @@ in
sources."ini-1.3.5"
sources."is-object-1.0.1"
sources."is-redirect-1.0.0"
- sources."is-retry-allowed-1.1.0"
+ sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
sources."isexe-2.0.0"
sources."isurl-1.0.0"
@@ -5983,7 +6239,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-1.0.7"
sources."proxy-addr-2.0.5"
- sources."psl-1.3.0"
+ sources."psl-1.4.0"
sources."punycode-2.1.1"
sources."qs-6.5.1"
sources."range-parser-1.2.1"
@@ -6050,57 +6306,46 @@ in
elm-live = nodeEnv.buildNodePackage {
name = "elm-live";
packageName = "elm-live";
- version = "3.4.1";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz";
- sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw==";
+ url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz";
+ sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q==";
};
dependencies = [
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
- sources."anymatch-3.0.3"
- sources."async-each-1.0.3"
+ sources."anymatch-3.1.0"
sources."async-limiter-1.0.1"
sources."binary-extensions-2.0.0"
sources."braces-3.0.2"
sources."chalk-1.1.3"
sources."charenc-0.0.2"
- sources."chokidar-3.0.0"
- sources."cli-color-1.2.0"
+ sources."chokidar-3.0.2"
sources."commander-2.17.1"
- sources."connect-pushstate-1.1.0"
+ sources."crocks-0.12.1"
sources."cross-spawn-5.0.1"
sources."crypt-0.0.2"
- sources."d-1.0.1"
sources."debug-2.6.9"
- sources."default-gateway-2.7.2"
+ sources."default-gateway-4.2.0"
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."ee-first-1.1.1"
- (sources."elm-serve-0.4.0" // {
- dependencies = [
- sources."commander-2.9.0"
- ];
- })
+ sources."elm-hot-1.1.1"
sources."encodeurl-1.0.2"
- sources."es5-ext-0.10.50"
- sources."es6-iterator-2.0.3"
+ sources."end-of-stream-1.4.1"
sources."es6-promisify-6.0.2"
- sources."es6-symbol-3.1.1"
- sources."es6-weak-map-2.0.3"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
sources."etag-1.8.1"
- sources."event-emitter-0.3.5"
sources."eventemitter3-3.1.2"
- (sources."execa-0.10.0" // {
+ (sources."execa-1.0.0" // {
dependencies = [
sources."cross-spawn-6.0.5"
];
})
sources."fill-range-7.0.1"
- sources."finalhandler-1.1.1"
- (sources."follow-redirects-1.8.1" // {
+ sources."finalhandler-1.1.2"
+ (sources."follow-redirects-1.9.0" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -6108,14 +6353,13 @@ in
})
sources."fresh-0.5.2"
sources."fsevents-2.0.7"
- sources."get-stream-3.0.0"
+ sources."get-stream-4.1.0"
sources."glob-parent-5.0.0"
- sources."graceful-readlink-1.0.1"
sources."has-ansi-2.0.0"
- sources."http-errors-1.6.3"
+ sources."http-errors-1.7.3"
sources."http-proxy-1.17.0"
- sources."inherits-2.0.3"
- sources."internal-ip-3.0.1"
+ sources."inherits-2.0.4"
+ sources."internal-ip-4.3.0"
sources."ip-regex-2.1.0"
sources."ipaddr.js-1.9.1"
sources."is-binary-path-2.1.0"
@@ -6123,53 +6367,52 @@ in
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
sources."is-number-7.0.0"
- sources."is-promise-2.1.0"
sources."is-stream-1.1.0"
sources."is-wsl-1.1.0"
sources."isexe-2.0.0"
sources."lru-cache-4.1.5"
- sources."lru-queue-0.1.0"
sources."md5-2.2.1"
- sources."memoizee-0.4.14"
- sources."mime-1.4.1"
- sources."minimist-1.2.0"
+ sources."mime-2.4.3"
sources."ms-2.0.0"
- sources."next-tick-1.0.0"
sources."nice-try-1.0.5"
sources."normalize-path-3.0.0"
sources."npm-run-path-2.0.2"
sources."on-finished-2.3.0"
- sources."opn-5.3.0"
+ sources."once-1.4.0"
+ sources."open-6.4.0"
sources."os-tmpdir-1.0.2"
sources."p-finally-1.0.0"
sources."parseurl-1.3.3"
sources."path-key-2.0.1"
- sources."pem-1.13.2"
+ sources."pem-1.14.2"
sources."picomatch-2.0.7"
sources."pseudomap-1.0.2"
- sources."querystringify-2.1.1"
+ sources."pump-3.0.0"
sources."range-parser-1.2.1"
sources."readdirp-3.1.2"
sources."requires-port-1.0.0"
sources."semver-5.7.1"
- sources."send-0.16.2"
- sources."serve-static-1.13.2"
- sources."setprototypeof-1.1.0"
+ (sources."send-0.17.1" // {
+ dependencies = [
+ sources."mime-1.6.0"
+ sources."ms-2.1.1"
+ ];
+ })
+ sources."serve-static-1.14.1"
+ sources."setprototypeof-1.1.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.2"
- sources."statuses-1.4.0"
+ sources."statuses-1.5.0"
sources."strip-ansi-3.0.1"
sources."strip-eof-1.0.0"
- sources."supervisor-0.12.0"
sources."supports-color-2.0.0"
- sources."timers-ext-0.1.7"
sources."to-regex-range-5.0.1"
- sources."type-1.0.3"
+ sources."toidentifier-1.0.0"
sources."unpipe-1.0.0"
- sources."url-parse-1.4.3"
sources."which-1.3.1"
- sources."ws-5.2.0"
+ sources."wrappy-1.0.2"
+ sources."ws-7.1.1"
sources."yallist-2.1.2"
];
buildInputs = globalBuildInputs;
@@ -6222,4 +6465,248 @@ in
bypassCache = true;
reconstructLock = true;
};
+ "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
+ name = "_at_elm-tooling_slash_elm-language-server";
+ packageName = "@elm-tooling/elm-language-server";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.1.tgz";
+ sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw==";
+ };
+ dependencies = [
+ sources."@nodelib/fs.scandir-2.1.2"
+ sources."@nodelib/fs.stat-2.0.2"
+ sources."@nodelib/fs.walk-1.2.3"
+ sources."@types/events-3.0.0"
+ sources."@types/glob-7.1.1"
+ sources."@types/minimatch-3.0.3"
+ sources."@types/node-12.7.5"
+ sources."accepts-1.3.7"
+ sources."ajv-6.10.2"
+ sources."array-flatten-1.1.1"
+ sources."array-union-2.1.0"
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."async-limiter-1.0.1"
+ sources."asynckit-0.4.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.8.0"
+ sources."babel-runtime-6.18.0"
+ sources."balanced-match-1.0.0"
+ sources."bcrypt-pbkdf-1.0.2"
+ sources."body-parser-1.18.2"
+ sources."brace-expansion-1.1.11"
+ sources."braces-3.0.2"
+ sources."bytes-3.0.0"
+ sources."caseless-0.12.0"
+ sources."combined-stream-1.0.8"
+ sources."concat-map-0.0.1"
+ sources."concat-stream-1.5.2"
+ sources."content-disposition-0.5.2"
+ sources."content-type-1.0.4"
+ sources."cookie-0.3.1"
+ sources."cookie-signature-1.0.6"
+ sources."core-js-2.6.9"
+ sources."core-util-is-1.0.2"
+ sources."cross-spawn-6.0.5"
+ sources."dashdash-1.14.1"
+ sources."debug-2.6.9"
+ sources."delayed-stream-1.0.0"
+ sources."depd-1.1.2"
+ sources."destroy-1.0.4"
+ sources."dir-glob-3.0.1"
+ sources."ecc-jsbn-0.1.2"
+ sources."ee-first-1.1.1"
+ (sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" // {
+ dependencies = [
+ sources."ultron-1.1.1"
+ sources."ws-3.3.1"
+ ];
+ })
+ sources."encodeurl-1.0.2"
+ sources."end-of-stream-1.4.1"
+ sources."escape-html-1.0.3"
+ sources."etag-1.8.1"
+ (sources."execa-2.0.4" // {
+ dependencies = [
+ sources."is-stream-2.0.0"
+ ];
+ })
+ sources."express-4.16.3"
+ (sources."express-ws-2.0.0" // {
+ dependencies = [
+ sources."ws-1.1.5"
+ ];
+ })
+ sources."extend-3.0.2"
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-2.0.1"
+ sources."fast-diff-1.2.0"
+ sources."fast-glob-3.0.4"
+ sources."fast-json-stable-stringify-2.0.0"
+ sources."fastq-1.6.0"
+ sources."fill-range-7.0.1"
+ sources."finalhandler-1.1.1"
+ sources."find-0.2.7"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
+ sources."forwarded-0.1.2"
+ sources."fresh-0.5.2"
+ sources."fs-extra-2.0.0"
+ sources."fs.realpath-1.0.0"
+ sources."get-stream-5.1.0"
+ sources."getpass-0.1.7"
+ sources."glob-7.1.4"
+ sources."glob-parent-5.0.0"
+ sources."globby-10.0.1"
+ sources."graceful-fs-4.2.2"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
+ sources."http-errors-1.6.3"
+ sources."http-signature-1.2.0"
+ sources."iconv-lite-0.4.19"
+ sources."ignore-5.1.4"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.3"
+ sources."ipaddr.js-1.9.0"
+ sources."is-extglob-2.1.1"
+ sources."is-glob-4.0.1"
+ sources."is-number-7.0.0"
+ sources."is-stream-1.1.0"
+ sources."is-typedarray-1.0.0"
+ sources."is-wsl-1.1.0"
+ sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
+ sources."isstream-0.1.2"
+ sources."jsbn-0.1.1"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."jsonfile-2.4.0"
+ sources."jsprim-1.4.1"
+ sources."lodash-4.17.15"
+ sources."media-typer-0.3.0"
+ sources."merge-descriptors-1.0.1"
+ sources."merge-stream-2.0.0"
+ sources."merge2-1.3.0"
+ sources."methods-1.1.2"
+ sources."micromatch-4.0.2"
+ sources."mime-1.4.1"
+ sources."mime-db-1.40.0"
+ sources."mime-types-2.1.24"
+ sources."mimic-fn-2.1.0"
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.0"
+ sources."ms-2.0.0"
+ sources."negotiator-0.6.2"
+ sources."nice-try-1.0.5"
+ sources."node-watch-0.5.5"
+ (sources."npm-run-path-3.1.0" // {
+ dependencies = [
+ sources."path-key-3.1.0"
+ ];
+ })
+ sources."oauth-sign-0.9.0"
+ sources."on-finished-2.3.0"
+ sources."once-1.4.0"
+ sources."onetime-5.1.0"
+ sources."opn-5.4.0"
+ sources."options-0.0.6"
+ sources."os-homedir-1.0.2"
+ sources."os-tmpdir-1.0.2"
+ sources."p-finally-2.0.1"
+ sources."parseurl-1.3.3"
+ sources."path-is-absolute-1.0.1"
+ sources."path-key-2.0.1"
+ sources."path-to-regexp-0.1.7"
+ sources."path-type-4.0.0"
+ sources."performance-now-2.1.0"
+ sources."picomatch-2.0.7"
+ sources."process-nextick-args-1.0.7"
+ sources."proxy-addr-2.0.5"
+ sources."psl-1.4.0"
+ sources."pump-3.0.0"
+ sources."punycode-2.1.1"
+ sources."qs-6.5.1"
+ sources."range-parser-1.2.1"
+ (sources."raw-body-2.3.2" // {
+ dependencies = [
+ sources."depd-1.1.1"
+ sources."http-errors-1.6.2"
+ sources."setprototypeof-1.0.3"
+ ];
+ })
+ sources."readable-stream-2.0.6"
+ sources."regenerator-runtime-0.9.6"
+ (sources."request-2.88.0" // {
+ dependencies = [
+ sources."qs-6.5.2"
+ sources."safe-buffer-5.2.0"
+ ];
+ })
+ sources."reusify-1.0.4"
+ sources."run-parallel-1.1.9"
+ sources."rxjs-6.5.3"
+ sources."safe-buffer-5.1.1"
+ sources."safer-buffer-2.1.2"
+ sources."semver-5.7.1"
+ sources."send-0.16.2"
+ sources."serve-static-1.13.2"
+ sources."setprototypeof-1.1.0"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."signal-exit-3.0.2"
+ sources."slash-3.0.0"
+ sources."sshpk-1.16.1"
+ sources."statuses-1.4.0"
+ sources."string_decoder-0.10.31"
+ sources."strip-final-newline-2.0.0"
+ sources."sums-0.2.4"
+ sources."through2-2.0.1"
+ sources."tmp-0.0.31"
+ sources."to-regex-range-5.0.1"
+ (sources."tough-cookie-2.4.3" // {
+ dependencies = [
+ sources."punycode-1.4.1"
+ ];
+ })
+ sources."traverse-chain-0.1.0"
+ sources."tslib-1.10.0"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."type-is-1.6.18"
+ sources."typedarray-0.0.6"
+ sources."ultron-1.0.2"
+ sources."unpipe-1.0.0"
+ sources."uri-js-4.2.2"
+ sources."util-deprecate-1.0.2"
+ sources."utils-merge-1.0.1"
+ sources."uuid-3.3.3"
+ sources."vary-1.1.2"
+ sources."verror-1.10.0"
+ sources."vscode-jsonrpc-4.0.0"
+ (sources."vscode-languageserver-5.2.1" // {
+ dependencies = [
+ sources."vscode-uri-1.0.8"
+ ];
+ })
+ sources."vscode-languageserver-protocol-3.14.1"
+ sources."vscode-languageserver-types-3.14.0"
+ sources."vscode-uri-2.0.3"
+ sources."web-tree-sitter-0.15.9"
+ sources."which-1.3.1"
+ sources."wrappy-1.0.2"
+ sources."ws-7.1.2"
+ sources."xtend-4.0.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Implementation of an elm language server in node.";
+ homepage = "https://github.com/elm-tooling/elm-language-server#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
}
\ No newline at end of file
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 3bdf234f9159..d4e536484c46 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
stdenv.mkDerivation rec {
pname = "unison-code-manager";
- milestone_id = "M1c";
+ milestone_id = "M1d";
version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
- sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb";
+ sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
- sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4";
+ sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws";
};
# The tarball is just the prebuilt binary, in the archive root.
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index fbefee48d5b2..4f4af87227f3 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "chmlib-0.40";
+ name = "chmlib-0.40a";
- src = fetchurl {
- url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
+ src = fetchFromGitHub {
+ owner = "jedwing";
+ repo = "CHMLib";
+ rev = "2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f";
+ sha256 = "1hah0nw0l05npva2r35ywwd0kzyiiz4vamghm6d71h8170iva6m9";
};
+ nativeBuildInputs = [ autoreconfHook ];
+
meta = {
homepage = http://www.jedrea.com/chmlib;
license = stdenv.lib.licenses.lgpl2;
description = "A library for dealing with Microsoft ITSS/CHM format files";
- platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+ platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
};
}
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 796861a30654..fd35b697d7c2 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, enableShared ? true }:
stdenv.mkDerivation rec {
- version = "5.3.0";
+ version = "6.0.0";
pname = "fmt";
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = version;
- sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4";
+ sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba";
};
outputs = [ "out" "dev" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
- # preCheckHook ensures the test binaries can find libfmt.so.5
+ # preCheckHook ensures the test binaries can find libfmt.so
preCheck = if enableShared
then "export LD_LIBRARY_PATH=\"$PWD\""
else "";
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index fe2f0eadeeb3..4d56c0f1403b 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcbor";
- version = "2019-02-23";
+ version = "unstable-2019-07-25";
src = fetchFromGitHub {
owner = "PJK";
repo = pname;
- rev = "87f977e732ca216682a8583a0e43803eb6b9c028";
- sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm";
+ rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6";
+ sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 06e4726054e9..4ab2dd418558 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
-, rdma-core, zlib, numactl, libevent, hwloc
+, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget
# Enable the Sun Grid Engine bindings
, enableSGE ? false
@@ -30,6 +30,13 @@ in stdenv.mkDerivation rec {
postPatch = ''
patchShebangs ./
+
+ # Ensure build is reproducible
+ ts=`date -d @$SOURCE_DATE_EPOCH`
+ sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure
+ sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure
+ sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure
+ find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
'';
buildInputs = with stdenv; [ gfortran zlib ]
@@ -51,6 +58,23 @@ in stdenv.mkDerivation rec {
rm -f $out/lib/*.la
'';
+ postFixup = ''
+ # default compilers should be indentical to the
+ # compilers at build time
+
+ sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+ $out/share/openmpi/mpicc-wrapper-data.txt
+
+ sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+ $out/share/openmpi/ortecc-wrapper-data.txt
+
+ sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \
+ $out/share/openmpi/mpic++-wrapper-data.txt
+
+ sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \
+ $out/share/openmpi/mpifort-wrapper-data.txt
+ '';
+
doCheck = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 357c81fa4f61..c96aef3f4da5 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -103,24 +103,27 @@ EOF
--replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
'');
- NIX_CFLAGS_COMPILE =
- # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
- # TODO: investigate and fix properly
- lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++
- lib.optionals stdenv.isDarwin [
- "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
- "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
+ NIX_CFLAGS_COMPILE = [
+ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
+ "-Wno-class-memaccess"
+ ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
+ # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
+ # TODO: investigate and fix properly
+ "-march=westmere"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
+ "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
- #
- # Prevent errors like
- # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
- # error: pointer to non-const type 'id' with no explicit ownership
- # id** _kvcPropertyAccessors;
- #
- # TODO remove when new Apple SDK is in
- #
- "-fno-objc-arc"
- ];
+ #
+ # Prevent errors like
+ # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
+ # error: pointer to non-const type 'id' with no explicit ownership
+ # id** _kvcPropertyAccessors;
+ #
+ # TODO remove when new Apple SDK is in
+ #
+ "-fno-objc-arc"
+ ];
preConfigure = ''
export NINJAFLAGS=-j$NIX_BUILD_CORES
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 63b0a9f42a66..9eb43991bd6d 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
- version = "5.13.0";
+ version = "6.0.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
- sha256 = "03drxwpr3xdh4hm8pkd5mhjs0mzhz6634ldyq78pml39ciqm51nl";
+ sha256 = "0d2x4djr8lqb4vad8g8vxvd1sgki4issxhyy5r32snh2i8pxpbp9";
};
buildInputs = [ qtbase cpp-utilities ];
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 5a62578481c6..076376dc3c15 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ python2 ];
cmakeFlags = [
- "-DUSE_OPTIMIZED_BLAS=ON"
"-DCMAKE_Fortran_FLAGS=-fPIC"
+ "-DLAPACKE=ON"
]
++ (optional shared "-DBUILD_SHARED_LIBS=ON");
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 0afb1c432d6b..8d8467207ce1 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "2.0.1";
+ version = "2.2.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb";
+ sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];
@@ -18,7 +18,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python Client for ESPHome native API";
- homepage = https://github.com/esphome/aioesphomeapi;
+ homepage = "https://github.com/esphome/aioesphomeapi";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index 3b25ce6bcfbd..b3c6f3fa1cc9 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -1,8 +1,9 @@
-{ pkgs
+{ lib
, buildPythonPackage
, fetchPypi
, azure-nspkg
, isPyPy
+, setuptools
, python
, isPy3k
}:
@@ -20,7 +21,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
azure-nspkg
- ];
+ ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup
postInstall = if isPy3k then "" else ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
@@ -28,7 +29,7 @@ buildPythonPackage rec {
doCheck = false;
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "This is the Microsoft Azure common code";
homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common;
license = licenses.mit;
diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
index e948afd91cfd..482c0d190bc5 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
postInstall = if isPy3k then "" else ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+ echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
'';
doCheck = false;
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index d499a937f501..19eaeaf8d827 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect
+{ lib, buildPythonPackage, fetchPypi, libredirect
, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
}:
@@ -17,19 +17,17 @@ buildPythonPackage rec {
--replace "pytest>=4.3.1,<4.4.0" pytest
'';
- # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
- preCheck = stdenv.lib.optionalString stdenv.isLinux ''
- export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
- LD_PRELOAD=${libredirect}/lib/libredirect.so
- '';
- postCheck = stdenv.lib.optionalString stdenv.isLinux ''
- unset NIX_REDIRECTS LD_PRELOAD
+ # ignore test that's incompatible with pytest5
+ # test_eventlet touches network
+ checkPhase = ''
+ pytest -k 'not restore_current_app_fallback' \
+ --ignore=t/unit/concurrency/test_eventlet.py
'';
checkInputs = [ case pytest boto3 moto ];
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/celery/celery/;
description = "Distributed task queue";
license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 8c55c3ac8bbb..591bb0fbe377 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
checkPhase = ''
substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" ""
${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"}
- pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
+ pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 853beaf34a1c..265a4cb5712b 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
buildPythonPackage rec {
pname = "demjson";
version = "2.2.4";
- disabled = isPy36;
+ disabled = isPy3k;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
index 5638447bceb8..bb38c7387607 100644
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/pkgs/development/python-modules/hug/default.nix
@@ -1,7 +1,11 @@
-{ lib , buildPythonPackage, fetchPypi, isPy27
+{ lib , buildPythonPackage, fetchFromGitHub, isPy27
, falcon
, pytestrunner
, requests
+, pytest
+, marshmallow
+, mock
+, numpy
}:
buildPythonPackage rec {
@@ -9,16 +13,22 @@ buildPythonPackage rec {
version = "2.6.0";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "0iamrzjy8z1xibynkgfl6cn2sbm66awxbp75b26pi32fc41d0k50";
+ src = fetchFromGitHub {
+ owner = "hugapi";
+ repo = pname;
+ rev = version;
+ sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ falcon requests ];
- # tests are not shipped in the tarball
- doCheck = false;
+ checkInputs = [ mock marshmallow pytest numpy ];
+ checkPhase = ''
+ mv hug hug.hidden
+ # some tests attempt network access
+ PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)"
+ '';
meta = with lib; {
description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 10dbcafd04bc..f428e7dbfbac 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -21,6 +21,8 @@ buildPythonPackage rec {
cmake
];
+ dontUseCmakeConfigure = true;
+
# we never actually explicitly call the install command so this is the only way
# to inject these options to it - however, openmp-library doesn't appear to have
# any effect, so we have to inject it into NIX_LDFLAGS manually below
diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index 209ecf998ccf..bf66a886f764 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -1,29 +1,31 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, nose
+, pytest
}:
buildPythonPackage rec {
pname = "minidb";
version = "2.0.2";
- src = fetchurl {
- url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
- sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0";
+ src = fetchFromGitHub {
+ owner = "thp";
+ repo = "minidb";
+ rev = version;
+ sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3";
};
- checkInputs = [ nose ];
-
+ # module imports are incompatible with python2
+ doCheck = isPy3k;
+ checkInputs = [ nose pytest ];
checkPhase = ''
- nosetests test
+ pytest
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A simple SQLite3-based store for Python objects";
- homepage = https://thp.io/2010/minidb/;
- license = stdenv.lib.licenses.isc;
- maintainers = [ stdenv.lib.maintainers.tv ];
+ homepage = "https://thp.io/2010/minidb/";
+ license = licenses.isc;
+ maintainers = [ maintainers.tv ];
};
}
diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix
index 9523a3e28fab..2d1130490090 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@@ -1,7 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, six
}:
buildPythonPackage rec {
@@ -14,11 +12,14 @@ buildPythonPackage rec {
sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [ six ];
+
+ meta = with lib; {
homepage = https://github.com/mooz/percol;
description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
+ broken = true; # missing cmigemo package which is missing libmigemo.so
+ # also doesn't support python3
};
-
}
diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index 28ca8a3e498c..b09c4a240e51 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -1,12 +1,8 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, isPy3k
, nose
, mock
-, pyyaml
-, unittest2
-, pyev
, twisted
, tornado
}:
@@ -20,11 +16,7 @@ buildPythonPackage rec {
sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz";
};
- # Tests require twisted which is only availalble for python-2.x
- doCheck = !isPy3k;
-
- buildInputs = [ nose mock pyyaml unittest2 pyev ]
- ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ];
+ checkInputs = [ nose mock twisted tornado ];
meta = with stdenv.lib; {
description = "Pure-Python implementation of the AMQP 0-9-1 protocol";
diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
deleted file mode 100644
index b5ca0c7ef6cf..000000000000
--- a/pkgs/development/python-modules/pyev/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, libev }:
-
-buildPythonPackage rec {
- pname = "pyev";
- version = "0.9.0";
-
- src = fetchurl {
- url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
- sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
- };
-
- buildInputs = [ libev ];
-
- libEvSharedLibrary =
- if !stdenv.isDarwin
- then "${libev}/lib/libev.so.4"
- else "${libev}/lib/libev.4.dylib";
-
- postPatch = ''
- test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
- sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
- '';
-
- meta = with stdenv.lib; {
- description = "Python bindings for libev";
- homepage = https://code.google.com/p/pyev/;
- license = licenses.gpl3;
- maintainers = [ maintainers.bjornfor ];
- };
-}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 506b560e01ae..1ddf52a33bd5 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -6,6 +6,8 @@ buildPythonPackage rec {
version = "5.1.0";
pname = "pytest";
+ disabled = !isPy3k;
+
preCheck = ''
# don't test bash builtins
rm testing/test_argcomplete.py
@@ -19,7 +21,6 @@ buildPythonPackage rec {
checkInputs = [ hypothesis mock ];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
- ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 7eb020bbe609..939782722c6e 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -2,6 +2,7 @@
, lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, gfortran, glibcLocales
, numpy, scipy, pytest, pillow
, cython
@@ -40,6 +41,15 @@ buildPythonPackage rec {
];
checkInputs = [ pytest ];
+ patches = [
+ # Fixes tests by changing threshold of a test-case that broke
+ # with numpy versions >= 1.17. This should be removed for versions > 0.21.2.
+ ( fetchpatch {
+ url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch";
+ sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv";
+ })
+ ];
+
LC_ALL="en_US.UTF-8";
doCheck = !stdenv.isAarch64;
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index 82f1315ba3d2..5ade47587d17 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, isPy27
, pbr
, pytest
}:
@@ -16,7 +17,9 @@ buildPythonPackage rec {
buildInputs = [ pbr ];
checkInputs = [ pytest ];
- propagatedBuildInputs = [ ];
+
+ # test suite uses new async primitives
+ doCheck = !isPy27;
meta = with stdenv.lib; {
homepage = https://github.com/codingjoe/ssdp;
diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix
index 143f609d8338..56fdbe45553a 100644
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -19,6 +19,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ kazoo six ];
buildInputs = [ testtools ];
checkPhase = ''
+ # Skip test - fails with our new kazoo version
+ substituteInPlace zake/tests/test_client.py \
+ --replace "test_child_watch_no_create" "_test_child_watch_no_create"
+
${python.interpreter} -m unittest discover zake/tests
'';
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 4187d0629509..754c014ee165 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "cue";
- version = "0.0.3";
+ version = "0.0.11";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
- sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7";
+ sha256 = "146h3nxx72n3byxr854lnxj7m33ipbmg6j9dy6dlwvqpa7rndrmp";
};
- modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6";
+ modSha256 = "1q0fjm34mbijjxg089v5330vc820nrvwdkhm02zi45rk2fpdgdqd";
subPackages = [ "cmd/cue" ];
diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
new file mode 100644
index 000000000000..5d8376acdb39
--- /dev/null
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }:
+
+perlPackages.buildPerlPackage rec {
+ pname = "pgformatter";
+ version = "4.0";
+
+ src = fetchFromGitHub {
+ owner = "darold";
+ repo = "pgFormatter";
+ rev = "v${version}";
+ sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
+ };
+
+ outputs = [ "out" ];
+
+ makeMakerFlags = [ "INSTALLDIRS=vendor" ];
+
+ # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS.
+ patchPhase = ''
+ substituteInPlace pg_format \
+ --replace "#!/usr/bin/env perl" "#!/usr/bin/perl"
+ substituteInPlace Makefile.PL \
+ --replace "'DESTDIR' => \$DESTDIR," "'DESTDIR' => '$out/'," \
+ --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
+ '';
+
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang $out/bin/pg_format
+ '';
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
+ homepage = "https://github.com/darold/pgFormatter";
+ maintainers = [ maintainers.marsam ];
+ license = [ licenses.postgresql licenses.artistic2 ];
+ };
+}
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index bfc30193eeda..fab0dc05c450 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:
with rustPlatform;
@@ -19,7 +19,8 @@ buildRustPackage rec {
cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd";
- buildInputs = [ makeWrapper ];
+ buildInputs = [ makeWrapper ]
+ ++ stdenv.lib.optional stdenv.isDarwin Security;
RUST_SRC_PATH = rustPlatform.rustcSrc;
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix
new file mode 100644
index 000000000000..7a9ac7d381c1
--- /dev/null
+++ b/pkgs/games/chiaki/default.nix
@@ -0,0 +1,31 @@
+{ lib, mkDerivation, fetchFromGitHub
+, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf
+, python3Packages, SDL2 }:
+
+mkDerivation rec {
+ pname = "chiaki";
+ version = "1.0.3";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "thestr4ng3r";
+ repo = "chiaki";
+ fetchSubmodules = true;
+ sha256 = "09c6izprqqvhn1vbr2897ql05w5c7iqakm6jn795a5faghjm1mah";
+ };
+
+ nativeBuildInputs = [
+ cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf
+ ];
+ buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ];
+
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/thestr4ng3r/chiaki";
+ description = "Free and Open Source PS4 Remote Play Client";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ delroth ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix
index 136bac8800ed..f0a89adab572 100644
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@@ -96,7 +96,7 @@ EOF
description = "The Dark Mod - stealth FPS inspired by the Thief series";
homepage = "http://www.thedarkmod.com";
license = licenses.gpl3;
- maintainers = with maintainers; [ cf6b88f ];
+ maintainers = with maintainers; [ cizra ];
platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test.
};
}
diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix
new file mode 100644
index 000000000000..a632e523aaa8
--- /dev/null
+++ b/pkgs/games/tome2/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }:
+
+let
+ pname = "tome2";
+ description = "A dungeon crawler similar to Angband, based on the works of Tolkien";
+
+ desktopItem = makeDesktopItem {
+ desktopName = pname;
+ name = pname;
+ exec = "${pname}-x11";
+ icon = pname;
+ terminal = "False";
+ comment = description;
+ type = "Application";
+ categories = "Game;RolePlaying;";
+ genericName = pname;
+ };
+
+in stdenv.mkDerivation {
+ inherit pname;
+ version = "2.4";
+
+ src = fetchFromGitHub {
+ owner = "tome2";
+ repo = "tome2";
+ rev = "4e6a906c80ff07b75a6acf4ff585b47303805e46";
+ sha256 = "06bddj55y673d7bnzblk8n01z32l6k2rad3bpzr8dmw464hx4wwf";
+ };
+
+ buildInputs = [ ncurses libX11 boost ];
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DSYSTEM_INSTALL=ON"
+ ];
+
+ postInstall = ''
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/*.desktop $out/share/applications
+ '';
+
+ meta = with stdenv.lib; {
+ inherit description;
+ license = licenses.unfree;
+ maintainers = with maintainers; [ cizra ];
+ platforms = platforms.all;
+ homepage = "https://github.com/tome2/tome2";
+ };
+}
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8d885cbf5169..0fa80322d7ba 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -225,6 +225,16 @@ in rec {
};
};
+ sysstat = mkDerivation {
+ pluginName = "sysstat";
+ src = fetchFromGitHub {
+ owner = "samoshkin";
+ repo = "tmux-plugin-sysstat";
+ rev = "29e150f403151f2341f3abcb2b2487a5f011dd23";
+ sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq";
+ };
+ };
+
tmux-colors-solarized = mkDerivation {
pluginName = "tmuxcolors";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
new file mode 100644
index 000000000000..efa41075644d
--- /dev/null
+++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+index 5e3f89b..19be6d9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_TOOL([AR], [ar])
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
+index 20512c4..83c802b 100644
+--- a/libbridge/Makefile.in
++++ b/libbridge/Makefile.in
+@@ -1,7 +1,7 @@
+
+ KERNEL_HEADERS=-I@KERNEL_HEADERS@
+
+-AR=ar
++AR=@AR@
+ RANLIB=@RANLIB@
+
+ CC=@CC@
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index 2725a5909b7b..e3207fdf37d1 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
};
- # Remove patch once the kernel headers are updated
- patches = [ ./add-ip6-header.patch ];
+ patches = [
+ ./autoconf-ar.patch
+ ./add-ip6-header.patch # Remove patch once the kernel headers are updated
+ ];
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ ];
postInstall = ''
# The bridge utils build does not fail even if the brctl binary
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 5e990511eed7..0e35f45f042a 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
patches = [ ./pass-force.patch ];
- buildInputs = [ flex perl ];
+ nativeBuildInputs = [ flex ];
+ buildInputs = [ perl ];
configureFlags = [
"--without-distro"
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index e4a4e40f370c..ddaceb877f8a 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
- url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
+ url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
# Update this if linux_latest-libre fails to build.
- # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
- rev = "16604";
- sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
+ # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
+ rev = "16791";
+ sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
}
, ...
}:
@@ -25,7 +25,7 @@ in linux.override {
name = "${linux.name}-libre-src";
src = linux.src;
buildPhase = ''
- ${scripts}/${majorMinor}-gnu/deblob-${majorMinor} \
+ ${scripts}/${majorMinor}/deblob-${majorMinor} \
${major} ${minor} ${patch}
'';
checkPhase = ''
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 43ddc5f7b0f4..e70fc685161d 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lidarr";
- version = "0.6.2.883";
+ version = "0.7.1.1381";
src = fetchurl {
- url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
- sha256 = "0096j2vph739h288vnz481nrwaq540faplir394xqfz7ik0krg4v";
+ url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz";
+ sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
};
buildInputs = [
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r * $out/bin/
- # Mark all executable files as non-executable
- find $out/bin -type f -executable | xargs chmod -x
+ # Mark main executable as executable
+ chmod +x $out/bin/Lidarr.exe
makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
--add-flags "$out/bin/Lidarr.exe" \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A Usenet/BitTorrent music downloader";
- homepage = https://lidarr.audio/;
+ homepage = "https://lidarr.audio/";
license = licenses.gpl3;
maintainers = [ maintainers.etu ];
platforms = platforms.all;
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 183cc3a2b955..d978cb003c76 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -96,10 +96,10 @@ stdenv.mkDerivation rec {
PREFIX=$(out)
DESTDIR=$(out)
PERLLIB=$(out)/${perlPackages.perl.libPrefix}
- PERL=${perlPackages.perl}/bin/perl
- PYTHON=${python}/bin/python
- RUBY=${ruby}/bin/ruby
- JAVARUN=${jre}/bin/java
+ PERL=${perlPackages.perl.outPath}/bin/perl
+ PYTHON=${python.outPath}/bin/python
+ RUBY=${ruby.outPath}/bin/ruby
+ JAVARUN=${jre.outPath}/bin/java
PLUGINUSER=munin
'';
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index a1799839b64d..248c05aab4fa 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,12 +1,12 @@
generic: {
v42 = generic {
- version = "4.2.5";
- sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd";
+ version = "4.2.6";
+ sha256 = "0r08v9ka0v8d7w133yr09vaxzl5lhbrsvbx900x15qv8lwliysv4";
};
v40 = generic {
- version = "4.0.11";
- sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh";
+ version = "4.0.12";
+ sha256 = "1jlbzlz0rzcjixicdcd7xcjhfqwr82hngpazx85f40r9dy574pjw";
};
v30 = generic {
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index ed1362a0a528..440cd3465223 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15";
+ sha256 = "1knqgq8xrlvwfc3y2hki6p0zr4dblm7max37y01p3bf641gs748z";
};
cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644";
diff --git a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
deleted file mode 100644
index 64652c08c19c..000000000000
--- a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt
-index aa599418..7a51f73b 100644
---- a/libmariadb/plugins/auth/CMakeLists.txt
-+++ b/libmariadb/plugins/auth/CMakeLists.txt
-@@ -50,6 +50,7 @@ IF(WITH_SSL)
- ${REF10_SOURCES}
- ${CRYPT_SOURCE}
- INCLUDES ${REF10_DIR}
-+ LIBRARIES ${ED25519_LIBS}
- COMPILE_OPTIONS -DMYSQL_CLIENT=1)
- IF(MSVC)
- # Silence conversion (integer truncantion) warnings from reference code
diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
new file mode 100644
index 000000000000..173fa1e0c631
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
+index f7790748..995621e0 100644
+--- a/cmake/build_configurations/mysql_release.cmake
++++ b/cmake/build_configurations/mysql_release.cmake
+@@ -121,7 +121,6 @@ ENDIF()
+
+ IF(UNIX)
+ SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
+- SET(PLUGIN_AUTH_PAM YES)
+
+ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ IF(NOT IGNORE_AIO_CHECK)
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index dc25b4263e78..95796e75c67e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
-, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5
+, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, scons
@@ -21,21 +21,21 @@ mariadb = server // {
};
common = rec { # attributes common to both builds
- version = "10.3.17";
+ version = "10.3.18";
src = fetchurl {
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
- sha256 = "15vh15az16932q42y9dxpzwxldmh0x4hvzrar3f8kblsqm7ym890";
+ sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9";
name = "mariadb-${version}.tar.gz";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- ncurses openssl zlib pcre jemalloc libiconv
+ ncurses openssl zlib pcre jemalloc libiconv curl
] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ]
++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
@@ -46,7 +46,6 @@ common = rec { # attributes common to both builds
patches = [
./cmake-includedir.patch
./cmake-libmariadb-includedir.patch
- ./cmake-fix-crypt-libs.patch
];
cmakeFlags = [
@@ -61,7 +60,7 @@ common = rec { # attributes common to both builds
"-DINSTALL_DOCDIR=share/doc/mysql"
"-DINSTALL_DOCREADMEDIR=share/doc/mysql"
"-DINSTALL_INCLUDEDIR=include/mysql"
- "-DINSTALL_LIBDIR=lib/mysql"
+ "-DINSTALL_LIBDIR=lib"
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
"-DINSTALL_INFODIR=share/mysql/docs"
"-DINSTALL_MANDIR=share/man"
@@ -90,7 +89,7 @@ common = rec { # attributes common to both builds
postInstall = ''
rm "$out"/lib/mysql/plugin/daemon_example.ini
mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin
- mkdir -p "$dev"/lib/mysql && mv "$out"/lib/mysql/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib/mysql
+ mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib
mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin
'';
@@ -116,6 +115,7 @@ client = stdenv.mkDerivation (common // {
patches = common.patches ++ [
./cmake-plugin-includedir.patch
+ ./cmake-without-plugin-auth-pam.patch
];
cmakeFlags = common.cmakeFlags ++ [
@@ -129,14 +129,13 @@ client = stdenv.mkDerivation (common // {
-DCMAKE_INSTALL_PREFIX_DEV=$dev"
'';
- postInstall = common.postInstall + ''
+ postInstall = common.postInstall + ''
rm -r "$out"/share/doc
rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan}
- libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt})
- rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
- mv "$libmysqlclient_path" "$out"/lib/mysql/libmysqlclient${libExt}
- ln -sv libmysqlclient${libExt} "$out"/lib/mysql/libmysqlclient_r${libExt}
-
+ libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
+ rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
+ mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
+ ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
'';
});
@@ -151,6 +150,7 @@ server = stdenv.mkDerivation (common // {
xz lzo lz4 bzip2 snappy
libxml2 boost judy libevent cracklib
] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl
+ ++ optional stdenv.isLinux linux-pam
++ optional (!stdenv.isDarwin) mytopEnv;
patches = common.patches ++ [
@@ -159,7 +159,6 @@ server = stdenv.mkDerivation (common // {
cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql"
- "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
"-DENABLED_LOCAL_INFILE=OFF"
"-DWITH_READLINE=ON"
"-DWITH_EXTRA_CHARSETS=all"
@@ -189,7 +188,7 @@ server = stdenv.mkDerivation (common // {
chmod +x "$out"/bin/wsrep_sst_common
rm "$out"/bin/mysql_client_test
rm -r "$out"/data # Don't need testing data
- rm "$out"/lib/mysql/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+ rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
'' + optionalString withoutClient ''
${ # We don't build with GSSAPI on Darwin
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index ae72b164b845..05fd405dbe6c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll";
+ sha256 = "0v4fj83zifcqhihc5myh0qv2396n5kw4sa8ix6jljmp6wh036z9j";
};
buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 5f9959958206..ef3dc4894d7b 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
- version = "1.4.1";
+ version = "1.4.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
- sha256 = "1gbca0fyaxjkwijdp2ah4iykwq5xabz9kkf8ak76sif4lz64y54b";
+ sha256 = "06mchpfjh4kskxq5r8b84870gl37xcqdf14n96qjb4nbyw9l8xcc";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];
diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix
new file mode 100644
index 000000000000..c393c65a7207
--- /dev/null
+++ b/pkgs/tools/filesystems/sasquatch/default.nix
@@ -0,0 +1,53 @@
+{ fetchFromGitHub
+, fetchurl
+, lz4 ? null
+, lz4Support ? false
+, lzma
+, lzo
+, stdenv
+, xz
+, zlib
+}:
+
+assert lz4Support -> (lz4 != null);
+
+let
+ patch = fetchFromGitHub {
+ owner = "devttys0";
+ repo = "sasquatch";
+ rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed";
+ sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2";
+ } + "/patches/patch0.txt";
+in
+stdenv.mkDerivation rec {
+ pname = "sasquatch";
+ version = "4.3";
+
+ src = fetchurl {
+ url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz;
+ sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
+ };
+
+ buildInputs = [ lzma lzo xz zlib ]
+ ++ stdenv.lib.optional lz4Support lz4;
+
+ patches = [ patch ];
+ patchFlags = [ "-p0" ];
+
+ postPatch = ''
+ cd squashfs-tools
+ '';
+
+ installFlags = "INSTALL_DIR=\${out}/bin";
+
+ makeFlags = [ "XZ_SUPPORT=1" ]
+ ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/devttys0/sasquatch";
+ description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.pamplemousse ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 7465cb67f61a..76661c77f7be 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
- version = "7.3.0";
+ version = "7.4.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
- sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi";
+ sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
};
- cargoSha256 = "1qqlii9693ih7pxl80v515a13jar3yayr5v7pa57x14i9syir10c";
+ cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz";
preFixup = ''
install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1"
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix
index f2c0f43cca95..a6fe1853ae55 100644
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/pkgs/tools/misc/uhubctl/default.nix
@@ -3,21 +3,20 @@
, libusb
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "uhubctl";
- version = "unstable-2019-07-31";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "mvp";
repo = "uhubctl";
- rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46";
- sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1";
+ rev = "refs/tags/v${version}";
+ sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq";
};
buildInputs = [ libusb ];
- installFlags = [ "prefix=$(out)" ];
-
+ installFlags = [ "prefix=${placeholder "out"}" ];
meta = with stdenv.lib; {
homepage = "https://github.com/mvp/uhubctl";
description = "Utility to control USB power per-port on smart USB hubs";
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 0b0860126b50..681d5d0e7a97 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -3,11 +3,14 @@
let wrapper = stdenv.mkDerivation rec {
pname = "wrapper";
version = "3.5.35";
+
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
};
+
buildInputs = [ jdk ];
+
buildPhase = ''
export ANT_HOME=${ant}
export JAVA_HOME=${jdk}/lib/openjdk/jre/
@@ -16,6 +19,7 @@ let wrapper = stdenv.mkDerivation rec {
sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
'';
+
installPhase = ''
mkdir -p $out/{bin,lib}
cp bin/wrapper $out/bin/wrapper
@@ -27,17 +31,22 @@ let wrapper = stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
- name = "i2p-0.9.41";
+ pname = "i2p";
+ version = "0.9.42";
+
src = fetchurl {
- url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
- sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b";
+ url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
+ sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h";
};
+
buildInputs = [ jdk ant gettext which ];
patches = [ ./i2p.patch ];
+
buildPhase = ''
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
ant preppkg-linux-only
- '';
+ '';
+
installPhase = ''
set -B
mkdir -p $out/{bin,share}
@@ -61,13 +70,13 @@ stdenv.mkDerivation rec {
mv $out/man $out/share/
chmod +x $out/bin/* $out/i2psvc
rm $out/{osid,postinstall.sh,INSTALL-headless.txt}
- '';
+ '';
meta = with stdenv.lib; {
- homepage = https://geti2p.net;
description = "Applications and router for I2P, anonymity over the Internet";
- maintainers = [ maintainers.joelmo ];
+ homepage = "https://geti2p.net";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
+ maintainers = [ maintainers.joelmo ];
};
}
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index ee331648e75f..a9758e5fd471 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -42,6 +42,7 @@ buildPythonPackage rec {
# Irrelevant in nixpkgs
excludes = [ "setup.py" "setup.cfg" "release/docker/*" ];
})
+ ./pytest5.patch
];
postPatch = ''
@@ -54,7 +55,7 @@ buildPythonPackage rec {
checkPhase = ''
export HOME=$(mktemp -d)
export LC_CTYPE=en_US.UTF-8
- pytest -k 'not test_find_unclaimed_URLs'
+ pytest -k 'not test_find_unclaimed_URLs and not test_tcp'
'';
propagatedBuildInputs = [
@@ -62,7 +63,7 @@ buildPythonPackage rec {
h2 hyperframe kaitaistruct passlib
pyasn1 pyopenssl pyparsing pyperclip
ruamel_yaml tornado urwid brotlipy
- sortedcontainers ldap3 wsproto
+ sortedcontainers ldap3 wsproto setuptools
];
checkInputs = [
diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/pkgs/tools/networking/mitmproxy/pytest5.patch
new file mode 100644
index 000000000000..bfbf7253b9c4
--- /dev/null
+++ b/pkgs/tools/networking/mitmproxy/pytest5.patch
@@ -0,0 +1,31 @@
+diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py
+index 489bf89f..c78472e3 100644
+--- a/test/mitmproxy/net/test_tls.py
++++ b/test/mitmproxy/net/test_tls.py
+@@ -87,14 +87,16 @@ def test_get_client_hello():
+ rfile = io.BufferedReader(io.BytesIO(
+ FULL_CLIENT_HELLO_NO_EXTENSIONS[:30]
+ ))
+- with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"):
++ with pytest.raises(exceptions.TlsProtocolException):
+ tls.get_client_hello(rfile)
++ pytest.fail("Unexpected EOF")
+
+ rfile = io.BufferedReader(io.BytesIO(
+ b"GET /"
+ ))
+- with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"):
++ with pytest.raises(exceptions.TlsProtocolException):
+ tls.get_client_hello(rfile)
++ pytest.fail("Expected TLS record")
+
+
+ class TestClientHello:
+@@ -153,5 +155,6 @@ class TestClientHello:
+ b"\x01\x00\x00\x03" + # handshake header
+ b"foo"
+ ))
+- with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'):
++ with pytest.raises(exceptions.TlsProtocolException):
+ tls.ClientHello.from_file(rfile)
++ pytest.fail('Cannot parse Client Hello')
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index ef6b0d5c6410..bd17fa054d33 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
- version = "0.0.20190702";
+ version = "0.0.20190913";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
- sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3";
+ sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg";
};
sourceRoot = "source/src/tools";
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 7ac73fac39e5..6c5f0660d127 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,13 +1,13 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
- sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0";
+ sha256 = "18kvsgl3kpla33dp1nbpd1kdgndfqcmlwwpjls55fp4mlczf8lcx";
};
cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz";
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 17d023f6daf3..870e6ce67b92 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
rustPlatform.buildRustPackage rec {
pname = "nix-du";
- version = "0.3.0";
+ version = "unstable-2019-07-15";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nix-du";
- rev = "v${version}";
- sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l";
+ rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e";
+ sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic";
};
cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v";
diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix
new file mode 100644
index 000000000000..6693a7464d43
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix
@@ -0,0 +1,35 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-common
+, futures
+, dateutil
+, requests
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ version = "0.20.3";
+ pname = "azure-storage";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
+ };
+
+ propagatedBuildInputs = [ azure-common dateutil requests ]
+ ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+ postInstall = ''
+ echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+ '';
+
+ meta = with pkgs.lib; {
+ description = "Microsoft Azure SDK for Python";
+ homepage = "https://azure.microsoft.com/en-us/develop/python/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ olcai ];
+ };
+}
diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
index d9ba324dce72..e6e30b26240f 100644
--- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
+++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
@@ -26,6 +26,7 @@ callPackage ./generic.nix (rec {
azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
+ azure-storage = callPackage ./azure-storage { };
});
};
})
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index f403aaaf687a..7b4c8cf68eb8 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -2,13 +2,13 @@
, kernel ? null, withDriver ? false }:
pythonPackages.buildPythonApplication rec {
name = "chipsec-${version}";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "chipsec";
repo = "chipsec";
rev = version;
- sha256 = "09ipr0vls1l2wln4z3dc9vx0zp63ps3dxkwlpm9rqqbpg7qq6lrp";
+ sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index fcc455422148..b132066fee52 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "sops";
- version = "3.3.1";
-
- goPackagePath = "go.mozilla.org/sops";
+ version = "3.4.0";
src = fetchFromGitHub {
rev = version;
owner = "mozilla";
repo = pname;
- sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi";
+ sha256 = "1mrqf9xgv88v919x7gz9l1x70xwvp6cfz3zp9ip1nj2pzn6ixz3d";
};
+ modSha256 = "13ja8nxycmdjnrnsxdd1qs06x408aqr4im127a6y433pkx2dg7gc";
+
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/mozilla/sops";
description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
maintainers = [ maintainers.marsam ];
license = licenses.mpl20;
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index c0fa221c9691..7620fc9760d8 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vault";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl";
+ sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
};
- modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
+ modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
buildFlagsArray = [
"-tags='vault'"
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index 6927c64bf483..63aa563bfa0c 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "datefudge";
- version = "1.22";
+ version = "1.23";
src = fetchgit {
url = "https://salsa.debian.org/debian/datefudge.git";
- rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
- sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
+ rev = "090d3aace17640478f7f5119518b2f4196f62617";
+ sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv";
};
patchPhase = ''
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index 65c905f28c65..29c20ad8d534 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -13,11 +13,18 @@ stdenv.mkDerivation rec {
sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
};
- patches = [ (fetchpatch {
- # fix crash in scan_dmi_sysfs() when run as non-root
- url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
- sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
- })];
+ patches = [
+ (fetchpatch {
+ # fix crash in scan_dmi_sysfs() when run as non-root
+ url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
+ sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
+ })
+ (fetchpatch {
+ # support cross-compilation
+ url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch";
+ sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0";
+ })
+ ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 30ebd4969dc5..7526a55d7ef9 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -12,12 +12,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.17.0";
+ version = "1.17.1";
pname = "netdata";
src = fetchurl {
url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
- sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6";
+ sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c1d06e9f768..07febf754522 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3677,6 +3677,8 @@ in
pgf_graphics = callPackage ../tools/graphics/pgf { };
+ pgformatter = callPackage ../development/tools/pgformatter { };
+
pgloader = callPackage ../development/tools/pgloader { };
pigz = callPackage ../tools/compression/pigz { };
@@ -5957,6 +5959,8 @@ in
samplicator = callPackage ../tools/networking/samplicator { };
+ sasquatch = callPackage ../tools/filesystems/sasquatch { };
+
sasview = callPackage ../applications/science/misc/sasview {};
scallion = callPackage ../tools/security/scallion { };
@@ -8355,7 +8359,9 @@ in
rustracer = callPackage ../development/tools/rust/racer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rustracerd = callPackage ../development/tools/rust/racerd { };
+ rustracerd = callPackage ../development/tools/rust/racerd {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -9272,8 +9278,11 @@ in
# };
# You can use a different directory, but whichever directory you choose
# should be owned by user root, group nixbld with permissions 0770.
- ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }:
- wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {};
+ ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
+ cc.override { cc = ccache.links {
+ inherit extraConfig;
+ unwrappedCC = cc.cc;
+ }; }) {};
ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
cccc = callPackage ../development/tools/analysis/cccc { };
@@ -19195,7 +19204,10 @@ in
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
- handbrake = callPackage ../applications/video/handbrake { };
+ handbrake = callPackage ../applications/video/handbrake {
+ inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox;
+ inherit (darwin) libobjc;
+ };
lilyterm = callPackage ../applications/misc/lilyterm {
inherit (gnome2) vte;
@@ -21813,6 +21825,8 @@ in
chessx = libsForQt59.callPackage ../games/chessx { };
+ chiaki = libsForQt5.callPackage ../games/chiaki { };
+
chocolateDoom = callPackage ../games/chocolate-doom { };
crispyDoom = callPackage ../games/crispy-doom { };
@@ -22405,6 +22419,8 @@ in
tinyfugue = callPackage ../games/tinyfugue { };
+ tome2 = callPackage ../games/tome2 { };
+
tome4 = callPackage ../games/tome4 { };
toppler = callPackage ../games/toppler { };
@@ -24132,7 +24148,9 @@ in
pgmanage = callPackage ../applications/misc/pgmanage { };
- pgadmin = callPackage ../applications/misc/pgadmin { };
+ pgadmin = callPackage ../applications/misc/pgadmin {
+ openssl = openssl_1_0_2;
+ };
pgf = pgf2;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index d4c2c3b1e3f3..cc42ff161f96 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -127,7 +127,7 @@ in rec {
version = "8.9.1";
};
coq_8_10 = callPackage ../applications/science/logic/coq {
- version = "8.10+beta2";
+ version = "8.10+beta3";
};
coqPackages_8_5 = mkCoqPackages coq_8_5;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62901ef20520..6bc54ebef679 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4380,8 +4380,6 @@ in {
pyenchant = callPackage ../development/python-modules/pyenchant { };
- pyev = callPackage ../development/python-modules/pyev { };
-
pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
pyext = callPackage ../development/python-modules/pyext { };