diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 110712baf5f..ca93026d865 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -96,6 +96,47 @@
The options are named identically for all other display managers.
+
+ Intel Graphics drivers
+
+ There are two choices for Intel Graphics drivers in X.org:
+ modesetting (included in the xorg-server itself)
+ and intel (provided by the package xf86-video-intel).
+
+
+ The default and recommended is modesetting.
+ It is a generic driver which uses the kernel
+ mode setting
+ (KMS) mechanism. It supports Glamor (2D graphics acceleration via OpenGL)
+ and is actively maintained but may perform worse in some cases (like in old chipsets).
+
+
+ The second driver, intel, is specific to Intel GPUs,
+ but not recommended by most distributions: it lacks several modern features
+ (for example, it doesn't support Glamor) and the package hasn't been officially
+ updated since 2015.
+
+
+ The results vary depending on the hardware, so you may have to try both drivers.
+ Use the option to set one.
+ The recommended configuration for modern systems is:
+
+ = [ "modesetting" ];
+ = true;
+
+ If you experience screen tearing no matter what, this configuration was
+ reported to resolve the issue:
+
+ = [ "intel" ];
+ = ''
+ Option "DRI" "2"
+ Option "TearFree" "true"
+ '';
+
+ Note that this will likely downgrade the performance compared to
+ modesetting or intel with DRI 3 (default).
+
+
Proprietary NVIDIA drivers
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 7fbbfcec751..8defa86818a 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -626,7 +626,7 @@ in {
then
''
The password hash of user "${name}" may be invalid. You must set a
- valid hash or the user will be locked out of his account. Please
+ valid hash or the user will be locked out of their account. Please
check the value of option `users.users."${name}".hashedPassword`.
''
else null
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix
index cf553497c89..b3f1dda98c8 100644
--- a/nixos/modules/hardware/device-tree.nix
+++ b/nixos/modules/hardware/device-tree.nix
@@ -22,11 +22,22 @@ in {
example = literalExample "pkgs.device-tree_rpi";
type = types.path;
description = ''
- The package containing the base device-tree (.dtb) to boot. Contains
+ The path containing the base device-tree (.dtb) to boot. Contains
device trees bundled with the Linux kernel by default.
'';
};
+ name = mkOption {
+ default = null;
+ example = "some-dtb.dtb";
+ type = types.nullOr types.str;
+ description = ''
+ The name of an explicit dtb to be loaded, relative to the dtb base.
+ Useful in extlinux scenarios if the bootloader doesn't pick the
+ right .dtb file from FDTDIR.
+ '';
+ };
+
overlays = mkOption {
default = [];
example = literalExample
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 2d34406a032..bef6cd2fb5a 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -2,12 +2,6 @@
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
-let
- extlinux-conf-builder =
- import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
- pkgs = pkgs.buildPackages;
- };
-in
{
imports = [
../../profiles/base.nix
@@ -56,7 +50,7 @@ in
'';
populateRootCommands = ''
mkdir -p ./files/boot
- ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
'';
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 651d1a36dc1..d2ba611532e 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -2,12 +2,6 @@
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
-let
- extlinux-conf-builder =
- import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
- pkgs = pkgs.buildPackages;
- };
-in
{
imports = [
../../profiles/base.nix
@@ -53,7 +47,7 @@ in
'';
populateRootCommands = ''
mkdir -p ./files/boot
- ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
'';
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index ba4127eaa0e..40a01f96177 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -2,12 +2,6 @@
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
-let
- extlinux-conf-builder =
- import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
- pkgs = pkgs.buildPackages;
- };
-in
{
imports = [
../../profiles/base.nix
@@ -42,7 +36,7 @@ in
'';
populateRootCommands = ''
mkdir -p ./files/boot
- ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
'';
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index c15befa59e2..ddad1116c94 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -99,7 +99,7 @@ in
};
populateRootCommands = mkOption {
- example = literalExample "''\${extlinux-conf-builder} -t 3 -c \${config.system.build.toplevel} -d ./files/boot''";
+ example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''";
description = ''
Shell commands to populate the ./files directory.
All files in that directory are copied to the
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 422c405054d..157dc28e0a8 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -628,6 +628,7 @@ EOF
write_file($fn, <"iponly": specifies no authentication. ACLs authorization is used.
- "strong": authentication by username/password. If user is not registered his access is denied regardless of ACLs.
+ "strong": authentication by username/password. If user is not registered their access is denied regardless of ACLs.
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
index af39c7bb684..bd508bbe8ea 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
@@ -4,11 +4,15 @@ with lib;
let
blCfg = config.boot.loader;
+ dtCfg = config.hardware.deviceTree;
cfg = blCfg.generic-extlinux-compatible;
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
+ # The builder used to write during system activation
builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
+ # The builder exposed in populateCmd, which runs on the build architecture
+ populateBuilder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
in
{
options = {
@@ -34,11 +38,28 @@ in
Maximum number of configurations in the boot menu.
'';
};
+
+ populateCmd = mkOption {
+ type = types.str;
+ readOnly = true;
+ description = ''
+ Contains the builder command used to populate an image,
+ honoring all options except the -c <path-to-default-configuration>
+ argument.
+ Useful to have for sdImage.populateRootCommands
+ '';
+ };
+
};
};
- config = mkIf cfg.enable {
- system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c";
- system.boot.loader.id = "generic-extlinux-compatible";
- };
+ config = let
+ builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}";
+ in
+ mkIf cfg.enable {
+ system.build.installBootLoader = "${builder} ${builderArgs} -c";
+ system.boot.loader.id = "generic-extlinux-compatible";
+
+ boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}";
+ };
}
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 0092ee92b62..854684b87fa 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -6,7 +6,7 @@ export PATH=/empty
for i in @path@; do PATH=$PATH:$i/bin; done
usage() {
- echo "usage: $0 -t -c [-d ] [-g ]" >&2
+ echo "usage: $0 -t -c [-d ] [-g ] [-n ]" >&2
exit 1
}
@@ -15,7 +15,7 @@ default= # Default configuration
target=/boot # Target directory
numGenerations=0 # Number of other generations to include in the menu
-while getopts "t:c:d:g:" opt; do
+while getopts "t:c:d:g:n:" opt; do
case "$opt" in
t) # U-Boot interprets '0' as infinite and negative as instant boot
if [ "$OPTARG" -lt 0 ]; then
@@ -29,6 +29,7 @@ while getopts "t:c:d:g:" opt; do
c) default="$OPTARG" ;;
d) target="$OPTARG" ;;
g) numGenerations="$OPTARG" ;;
+ n) dtbName="$OPTARG" ;;
\?) usage ;;
esac
done
@@ -96,7 +97,17 @@ addEntry() {
echo " LINUX ../nixos/$(basename $kernel)"
echo " INITRD ../nixos/$(basename $initrd)"
if [ -d "$dtbDir" ]; then
- echo " FDTDIR ../nixos/$(basename $dtbs)"
+ # if a dtbName was specified explicitly, use that, else use FDTDIR
+ if [ -n "$dtbName" ]; then
+ echo " FDT ../nixos/$(basename $dtbs)/${dtbName}"
+ else
+ echo " FDTDIR ../nixos/$(basename $dtbs)"
+ fi
+ else
+ if [ -n "$dtbName" ]; then
+ echo "Explicitly requested dtbName $dtbName, but there's no FDTDIR - bailing out." >&2
+ exit 1
+ fi
fi
echo " APPEND systemConfig=$path init=$path/init $extraParams"
}
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index 5bbec3d5726..8c38f1b47ef 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -74,7 +74,7 @@ in
with subtest("test5 user should not be able to run commands under root"):
machine.fail("sudo -u test5 sudo -n -u root true")
- with subtest("test5 user should be able to keep his environment"):
+ with subtest("test5 user should be able to keep their environment"):
machine.succeed("sudo -u test5 sudo -n -E -u test1 true")
with subtest("users in group 'barfoo' should not be able to keep their environment"):
diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index ab9b589f859..9c07bcf9f51 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -176,7 +176,8 @@ in {
sub checkClientCert ($) {
my $user = $_[0];
- my $cmd = "gnutls-cli".
+ # debug level 3 is a workaround for gnutls issue https://gitlab.com/gnutls/gnutls/-/issues/1040
+ my $cmd = "gnutls-cli -d 3".
" --x509cafile=/home/$user/.task/keys/ca.cert".
" --x509keyfile=/home/$user/.task/keys/private.key".
" --x509certfile=/home/$user/.task/keys/public.cert".
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 59136596b0e..0ca556a16ef 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -2,11 +2,11 @@
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
- version = "3.1.3";
+ version = "3.2.2";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "11z5flmp55ywgxyccj3pzhijhaggi42i2pvacg88kcpj0cin57vl";
+ sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/applications/audio/fverb/default.nix
new file mode 100644
index 00000000000..28955379574
--- /dev/null
+++ b/pkgs/applications/audio/fverb/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "fverb";
+ # no release yet: https://github.com/jpcima/fverb/issues/2
+ version = "unstable-2020-06-09";
+
+ src = fetchFromGitHub {
+ owner = "jpcima";
+ repo = pname;
+ rev = "462020e33e24c0204a375dc95e2c28654cc917b8";
+ sha256 = "12nl7qn7mnykk7v8q0j2n8kfq0xc46n0i45z6qcywspadwnncmd4";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ postPatch = ''
+ patchShebangs ./dpf/utils/generate-ttl.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A stereo variant of the reverberator by Jon Dattorro, for lv2";
+ homepage = "https://github.com/jpcima/fverb";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 063a05a72f3..0561a0179a6 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,6 +1,7 @@
{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
+, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
+, qtquickcontrols2, qtscript, qtsvg, qttools
, qtwebengine, qtxmlpatterns
}:
@@ -26,7 +27,8 @@ mkDerivation rec {
buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio portmidi # tesseract
- qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
+ qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2
+ qtscript qtsvg qttools qtwebengine qtxmlpatterns
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 71d85248599..3e2192c0414 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Pulseaudio command line mixer";
longDescription = ''
Features:
- - Get the current volume of the default sink, the default source or a selected one by his id
+ - Get the current volume of the default sink, the default source or a selected one by its id
- Set the volume for the default sink, the default source or any other device
- List the sinks
- List the sources
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 531a633f05d..25b8f9456a0 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, alsaLib, asio, avahi, flac, libogg, libvorbis }:
+, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr }:
let
@@ -33,21 +33,21 @@ in
stdenv.mkDerivation rec {
pname = "snapcast";
- version = "0.15.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "badaix";
repo = "snapcast";
rev = "v${version}";
- sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2";
+ sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig boost170.dev ];
# snapcast also supports building against tremor but as we have libogg, that's
# not needed
buildInputs = [
alsaLib asio avahi flac libogg libvorbis
- aixlog popl
+ aixlog popl soxr
];
# Upstream systemd unit files are pretty awful, so we provide our own in a
diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix
new file mode 100644
index 00000000000..966303ec5a6
--- /dev/null
+++ b/pkgs/applications/blockchains/cgminer/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, libtool
+, autoconf
+, automake
+, curl
+, ncurses
+, ocl-icd
+, opencl-headers
+, libusb1
+, xorg
+, jansson }:
+
+stdenv.mkDerivation rec {
+ pname = "cgminer";
+ version = "4.11.1";
+
+ src = fetchFromGitHub {
+ owner = "ckolivas";
+ repo = "cgminer";
+ rev = "v${version}";
+ sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers
+ xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ];
+
+ configureScript = "./autogen.sh";
+ configureFlags = [ "--enable-scrypt"
+ "--enable-opencl"
+ "--enable-bitforce"
+ "--enable-icarus"
+ "--enable-modminer"
+ "--enable-ztex"
+ "--enable-avalon"
+ "--enable-klondike"
+ "--enable-keccak"
+ "--enable-bflsc"];
+
+ meta = with stdenv.lib; {
+ description = "CPU/GPU miner in c for bitcoin";
+ homepage = "https://github.com/ckolivas/cgminer";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ offline mmahut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
index 6a1ee5d196e..4a8c176f575 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/pkgs/applications/editors/micro/default.nix
@@ -1,25 +1,35 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
-buildGoPackage rec {
+buildGoPackage rec {
pname = "micro";
- version = "2.0.3";
+ version = "2.0.5";
goPackagePath = "github.com/zyedidia/micro";
src = fetchFromGitHub {
owner = "zyedidia";
- repo = "micro";
+ repo = pname;
rev = "v${version}";
- sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z";
+ sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc";
fetchSubmodules = true;
};
+ nativeBuildInputs = [ installShellFiles ];
+
subPackages = [ "cmd/micro" ];
- buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ];
+ buildFlagsArray = let t = "${goPackagePath}/internal/util"; in ''
+ -ldflags=
+ -X ${t}.Version=${version}
+ -X ${t}.CommitHash=${src.rev}
+ '';
goDeps = ./deps.nix;
+ postInstall = ''
+ installManPage $src/assets/packaging/micro.1
+ '';
+
meta = with stdenv.lib; {
homepage = "https://micro-editor.github.io";
description = "Modern and intuitive terminal-based text editor";
diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix
index e8ed69a9088..c274ce80ada 100644
--- a/pkgs/applications/editors/micro/deps.nix
+++ b/pkgs/applications/editors/micro/deps.nix
@@ -203,8 +203,8 @@
fetch = {
type = "git";
url = "https://github.com/zyedidia/clipboard";
- rev = "241f98e9b197";
- sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi";
+ rev = "7c45b8673834";
+ sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4";
};
}
{
@@ -257,8 +257,8 @@
fetch = {
type = "git";
url = "https://github.com/zyedidia/tcell";
- rev = "v1.4.4";
- sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi";
+ rev = "v1.4.7";
+ sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa";
};
}
{
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 2e11f22f517..72e84620252 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in mkDerivation rec {
- version = "3.10.4";
+ version = "3.10.7";
pname = "qgis";
name = "${pname}-unwrapped-${version}";
@@ -18,7 +18,7 @@ in mkDerivation rec {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12";
+ sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf";
};
passthru = {
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 60df1f899de..82c653edda4 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -89,6 +89,7 @@ let
kaddressbook = callPackage ./kaddressbook.nix {};
kalarm = callPackage ./kalarm.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
+ kapptemplate = callPackage ./kapptemplate.nix { };
kate = callPackage ./kate.nix {};
kbreakout = callPackage ./kbreakout.nix {};
kcachegrind = callPackage ./kcachegrind.nix {};
diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix
new file mode 100644
index 00000000000..a5e211318a2
--- /dev/null
+++ b/pkgs/applications/kde/kapptemplate.nix
@@ -0,0 +1,24 @@
+{ lib
+, mkDerivation
+, fetchurl
+, cmake
+, extra-cmake-modules
+, qtbase
+, kactivities
+}:
+mkDerivation {
+
+ name = "kapptemplate";
+
+ nativeBuildInputs = [ extra-cmake-modules cmake ];
+
+ buildInputs = [ kactivities qtbase ];
+
+ meta = with lib; {
+ description = "KDE App Code Template Generator";
+ license = licenses.gpl2;
+ homepage = "https://kde.org/applications/en/development/org.kde.kapptemplate";
+ maintainers = [ maintainers.shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index f4018cff5f4..9b8f531e800 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec {
- version = "4.3";
+ version = "4.4";
pname = "buku";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac";
+ sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556";
};
checkInputs = [
@@ -38,6 +38,7 @@ with python3.pkgs; buildPythonApplication rec {
click
html5lib
vcrpy
+ toml
];
postPatch = ''
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
deleted file mode 100644
index 09236565d59..00000000000
--- a/pkgs/applications/misc/cgminer/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
-, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }:
-
-stdenv.mkDerivation {
- version = "3.7.2";
- pname = "cgminer";
-
- src = fetchgit {
- url = "https://github.com/ckolivas/cgminer.git";
- rev = "refs/tags/v3.7.2";
- sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- autoconf automake libtool curl ncurses ocl-icd opencl-headers
- xorg.libX11 xorg.libXext xorg.libXinerama jansson
- ];
- configureScript = "./autogen.sh";
- configureFlags = [ "--enable-scrypt" "--enable-opencl" ];
- NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
-
- postBuild = ''
- gcc api-example.c -o cgminer-api
- '';
-
- postInstall = ''
- cp cgminer-api $out/bin/
- chmod 444 $out/bin/*.cl
- '';
-
- meta = with stdenv.lib; {
- description = "CPU/GPU miner in c for bitcoin";
- longDescription= ''
- This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU
- monitoring, (over)clocking and fanspeed support for bitcoin and derivative
- coins. Do not use on multiple block chains at the same time!
- '';
- homepage = "https://github.com/ckolivas/cgminer";
- license = licenses.gpl3;
- maintainers = [ maintainers.offline ];
- platforms = stdenv.lib.platforms.linux;
- hydraPlatforms = [];
- };
-}
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index b1e740fb760..81f931b11f8 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -15,15 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ readline ncurses gettext ];
- configurePhase = ''
- autoreconf -fvi
- ./configure
- '';
-
- installPhase = ''
- mkdir -p $out/bin/
- mv src/hstr $out/bin/
- '';
+ configureFlags = [ "--prefix=$(out)" ];
meta = {
homepage = "https://github.com/dvorka/hstr";
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 12db0cd87e9..85e9795a036 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.18.0";
+ version = "0.18.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "15i4ld65a5rfbaxxdh6kgg9h0ih73iqjskk82h8j72qgzkc6g3hf";
+ sha256 = "1g4mfgygyl143k0k6d3cb8b2l05ahiamlcqs1iqi66pc73cax4z6";
};
buildInputs = [
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index 6a152176415..efd9cc4c021 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "moolticute";
- version = "0.43.16";
+ version = "0.43.19";
src = fetchFromGitHub {
owner = "mooltipass";
repo = pname;
rev = "v${version}";
- sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y";
+ sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg";
};
outputs = [ "out" "udev" ];
diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/applications/networking/browsers/av-98/default.nix
new file mode 100644
index 00000000000..2184c8d699a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/av-98/default.nix
@@ -0,0 +1,21 @@
+{ lib, python3Packages, fetchgit }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "av-98";
+ version = "1.0.2dev";
+
+ src = fetchgit {
+ url = "https://tildegit.org/solderpunk/AV-98.git";
+ rev = "96cf8e13fe5714c8cdc754f51eef9f0293b8ca1f";
+ sha256 = "09iskh33hl5aaif763j1fmbz7yvf0yqsxycfd41scj7vbwdsbxl0";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ];
+
+ meta = with lib; {
+ homepage = "https://tildegit.org/solderpunk/AV-98";
+ description = "Experimental console client for the Gemini protocol";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ ehmry ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 248980e5b2b..0ec400ea469 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "3.0.1874.38-1";
+ version = "3.1.1929.45-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w";
+ sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 5e51fe4267d..2e4f68d6bfa 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7";
};
- vendorSha256 = null;
+ vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";
subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix
index c2af3e4d3e7..0ee84dae356 100644
--- a/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -4,7 +4,7 @@
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb
-, mesa, nspr, nss, pango, systemd
+, mesa, nspr, nss, pango, systemd, libappindicator-gtk3
}:
let
@@ -35,6 +35,7 @@ in stdenv.mkDerivation rec {
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
+ libappindicator-gtk3
];
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index f4517025010..ba10ab16267 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "psi-plus";
- version = "1.4.1231";
+ version = "1.4.1407";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
- sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i";
+ sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw";
};
cmakeFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index f9a5ebdbebe..6280bfdf4c7 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.6.5",
+ "version": "1.6.6",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -48,17 +48,18 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
- "matrix-js-sdk": "6.2.2",
+ "matrix-js-sdk": "7.0.0",
"mkdirp": "^1.0.3",
- "needle": "^2.3.2",
- "node-pre-gyp": "^0.14.0",
+ "needle": "^2.5.0",
+ "node-pre-gyp": "^0.15.0",
"npm": "^6.13.7",
"rimraf": "^3.0.2",
"semver": "^7.1.3",
"tar": "^6.0.1"
},
"hakDependencies": {
- "matrix-seshat": "^1.3.3"
+ "matrix-seshat": "^1.3.3",
+ "keytar": "^5.6.0"
},
"build": {
"appId": "im.riot.app",
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index 30e1c946475..2fa0303ae05 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
@@ -3154,11 +3154,11 @@
};
}
{
- name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
+ name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
path = fetchurl {
- name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
- url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz";
- sha1 = "103d951f61945217b110962f55ae43996756f615";
+ name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
+ url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz";
+ sha1 = "da2b24e57574379c3d8f7065eb68ea6c479d9806";
};
}
{
@@ -3273,6 +3273,14 @@
sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f";
};
}
+ {
+ name = "minimist___minimist_1.2.5.tgz";
+ path = fetchurl {
+ name = "minimist___minimist_1.2.5.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
+ };
+ }
{
name = "minipass___minipass_2.9.0.tgz";
path = fetchurl {
@@ -3321,6 +3329,14 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
+ {
+ name = "mkdirp___mkdirp_0.5.5.tgz";
+ path = fetchurl {
+ name = "mkdirp___mkdirp_0.5.5.tgz";
+ url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
+ };
+ }
{
name = "mkdirp___mkdirp_1.0.3.tgz";
path = fetchurl {
@@ -3378,11 +3394,11 @@
};
}
{
- name = "needle___needle_2.3.2.tgz";
+ name = "needle___needle_2.5.0.tgz";
path = fetchurl {
- name = "needle___needle_2.3.2.tgz";
- url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz";
- sha1 = "3342dea100b7160960a450dc8c22160ac712a528";
+ name = "needle___needle_2.5.0.tgz";
+ url = "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz";
+ sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0";
};
}
{
@@ -3410,11 +3426,11 @@
};
}
{
- name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
+ name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz";
path = fetchurl {
- name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
- url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
- sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83";
+ name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz";
+ url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz";
+ sha1 = "c2fc383276b74c7ffa842925241553e8b40f1087";
};
}
{
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index b05f64c1382..72ec6e83ca6 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "riot-desktop";
- version = "1.6.5";
+ version = "1.6.6";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60";
+ sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8";
};
electron = electron_7;
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index cc4eb4161f1..86aa4c92766 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "riot-web";
- version = "1.6.5";
+ version = "1.6.6";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5";
+ sha256 = "0j88wcha5rr6qaxik4m90v9mgfcj3r9nb4gpd2dzi7m1zf7kivkw";
};
installPhase = ''
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
new file mode 100644
index 00000000000..ea6303a3c34
--- /dev/null
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, python3
+, wrapQtAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "maestral-qt";
+ version = "1.1.0";
+ disabled = python3.pkgs.pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "SamSchott";
+ repo = "maestral-qt";
+ rev = "v${version}";
+ sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ bugsnag
+ click
+ markdown2
+ maestral
+ pyqt5
+ ];
+
+ nativeBuildInputs = [ wrapQtAppsHook ];
+
+ makeWrapperArgs = [
+ # Firstly, add all necessary QT variables
+ "\${qtWrapperArgs[@]}"
+
+ # Add the installed directories to the python path so the daemon can find them
+ "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}"
+ "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages"
+ ];
+
+ # no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ inherit (src.meta) homepage;
+ };
+}
diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix
deleted file mode 100644
index fe611892ae6..00000000000
--- a/pkgs/applications/networking/maestral/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, python3
-, withGui ? false
-, wrapQtAppsHook ? null
-}:
-
-python3.pkgs.buildPythonApplication rec {
- pname = "maestral${lib.optionalString withGui "-gui"}";
- version = "0.6.4";
-
- disabled = python3.pkgs.pythonOlder "3.6";
-
- src = fetchFromGitHub {
- owner = "SamSchott";
- repo = "maestral-dropbox";
- rev = "v${version}";
- sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn";
- };
-
- propagatedBuildInputs = with python3.pkgs; [
- blinker
- bugsnag
- click
- dropbox
- keyring
- keyrings-alt
- lockfile
- pathspec
- Pyro5
- requests
- u-msgpack-python
- watchdog
- ] ++ lib.optionals stdenv.isLinux [
- sdnotify
- systemd
- ] ++ lib.optional withGui pyqt5;
-
- nativeBuildInputs = lib.optional withGui wrapQtAppsHook;
-
- postInstall = lib.optionalString withGui ''
- makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \
- --add-flags gui
- '';
-
- # no tests
- doCheck = false;
-
- meta = with lib; {
- description = "Open-source Dropbox client for macOS and Linux";
- license = licenses.mit;
- maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.unix;
- inherit (src.meta) homepage;
- };
-}
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 58412835639..5609b48671c 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -4,15 +4,13 @@
, fetchFromGitHub
}:
-let
- rev = "ea0df7bee433fedae5716906ea56141f92b9ce53";
-in buildGoModule rec {
+buildGoModule rec {
pname = "aerc";
- version = "unstable-2020-02-01";
+ version = "0.4.0";
src = fetchurl {
- url = "https://git.sr.ht/~sircmpwn/aerc/archive/${rev}.tar.gz";
- sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9";
+ url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";
+ sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk";
};
libvterm = fetchFromGitHub {
@@ -22,7 +20,7 @@ in buildGoModule rec {
sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6";
};
- vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k";
+ vendorSha256 = "1rqn36510m0yb7k4bvq2hgirr3z8a2h5xa7cq5mb84xsmhvf0g69";
overrideModAttrs = (_: {
postBuild = ''
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index b88e70a168f..a6acea9d1cb 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
- version = "1.14.4";
+ version = "1.14.5";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
- sha256 = "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na";
+ sha256 = "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 9b06676b017..cdc2f5e1478 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec {
pname = "resilio-sync";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f";
- i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg";
+ x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm";
+ i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i";
}.${stdenv.hostPlatform.system};
};
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 8e1bb0d76d9..b33d978ee0b 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,16 +5,16 @@ let
in
buildPythonApplication rec {
pname = "fava";
- version = "1.14";
+ version = "1.15";
src = fetchPypi {
inherit pname version;
- sha256 = "181ypq2p7aaq2b76s55hxxbm1hykzf45mjjgm500h4dsaa167dqy";
+ sha256 = "037fhimfjiqay28wg7hd5sm7r0935ynw9d905iszn965ihr1qsgz";
};
checkInputs = [ python3.pkgs.pytest ];
propagatedBuildInputs = with python3.pkgs;
- [
+ [
Babel
cheroot
flaskbabel
@@ -30,8 +30,9 @@ buildPythonApplication rec {
];
# CLI test expects fava on $PATH. Not sure why static_url fails.
+ # the entry_slices and render_entries requires other files to pass
checkPhase = ''
- py.test tests -k 'not cli and not static_url'
+ py.test tests -k 'not cli and not static_url and not entry_slice and not render_entries'
'';
meta = {
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 1d32e6ff027..cc8412e1ac5 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
hydraPlatforms = [];
license = stdenv.lib.licenses.unfreeRedistributable;
- maintainers = [ stdenv.lib.maintainers.mlatus ];
+ maintainers = with stdenv.lib.maintainers; [ mlatus th0rgal ];
};
buildInputs = with xorg; [
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 7ef7776c0fe..78a7f742174 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "stellarium";
- version = "0.20.1";
+ version = "0.20.2";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky";
+ sha256 = "0bpxv781chx5acjh9ni5l9dlnvn6jgkqylq09885g6j4gi3q56br";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix
index 6a90f50b5aa..d97c1246984 100644
--- a/pkgs/applications/science/logic/cadical/default.nix
+++ b/pkgs/applications/science/logic/cadical/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cadical";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "cadical";
rev = "rel-${version}";
- sha256 = "1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6";
+ sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
};
dontAddPrefix = true;
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 9ca29096882..aaae2a4a257 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.12.0";
+ version = "1.12.1";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "1nsi7d2jackkjvinp5wglrzb61f2hihrn6qgwlp1zb185k2qpd23";
+ sha256 = "0n92msf5pbgb5q6pa2p0nj9lnzs4y0qis62c5mp4hp8rc1j22wlb";
};
unpackPhase = ''
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index 74a408952a2..7d3b8021229 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';
- sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v";
+ sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq";
};
buildAttrs = {
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 4c7f5d85e86..fb120e5eec6 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
+ substituteInPlace Makefile --replace 'gzip' 'gzip -n'
'';
postBuild = ''
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 220e2506858..d8f612d1a81 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
pname = "xfce4-eyes-plugin";
- version = "4.5.0";
+ version = "4.5.1";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx";
+ sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix
new file mode 100644
index 00000000000..6fa58145250
--- /dev/null
+++ b/pkgs/development/compilers/mlkit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, mlton }:
+
+stdenv.mkDerivation rec {
+ pname = "mlkit";
+ version = "4.5.0";
+
+ src = fetchFromGitHub {
+ owner = "melsman";
+ repo = "mlkit";
+ rev = "v${version}";
+ sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh";
+ };
+
+ nativeBuildInputs = [ autoreconfHook mlton ];
+
+ buildFlags = ["mlkit" "mlkit_libs"];
+
+ meta = with stdenv.lib; {
+ description = "Standard ML Compiler and Toolkit";
+ homepage = "https://elsman.com/mlkit/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ athas ];
+ };
+}
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index 07ce35875d1..bc020174daa 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:
stdenv.mkDerivation rec {
- version = "1.2.0";
+ version = "1.3.0";
name = "coq${coq.coq-version}-simple-io-${version}";
src = fetchFromGitHub {
owner = "Lysxia";
repo = "coq-simple-io";
rev = version;
- sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
+ sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
};
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
};
}
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 2833a4d5673..4ad5bc14c35 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.05.1";
+ version = "2020.06";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1m4xpghhgi7iijbzvr7bzkay7k93bwpvdg58jp31csrwdzz4q5z1";
+ sha256 = "06kj8vfkkspmcdyd3zf2pyxwmijbbfnhv3jcaihvb8p3za5gxn2c";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index a7b57c9287a..1cee0eaef63 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.05";
+ version = "2020.06";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k";
+ sha256 = "1hlxm5p1n9fclma2z9kynkxrknsxdihzkbsb3wxnvjvndzqmk5yv";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 40133287f9e..15f0e0f9f58 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.05";
+ version = "2020.06";
src = fetchurl {
url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9";
+ sha256 = "13wkhdxxs86wl6ahfzhyp45dy6hk6qnij3dm8d8893b2rxs377m4";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/libprom/default.nix b/pkgs/development/libraries/libprom/default.nix
new file mode 100644
index 00000000000..b0c982fbf6a
--- /dev/null
+++ b/pkgs/development/libraries/libprom/default.nix
@@ -0,0 +1,48 @@
+{ gccStdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+}:
+let
+ stdenv = gccStdenv; # Darwin is clang by default and it doesn't work for this.
+in
+stdenv.mkDerivation rec {
+ pname = "libprom";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "digitalocean";
+ repo = "prometheus-client-c";
+ rev = "v${version}";
+ sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ doCheck = false;
+
+ patches = [
+ # Required so CMAKE_INSTALL_PREFIX is honored, otherwise it
+ # installs headers in /usr/include (absolute)
+ (fetchpatch {
+ url = "https://github.com/digitalocean/prometheus-client-c/commit/5fcedeb506b7d47dd7bab35797f2c3f23db6fe10.patch";
+ sha256 = "10hzg8v5jcgxz224kdq0nha9vs78wz098b0ys7gig2iwgrg018fy";
+ })
+ (fetchpatch {
+ url = "https://github.com/digitalocean/prometheus-client-c/commit/0c15e7e45ad0c3726593591fdd7d8f2fde845fe3.patch";
+ sha256 = "06899v1xz3lpsdxww4p3q7pv8nrymnibncdc472056znr5fidlp0";
+ })
+ ];
+
+ preConfigure = ''
+ cd prom
+ '';
+
+ meta = {
+ homepage = "https://github.com/digitalocean/prometheus-client-c/";
+ description = "A Prometheus Client in C";
+ platforms = stdenv.lib.platforms.unix;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [ stdenv.lib.maintainers.cfsmp3 ];
+ };
+
+}
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 8fe1477aa63..9601ae1eea3 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -1,39 +1,39 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
- name = "mp4v2-2.0.0";
+ pname = "mp4v2";
+ version = "4.1.3";
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2";
- sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683";
+ src = fetchFromGitHub {
+ # 2020-06-20: THE current upstream, maintained and used in distros fork.
+ owner = "TechSmith";
+ repo = "mp4v2";
+ rev = "Release-ThirdParty-MP4v2-${version}";
+ sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
};
patches = [
(fetchurl {
- name = "gcc-7.patch";
- url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"
- + "0004-Fix-GCC7-build.patch?id=d7aeedabb";
+ # 2020-06-19: NOTE: # Fix build with C++11
+ # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
+ url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713";
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
})
];
- buildFlags = [ "CXXFLAGS=-std=c++03" ];
-
# `faac' expects `mp4.h'.
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
- hardeningDisable = [ "format" ];
-
enableParallelBuilding = true;
meta = {
- description = "Abandoned library. Provides functions to read, create, and modify mp4 files";
+ description = "Provides functions to read, create, and modify mp4 files";
longDescription = ''
MP4v2 library provides an API to work with mp4 files
as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
This container format is derived from Apple's QuickTime format.
'';
- homepage = "https://code.google.com/archive/p/mp4v2/";
+ homepage = "https://github.com/TechSmith/mp4v2";
maintainers = [ lib.maintainers.Anton-Latukha ];
platforms = lib.platforms.unix;
license = lib.licenses.mpl11;
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix
index 5cecc33564e..a7098fe9305 100644
--- a/pkgs/development/libraries/openimagedenoise/default.nix
+++ b/pkgs/development/libraries/openimagedenoise/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, tbb, python }:
+{ stdenv, fetchzip, cmake, tbb, python, ispc }:
stdenv.mkDerivation rec {
pname = "openimagedenoise";
- version = "1.1.0";
+ version = "1.2.1";
- src = fetchFromGitHub {
- owner = "OpenImageDenoise";
- repo = "oidn";
- rev = "v${version}";
- sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m";
- fetchSubmodules = true;
+ # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
+ src = fetchzip {
+ url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
+ sha256 = "1f8s69ixv7nsdap9hc2njli2x75zmlrfq8cy79772gz83kph8s25";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python ispc ];
buildInputs = [ tbb ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index 994c2864e7f..14cfeefe428 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk";
- version = "1.6.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "flatpak";
repo = pname;
rev = version;
- sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h";
+ sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 02c039b8eab..b06edc63273 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -6,7 +6,7 @@
, pkgconfig
, libxml2
, glib
-, pipewire_0_2
+, pipewire
, fontconfig
, flatpak
, gsettings-desktop-schemas
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
- version = "1.6.0";
+ version = "1.7.2";
outputs = [ "out" "installedTests" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = pname;
rev = version;
- sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a";
+ sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm";
};
patches = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- pipewire_0_2
+ pipewire
fontconfig
flatpak
acl
@@ -61,10 +61,6 @@ stdenv.mkDerivation rec {
json-glib
];
- # Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor"
- # TODO: investigate!
- doCheck = false;
-
configureFlags = [
"--enable-installed-tests"
];
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 68a8ad8da4e..6075f4e7fb6 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "dns";
- version = "4.6.0";
+ version = "4.6.1";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
- sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv";
+ sha256 = "0nsx98r2i1siz0yghnh87f2sq8w79if7ih9259yay1bp39crd6gd";
};
propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix
index 4682a744d6f..d16ceefd04c 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.13.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix
@@ -357,7 +357,8 @@ rec {
async_unix = janePackage {
pname = "async_unix";
- hash = "0n3jz3qjlphyhkqgnbjbwf2fqxaksws82dx1mk4m4wnw3275gdi5";
+ version = "0.13.1";
+ hash = "1sb8grbj4bv6ih3yfdihxhn5c9rqczr56b5bhl85wy2mi92m17xv";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_kernel core ];
};
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/default.nix
similarity index 100%
rename from pkgs/development/ocaml-modules/lwt/4.x.nix
rename to pkgs/development/ocaml-modules/lwt/default.nix
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix
deleted file mode 100644
index 795baa0467e..00000000000
--- a/pkgs/development/ocaml-modules/lwt/legacy.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, react, ssl, libev, pkgconfig, ncurses, glib
-, ppx_tools, result, cppo
-, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
-, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
-}:
-
-if !stdenv.lib.versionAtLeast ocaml.version "4"
- || stdenv.lib.versionAtLeast ocaml.version "4.06"
-then throw "lwt is not available for OCaml ${ocaml.version}"
-else
-
-let sha256 = {
- "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
- "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
- "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
-}.${version}; in
-
-let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
-
-buildOcaml {
- name = "lwt";
- inherit version;
-
- src = fetchzip {
- url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
- inherit sha256;
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
- ++ stdenv.lib.optional ppxSupport ppx_tools;
-
- propagatedBuildInputs = [ result ]
- ++ optionals [ react ssl ]
- ++ [ libev ];
-
- configureScript = "ocaml setup.ml -configure";
- prefixKey = "--prefix ";
- configureFlags =
- optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ]
- ++ [ "--enable-camlp4" ]
- ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
-
- createFindlibDestdir = true;
-
- hasSharedObjects = true;
-
- meta = with stdenv.lib; {
- homepage = "http://ocsigen.org/lwt";
- description = "Lightweight thread library for Objective Caml";
- license = licenses.lgpl21;
- platforms = ocaml.meta.platforms or [];
- maintainers = with maintainers; [
- maggesi vbgl gal_bolle
- ];
- };
-}
diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index c7d7cf35e2d..ea346479a0c 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "mirage-runtime";
- version = "3.7.7";
+ version = "3.8.0";
minimumOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
- sha256 = "1ds5zfwb0g340kbdlsjayyw4n25nj7skdl1mwyvpzmkv4qcsmdiv";
+ sha256 = "18v37arzy7gkz5qcy34k0l8g69146nysjv0h1jcym0h4xxy0bxir";
};
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 0c3eaf33e78..222496fc6d1 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -4,14 +4,14 @@
, hacl_x25519, fiat-p256, hkdf, logs, alcotest }:
buildDunePackage rec {
- minimumOCamlVersion = "4.07";
+ minimumOCamlVersion = "4.08";
- version = "0.12.1";
+ version = "0.12.2";
pname = "tls";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
- sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg";
+ sha256 = "1wpgs0cd79wl4lnn1i44xjn8prha793nrbyv68zjiqpq3gmpyy3k";
};
useDune2 = true;
diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix
index 5a9d8849f8d..ae50ee6d3eb 100644
--- a/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.3.0";
+ version = "0.4.0";
pname = "azure-mgmt-security";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0z766424783a6y5dp5ybxssb0bfzqb8kpa6zra8ccnbfg4fn478v";
+ sha256 = "1gpkvvk4prx6khs6vrlbqlg6zarsmplg3k9zbymxfm6irriqildm";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index 48f7296d999..727311cc09a 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-web";
- version = "0.46.0";
+ version = "0.47.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6";
+ sha256 = "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix
index dd85789c59e..71b032a34e4 100644
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }:
+{ stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }:
let ext = if stdenv.isDarwin then "dylib" else "so";
in buildPythonPackage rec {
pname = "bitcoinlib";
- version = "0.9.0";
+ version = "0.11.0";
+
+ disabled = !isPy3k;
src = fetchFromGitHub {
owner = "petertodd";
- rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f";
repo = "python-bitcoinlib";
- sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z";
+ rev = "python-${pname}-v${version}";
+ sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm";
};
postPatch = ''
@@ -21,7 +23,7 @@ in buildPythonPackage rec {
meta = {
homepage = src.meta.homepage;
description = "Easy interface to the Bitcoin data structures and protocol";
- license = with lib.licenses; [ gpl3 ];
+ license = with lib.licenses; [ lgpl3 ];
maintainers = with lib.maintainers; [ jb55 ];
};
}
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 269e59b9c18..1ea6b87fa00 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,10 +1,19 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, isPy3k
-, more-itertools, six, setuptools_scm, setuptools-scm-git-archive
-, pytest, pytestcov, portend, pytest-testmon, pytest-mock
-, backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket
-, backports_functools_lru_cache }:
-
-let inherit (stdenv) lib; in
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k
+, jaraco_text
+, more-itertools
+, portend
+, pyopenssl
+, pytestCheckHook
+, pytestcov
+, pytest-mock
+, pytest-testmon
+, requests
+, requests-unixsocket
+, setuptools_scm
+, setuptools-scm-git-archive
+, six
+, trustme
+}:
buildPythonPackage rec {
pname = "cheroot";
@@ -19,21 +28,39 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];
- propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ];
+ propagatedBuildInputs = [ more-itertools six ];
- checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ];
+ checkInputs = [
+ jaraco_text
+ portend
+ pyopenssl
+ pytestCheckHook
+ pytestcov
+ pytest-mock
+ pytest-testmon
+ requests
+ requests-unixsocket
+ trustme
+ ];
# Disable doctest plugin because times out
# Disable xdist (-n arg) because it's incompatible with testmon
# Deselect test_bind_addr_unix on darwin because times out
# Deselect test_http_over_https_error on darwin because builtin cert fails
# Disable warnings-as-errors because of deprecation warnings from socks on python 3.7
- checkPhase = ''
- substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" ""
- ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"}
- 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"}
+ # adds many other pytest utilities which aren't necessary like linting
+ preCheck = ''
+ rm pytest.ini
'';
+ disabledTests= [
+ "tls" # touches network
+ "peercreds_unix_sock" # test urls no longer allowed
+ ] ++ lib.optionals stdenv.isDarwin [
+ "http_over_https_error"
+ "bind_addr_unix"
+ ];
+
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix
index e88591aba9a..a0dec64906e 100644
--- a/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/pkgs/development/python-modules/dash-core-components/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_core_components";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h";
+ sha256 = "02115plwhvyrmal01xp2964w8psysr2kf4ink8mh9z7kmda98l68";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
index a92f6617abe..8cb9250f34d 100644
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/pkgs/development/python-modules/dash-renderer/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_renderer";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv";
+ sha256 = "14fp66vasfag1bss09qyjnqa000g56q7vcap3ig57xycflks4c3y";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix
index 9c323c6fa33..8cdf0408dee 100644
--- a/pkgs/development/python-modules/dash-table/default.nix
+++ b/pkgs/development/python-modules/dash-table/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_table";
- version = "4.7.0";
+ version = "4.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm";
+ sha256 = "16q0d9fidllxm7p51i5p4vzknnc09d114zqw3f4a2spr7llga7xj";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 4a9a9a60af8..3757ff47408 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dash";
- version = "1.12.0";
+ version = "1.13.3";
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
- sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy";
+ sha256 = "131p725rc731ynksp12h9j1faq3vl51d5p64ln22r7zx4pvahss5";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix
similarity index 86%
rename from pkgs/tools/security/diceware/default.nix
rename to pkgs/development/python-modules/diceware/default.nix
index f32d63cfc10..8e35eabfb0d 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/pkgs/development/python-modules/diceware/default.nix
@@ -1,10 +1,10 @@
-{ lib
-, python3Packages
+{ lib, buildPythonPackage, fetchPypi
+, pytestrunner
+, setuptools
+, coverage, pytest
}:
-with python3Packages;
-
-buildPythonApplication rec {
+buildPythonPackage rec {
pname = "diceware";
version = "0.9.6";
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index ffff1829948..1f9c61e4ed4 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -36,7 +36,7 @@ let
bazelTarget = ":install";
fetchAttrs = {
- sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3";
+ sha256 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci";
};
bazelFlags = [
diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix
index 5803d8ea2c7..dc1e795054f 100644
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@@ -8,12 +8,16 @@
, wtf-peewee
, sqlalchemy
, sqlalchemy-citext
+, sqlalchemy-utils
, flask-mongoengine
, flask_sqlalchemy
, flask-babelex
, shapely
, geoalchemy2
, psycopg2
+, arrow
+, colour
+, email_validator
, flask
, wtforms
, isPy27
@@ -22,12 +26,12 @@
buildPythonPackage rec {
pname = "flask-admin";
- version = "1.5.3";
+ version = "1.5.6";
src = fetchPypi {
pname = "Flask-Admin";
inherit version;
- sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422";
+ sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8";
};
checkInputs = [
@@ -38,12 +42,16 @@ buildPythonPackage rec {
wtf-peewee
sqlalchemy
sqlalchemy-citext
+ sqlalchemy-utils
flask-mongoengine
flask_sqlalchemy
flask-babelex
shapely
geoalchemy2
psycopg2
+ arrow
+ colour
+ email_validator
];
propagatedBuildInputs = [
@@ -52,13 +60,14 @@ buildPythonPackage rec {
] ++ lib.optionals isPy27 [ enum34 ];
checkPhase = ''
- # disable tests that require mongodb, postresql
+ # disable tests that require mongodb, postresql, or network
nosetests \
-e "mongoengine" \
-e "pymongo" \
-e "test_form_upload" \
-e "test_postgres" \
-e "geoa" \
+ -e "test_ajax_fk" \
flask_admin/tests
'';
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index 17c63f326ea..d5b48fd0428 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -1,37 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k
-, nose, mock, blinker
+, nose, mock, blinker, pytest
, flask, six, pytz, aniso8601, pycrypto
}:
buildPythonPackage rec {
pname = "Flask-RESTful";
- version = "0.3.6";
+ version = "0.3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap";
+ sha256 = "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch";
- sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5";
- })
- (fetchpatch {
- url = "https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch";
- sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl";
- })
- ];
-
- postPatch = lib.optionalString isPy3k ''
- # TypeError: Only byte strings can be passed to C code
- rm tests/test_crypto.py tests/test_paging.py
- '';
-
- checkInputs = [ nose mock blinker ];
-
propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
+ checkInputs = [ pytest nose mock blinker ];
+
+ # test_reqparse.py: werkzeug move Multidict location (only imported in tests)
+ # handle_non_api_error isn't updated for addition encoding argument
+ checkPhase = ''
+ pytest --ignore=tests/test_reqparse.py -k 'not handle_non_api_error'
+ '';
+
meta = with lib; {
homepage = "https://flask-restful.readthedocs.io/";
description = "REST API building blocks for Flask";
diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
index d6912de6fe8..f8001bc2aff 100644
--- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
+++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, isPy3k
, flask
+, werkzeug
}:
buildPythonPackage rec {
@@ -20,8 +21,13 @@ buildPythonPackage rec {
disabled = !isPy3k;
+ postPatch = ''
+ sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py
+ '';
+
propagatedBuildInputs = [
flask
+ werkzeug
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index 892b373f065..ea673dc3346 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -3,6 +3,8 @@
, fetchPypi
, sqlalchemy
, shapely
+, setuptools_scm
+, pytest
}:
buildPythonPackage rec {
@@ -14,8 +16,12 @@ buildPythonPackage rec {
sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9";
};
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ sqlalchemy shapely ];
+ # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = "http://geoalchemy.org/";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index b4de6077529..a6dd3ecb7c8 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -1,30 +1,26 @@
{ lib
, buildPythonPackage
-, fetchPypi
, pythonOlder
-, tox
-, pytest
-, pylint
-, mypy
-, black
+, git
+, fetchFromGitHub
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "git-revise";
- version = "0.5.1";
+ version = "0.6.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "0l3xhg00106p7ysg4gl9dna2zcrax58mzmm0ajjaxw58jfn8wsf1";
+ # Missing tests on PyPI
+ src = fetchFromGitHub {
+ owner = "mystor";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "03v791yhips9cxz9hr07rhsgxfhwyqq17rzi7ayjhwvy65s4hzs9";
};
disabled = pythonOlder "3.6";
- checkInputs = [ tox pytest pylint mypy black ];
-
- checkPhase = ''
- tox
- '';
+ checkInputs = [ git pytestCheckHook ];
meta = with lib; {
description = "Efficiently update, split, and rearrange git commits";
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index d4e544ad8d4..b7fbe41f691 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -1,8 +1,9 @@
-{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata, toml }:
+{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }:
buildPythonPackage rec {
pname = "inflect";
version = "4.1.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 5828ada7a61..b04ab3febdb 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
, setuptools_scm, jaraco_collections, importlib-metadata
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
doCheck = false;
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
six
importlib-metadata
@@ -27,4 +27,11 @@ buildPythonPackage rec {
jaraco_itertools
jaraco_collections
];
+
+ meta = with lib; {
+ description = "IRC (Internet Relay Chat) protocol library for Python";
+ homepage = "https://github.com/jaraco/irc";
+ license = licenses.mit;
+ maintainers = [];
+ };
}
diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
deleted file mode 100644
index 43530fcc328..00000000000
--- a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch
-Date: Sun, 10 Mar 2019 13:10:18 +0100
-Subject: [PATCH] Don't run flake8 checks during the build
-
-If the code simply violates their code style, the Nix package shouldn't fail.
----
- pytest.ini | 2 +-
- setup.cfg | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/pytest.ini b/pytest.ini
-index d165e5e..d8e4694 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,6 +1,6 @@
- [pytest]
- norecursedirs=dist build .tox .eggs
--addopts=--doctest-modules --flake8
-+addopts=--doctest-modules
- doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
- filterwarnings=
- ignore:Possible nested set::pycodestyle:113
-diff --git a/setup.cfg b/setup.cfg
-index 9f3517f..c9033ec 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0
- testing =
- pytest >= 3.5, !=3.7.3
- pytest-checkdocs
-- pytest-flake8
- docs =
- sphinx
- jaraco.packaging >= 3.2
---
-2.18.1
-
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index 1932f672b01..7f1d954f68d 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -11,16 +11,18 @@ buildPythonPackage rec {
sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84";
};
- patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
-
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ inflect more-itertools six ];
checkInputs = [ pytest ];
+ # tests no longer available through pypi
+ doCheck = false;
checkPhase = ''
pytest
'';
+ pythonImportsCheck = [ "jaraco.itertools" ];
+
meta = with lib; {
description = "Tools for working with iterables";
homepage = "https://github.com/jaraco/jaraco.itertools";
diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
deleted file mode 100644
index aab9604b9ce..00000000000
--- a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch
-Date: Sun, 10 Mar 2019 16:42:21 +0100
-Subject: [PATCH] Don't run flake8 checks during the build
-
-If the code simply violates their code style, the Nix package shouldn't fail.
----
- pytest.ini | 2 +-
- setup.cfg | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/pytest.ini b/pytest.ini
-index 9b3c1ec..a5189c1 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,6 +1,6 @@
- [pytest]
- norecursedirs=dist build .tox .eggs
--addopts=--doctest-modules --flake8
-+addopts=--doctest-modules
- doctest_optionflags=ALLOW_UNICODE ELLIPSIS
- filterwarnings=
- ignore:Possible nested set::pycodestyle:113
-diff --git a/setup.cfg b/setup.cfg
-index 3e7bbed..5cac7a2 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0
- testing =
- pytest >= 3.5, !=3.7.3
- pytest-checkdocs
-- pytest-flake8
- docs =
- sphinx
- jaraco.packaging >= 3.2
---
-2.18.1
-
diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix
index cf4ae4e435c..3f9fa4d67ca 100644
--- a/pkgs/development/python-modules/jaraco_logging/default.nix
+++ b/pkgs/development/python-modules/jaraco_logging/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
-, tempora, six, pytest
+, tempora, six
}:
buildPythonPackage rec {
@@ -11,15 +11,13 @@ buildPythonPackage rec {
sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e";
};
- patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
-
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora six ];
- checkInputs = [ pytest ];
- checkPhase = ''
- PYTHONPATH=".:$PYTHONPATH" pytest
- '';
+ # test no longer packaged with pypi
+ doCheck = false;
+
+ pythonImportsCheck = [ "jaraco.logging" ];
meta = with lib; {
description = "Support for Python logging facility";
diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix
index 8ff0f391f20..4275732881c 100644
--- a/pkgs/development/python-modules/line_profiler/default.nix
+++ b/pkgs/development/python-modules/line_profiler/default.nix
@@ -6,6 +6,7 @@
, ipython
, python
, scikit-build
+, cmake
}:
buildPythonPackage rec {
@@ -17,9 +18,17 @@ buildPythonPackage rec {
sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141";
};
- nativeBuildInputs = [ cython ];
+ nativeBuildInputs = [
+ cython
+ cmake
+ scikit-build
+ ];
- propagatedBuildInputs = [ ipython scikit-build ];
+ dontUseCmakeConfigure = true;
+
+ propagatedBuildInputs = [
+ ipython
+ ];
disabled = isPyPy;
@@ -27,8 +36,12 @@ buildPythonPackage rec {
rm -f _line_profiler.c
'';
+ checkInputs = [
+ ipython
+ ];
+
checkPhase = ''
- ${python.interpreter} -m unittest discover -s tests
+ PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s .
'';
meta = {
@@ -36,6 +49,5 @@ buildPythonPackage rec {
homepage = "https://github.com/rkern/line_profiler";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
new file mode 100644
index 00000000000..c7a4fc3f423
--- /dev/null
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, python
+, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog
+, sdnotify
+, systemd
+}:
+
+buildPythonPackage rec {
+ pname = "maestral";
+ version = "1.1.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "SamSchott";
+ repo = "maestral";
+ rev = "v${version}";
+ sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg";
+ };
+
+ propagatedBuildInputs = [
+ blinker
+ bugsnag
+ click
+ dropbox
+ fasteners
+ keyring
+ keyrings-alt
+ pathspec
+ Pyro5
+ requests
+ u-msgpack-python
+ watchdog
+ ] ++ stdenv.lib.optionals stdenv.isLinux [
+ sdnotify
+ systemd
+ ];
+
+ makeWrapperArgs = [
+ # Add the installed directories to the python path so the daemon can find them
+ "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}"
+ "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages"
+ ];
+
+ # no tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Open-source Dropbox client for macOS and Linux";
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.unix;
+ inherit (src.meta) homepage;
+ };
+}
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 362e3415767..01cabdd9b32 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.5.4";
+ version = "0.5.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv";
+ sha256 = "0czymj9k9faky4dyrbxpr8rfrsb28xz9c0p66dcxvchk3m3ac49k";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix
new file mode 100644
index 00000000000..08cfb66408d
--- /dev/null
+++ b/pkgs/development/python-modules/nassl/default.nix
@@ -0,0 +1,120 @@
+{ lib
+, fetchFromGitHub
+, fetchurl
+, buildPythonPackage
+, pkgsStatic
+, openssl
+, invoke
+, pytest
+, tls-parser
+, cacert
+}:
+
+let
+ zlibStatic = pkgsStatic.zlib;
+ nasslOpensslArgs = {
+ static = true;
+ enableSSL2 = true;
+ };
+ nasslOpensslFlagsCommon = [
+ "zlib"
+ "no-zlib-dynamic"
+ "no-shared"
+ "--with-zlib-lib=${zlibStatic.out}/lib"
+ "--with-zlib-include=${zlibStatic.out.dev}/include"
+ "enable-rc5"
+ "enable-md2"
+ "enable-gost"
+ "enable-cast"
+ "enable-idea"
+ "enable-ripemd"
+ "enable-mdc2"
+ "-fPIC"
+ ];
+ opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs (
+ oldAttrs: rec {
+ name = "openssl-${version}";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://www.openssl.org/source/${name}.tar.gz";
+ sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
+ };
+ configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
+ "enable-weak-ssl-ciphers"
+ "enable-tls1_3"
+ "no-async"
+ ];
+ patches = [ ./nix-ssl-cert-file.patch ];
+ buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
+ }
+ );
+ opensslLegacyStatic = (openssl.override nasslOpensslArgs).overrideAttrs (
+ oldAttrs: rec {
+ name = "openssl-${version}";
+ version = "1.0.2e";
+ src = fetchurl {
+ url = "https://www.openssl.org/source/${name}.tar.gz";
+ sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
+ };
+ configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
+ patches = [ ];
+ buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
+ # openssl_1_0_2 needs `withDocs = false`
+ outputs = lib.remove "doc" oldAttrs.outputs;
+ }
+ );
+in
+buildPythonPackage rec {
+ pname = "nassl";
+ version = "3.0.0";
+
+ src = fetchFromGitHub {
+ owner = "nabla-c0d3";
+ repo = pname;
+ rev = version;
+ sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z";
+ };
+
+ postPatch = ''
+ mkdir -p deps/openssl-OpenSSL_1_0_2e/
+ cp ${opensslLegacyStatic.out}/lib/libssl.a \
+ ${opensslLegacyStatic.out}/lib/libcrypto.a \
+ deps/openssl-OpenSSL_1_0_2e/
+ ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
+ ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps
+
+ mkdir -p deps/openssl-OpenSSL_1_1_1/
+ cp ${opensslStatic.out}/lib/libssl.a \
+ ${opensslStatic.out}/lib/libcrypto.a \
+ deps/openssl-OpenSSL_1_1_1/
+ ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
+ ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps
+
+ mkdir -p deps/zlib-1.2.11/
+ cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/
+ '';
+
+ propagatedBuildInputs = [ tls-parser ];
+
+ nativeBuildInputs = [ invoke ];
+
+ buildPhase = ''
+ invoke build.nassl
+ invoke package.wheel
+ '';
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ # Skip online tests
+ pytest -k 'not Online'
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/nabla-c0d3/nassl";
+ description = "Low-level OpenSSL wrapper for Python 3.7+";
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch
new file mode 100644
index 00000000000..893fb3eb664
--- /dev/null
+++ b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
+--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200
++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200
+@@ -97,7 +97,9 @@
+ switch (cmd) {
+ case X509_L_FILE_LOAD:
+ if (argl == X509_FILETYPE_DEFAULT) {
+- file = getenv(X509_get_default_cert_file_env());
++ file = getenv("NIX_SSL_CERT_FILE");
++ if (!file)
++ file = getenv(X509_get_default_cert_file_env());
+ if (file)
+ ok = (X509_load_cert_crl_file(ctx, file,
+ X509_FILETYPE_PEM) != 0);
diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
index e9dce6b2322..f132614d1ca 100644
--- a/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k
, bitcoinlib, GitPython, pysha3, git }:
buildPythonPackage rec {
@@ -15,6 +15,14 @@ buildPythonPackage rec {
sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr";
};
+ patches = [
+ # build against bitcoinlib-0.11
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch";
+ sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg";
+ })
+ ];
+
# Remove a failing test which expects the test source file to reside in the
# project's Git repo
postPatch = ''
diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix
index 38730e7baae..bb3c2c895b3 100644
--- a/pkgs/development/python-modules/pyro5/default.nix
+++ b/pkgs/development/python-modules/pyro5/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
# ignore network related tests, which fail in sandbox
- disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ];
+ disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ];
meta = with lib; {
description = "Distributed object middleware for Python (RPC)";
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index afa48569e2a..8134e8a573a 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -23,11 +23,12 @@ stdenv.mkDerivation rec {
"-DPYTHON_EXECUTABLE=${python.interpreter}"
];
- nativeBuildInputs = [ cmake ninja qt5.qmake shiboken2 python ];
+ nativeBuildInputs = [ cmake ninja qt5.qmake python ];
buildInputs = with qt5; [
qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript
qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg
];
+ propagatedBuildInputs = [ shiboken2 ];
meta = with stdenv.lib; {
description = "LGPL-licensed Python bindings for Qt";
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index 2d78b626092..33fc54241d9 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -1,7 +1,7 @@
{
- lib, fetchPypi, buildPythonPackage, isPy3k,
+ lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder,
# runtime dependencies
- pandas, numpy, requests, inflection, python-dateutil, six, more-itertools,
+ pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata,
# test suite dependencies
nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy,
# additional runtime dependencies are required on Python 2.x
@@ -45,6 +45,8 @@ buildPythonPackage rec {
pyOpenSSL
ndg-httpsclient
pyasn1
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix
new file mode 100644
index 00000000000..78824515a45
--- /dev/null
+++ b/pkgs/development/python-modules/sslyze/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, fetchFromGitHub
+, pytest
+, buildPythonPackage
+, nassl
+, cryptography
+, typing-extensions
+, faker
+}:
+
+buildPythonPackage rec {
+ pname = "sslyze";
+ version = "3.0.7";
+
+ src = fetchFromGitHub {
+ owner = "nabla-c0d3";
+ repo = pname;
+ rev = version;
+ sha256 = "1ahwldsh3xvagin09dy5q73bdw5k4siqy2qqgxwj4wdyd7pjb4p9";
+ };
+
+ patchPhase = ''
+ substituteInPlace setup.py \
+ --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3"
+ '';
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ # Most of the tests are online; hence, applicable tests are listed
+ # explicitly here
+ pytest \
+ tests/test_main.py \
+ tests/test_scanner.py \
+ tests/cli_tests/test_console_output.py \
+ tests/cli_tests/test_json_output.py \
+ tests/cli_tests/test_server_string_parser.py \
+ tests/plugins_tests/test_scan_commands.py \
+ tests/plugins_tests/certificate_info/test_certificate_utils.py \
+ -k "not (TestScanner and test_client_certificate_missing)"
+ '';
+
+ propagatedBuildInputs = [ nassl cryptography typing-extensions faker ];
+
+ meta = with lib; {
+ homepage = "https://github.com/nabla-c0d3/sslyze";
+ description = "Fast and powerful SSL/TLS scanning library";
+ platforms = platforms.linux ++ platforms.darwin;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index d1f40f349f4..9b54953d28c 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools_scm, pytest, freezegun, backports_unittest-mock
+, pytest-black, pytestcov, pytest-flake8
, six, pytz, jaraco_functools }:
buildPythonPackage rec {
@@ -11,15 +12,15 @@ buildPythonPackage rec {
sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8";
};
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six pytz jaraco_functools ];
- checkInputs = [ pytest freezegun backports_unittest-mock ];
+ checkInputs = [ pytest pytest-flake8 pytest-black pytestcov freezegun backports_unittest-mock ];
+ # missing pytest-freezegun package
checkPhase = ''
- substituteInPlace pytest.ini --replace "--flake8" ""
- pytest
+ pytest -k 'not get_nearest_year_for_day'
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 21ce440c630..9466b85a6a4 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -61,7 +61,7 @@ let
bazelTarget = ":pip_pkg";
fetchAttrs = {
- sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i";
+ sha256 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5";
};
buildAttrs = {
diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix
new file mode 100644
index 00000000000..5b6bfe6a0e2
--- /dev/null
+++ b/pkgs/development/python-modules/tls-parser/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, isPy27
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "tls-parser";
+ version = "1.2.2";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "nabla-c0d3";
+ repo = "tls_parser";
+ rev = version;
+ sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/nabla-c0d3/tls_parser";
+ description = "Small library to parse TLS records";
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.mit;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix
index a2d829f85c2..215319e4e65 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/pkgs/development/tools/ameba/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
- sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l";
+ sha256 = "0h7s40xk7qmrc560k6vyx67lvimp74giwj21a43np0gcxq4f9icd";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index 03764549095..d564067cfc2 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
- version = "0.13.3";
+ version = "0.13.4";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = "${version}";
- sha256 = "1zc03frbag0lhxxbrdhip5h61ah16rqfcs314nyx7lfn3jd0gqzd";
+ sha256 = "094gkxdlydaqzmdy6a6az09yph102nd1fzwz6b12hg3vb50fxv7r";
};
nativeBuildInputs = [
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [ openssl ];
- cargoSha256 = "15qf5hb6gm4lm1dcsqqs8nmd43m1qmw2g2zpj3c0abs5fbdz8k3a";
+ cargoSha256 = "0glcc4qmvz25p1zxx1igd37l2pb10i80kj5smafkgbczgn01iwk9";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index f331272a5f3..1d86b80a50b 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9";
+ sha256 = "17vdqs3dpaqc4llmzh4rd8mkm19q192w5gp90jlry3dpwj6b4kdf";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index d615657ebeb..5a8094af48a 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp";
+ sha256 = "04wbimzjxxmm8kh57q11zvyardb6ilyffc4nkdp6mb87p1l8fmww";
};
buildAttrs = {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 77caa232562..85492033e39 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -25,11 +25,11 @@
}:
let
- version = "3.2.0";
+ version = "3.3.0";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24";
+ sha256 = "09p8xv8ni4g4wcyaapxsx8gjc3x3l3c6lxn575c7gm89vrh3k805";
};
# Update with `eval $(nix-build -A bazel.updater)`,
@@ -53,8 +53,8 @@ let
else srcs."java_tools_javac11_linux-v8.0.zip")
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
- srcs."android_tools_pkg-0.16.0.tar.gz"
- srcs."3.1.0.tar.gz"
+ srcs."android_tools_pkg-0.17.0.tar.gz"
+ srcs."bazel-toolchains-3.1.0.tar.gz"
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
index 786a31c9bb3..49269bbde5b 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
@@ -7,6 +7,14 @@
"https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
]
},
+ "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
+ "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
+ ]
+ },
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": {
"name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
"sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
@@ -15,14 +23,6 @@
"https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz"
]
},
- "3.1.0.tar.gz": {
- "name": "3.1.0.tar.gz",
- "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
- "urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
- "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
- ]
- },
"46993efdd33b73649796c5fc5c9efb193ae19d51.zip": {
"name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
"sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88",
@@ -65,14 +65,22 @@
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
- "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
- "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz"
+ "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz"
},
- "android_tools_pkg-0.16.0.tar.gz": {
- "name": "android_tools_pkg-0.16.0.tar.gz",
- "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
+ "android_tools_pkg-0.17.0.tar.gz": {
+ "name": "android_tools_pkg-0.17.0.tar.gz",
+ "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f",
"urls": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz"
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz"
+ ]
+ },
+ "bazel-toolchains-3.1.0.tar.gz": {
+ "name": "bazel-toolchains-3.1.0.tar.gz",
+ "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
+ "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
"bazel_j2objc": {
@@ -114,10 +122,19 @@
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"strip_prefix": "bazel-toolchains-3.1.0",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
]
},
+ "bazel_website": {
+ "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n",
+ "name": "bazel_website",
+ "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4",
+ "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42",
+ "urls": [
+ "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz"
+ ]
+ },
"build_bazel_rules_nodejs": {
"name": "build_bazel_rules_nodejs",
"sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
@@ -126,14 +143,6 @@
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
]
},
- "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": {
- "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
- "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
- "urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
- "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
- ]
- },
"com_google_googletest": {
"name": "com_google_googletest",
"sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
@@ -201,11 +210,11 @@
},
"io_bazel_skydoc": {
"name": "io_bazel_skydoc",
- "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
- "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04",
+ "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
+ "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
- "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
]
},
"java_tools_javac11_darwin-v8.0.zip": {
@@ -337,6 +346,15 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
]
},
+ "openjdk_linux_ppc64le_vanilla": {
+ "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
+ "name": "openjdk_linux_ppc64le_vanilla",
+ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
"openjdk_linux_vanilla": {
"downloaded_file_path": "zulu-linux-vanilla.tar.gz",
"name": "openjdk_linux_vanilla",
@@ -589,6 +607,24 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
]
},
+ "remotejdk11_linux_ppc64le_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_ppc64le_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
"remotejdk11_macos_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk11_macos_for_testing",
diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
index e57dc05bb72..52d40e0f94e 100755
--- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
+++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
@@ -35,6 +35,7 @@ def list_source_repository(**kw): pass
def new_local_repository(**kw): pass
def local_repository(**kw): pass
DOC_VERSIONS = []
+def stardoc_repositories(**kw): pass
def skydoc_repositories(**kw): pass
def rules_sass_dependencies(**kw): pass
def node_repositories(**kw): pass
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 65f47c837b8..4af8a7e9023 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.2.0";
+ version = "0.2.1";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
- sha256 = "06kag5dwkq4zsh1b52b74g3slsxlwwiap2w3709qjhrgda8w2zn3";
+ sha256 = "0v9ynbpv7q4lgi1q4qqvfn24z09z2l9lwqjldaffb4i04vyymdfx";
};
- vendorSha256 = "1lhjd98n9j1cq36b5lhscb7k32qmyqg7zs6zc8yab494bm8sz89g";
+ vendorSha256 = "1s6mm3lsrs5vgvw4i4a3wxksd9wanbkjlahyz6hbnm3451ra0nyq";
subPackages = [ "cmd/cue" ];
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index f8a8ee70e9d..7fcdbd1a6ad 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,30 +1,30 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
-, qtbase, qttools, qscintilla, sqlite }:
+, qtbase, qttools, sqlite }:
mkDerivation rec {
pname = "sqlitebrowser";
- version = "3.11.2";
+ version = "3.12.0";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx";
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "1arv4rzl8s1vjjqzz35l2b1rfzr2b8b23v97fdw1kdxpwvs63l99";
};
- buildInputs = [ antlr qtbase qscintilla sqlite ];
+ # We should be using qscintilla from nixpkgs instead of the vendored version,
+ # but qscintilla is currently in a bit of a mess as some consumers expect a
+ # -qt4 or -qt5 prefix while others do not.
+ # We *really* should get that cleaned up.
+ buildInputs = [ antlr qtbase sqlite ];
nativeBuildInputs = [ cmake qttools ];
- NIX_LDFLAGS = "-lQt5PrintSupport";
-
- enableParallelBuilding = true;
-
meta = with lib; {
description = "DB Browser for SQLite";
homepage = "https://sqlitebrowser.org/";
license = licenses.gpl3;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index 1e7d1023edf..f05c788dabe 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "jp";
- version = "0.1.2";
+ version = "0.1.3";
rev = version;
goPackagePath = "github.com/jmespath/jp";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "jmespath";
repo = "jp";
- sha256 = "1i0jl0c062crigkxqx8zpyqliz8j4d37y95cna33jl777kx42r6h";
+ sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi";
};
meta = with stdenv.lib; {
description = "A command line interface to the JMESPath expression language for JSON";
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 5fa2b12e9c3..42ee4041f20 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash
-, installShellFiles }:
+{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.5.11";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
- sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv";
+ sha256 = "1sl235wr4fdsw0f0x7jynv6ljhvgis4d87xzpvjzajhdaappdp8d";
};
- cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz";
+ cargoSha256 = "0k3aqwvdm95403s279gkksklnikgyjpf5qvngsvsrm5xqda438jk";
nativeBuildInputs = [ installShellFiles ];
@@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh --name _just completions/just.zsh
'';
- checkInputs = [ coreutils bash dash ];
+ checkInputs = [ coreutils bash ];
preCheck = ''
# USER must not be empty
diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
index e26b31cbaf0..91df15a9bb6 100644
--- a/pkgs/development/tools/misc/travis/Gemfile.lock
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -1,28 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.4.0)
- backports (3.16.1)
- coderay (1.1.2)
+ activesupport (5.2.4.3)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ coderay (1.1.3)
+ concurrent-ruby (1.1.6)
ethon (0.12.0)
ffi (>= 1.3.0)
- faraday (0.17.3)
+ faraday (1.0.1)
multipart-post (>= 1.2, < 3)
- faraday_middleware (0.14.0)
- faraday (>= 0.7.4, < 1.0)
- ffi (1.12.2)
- gh (0.15.1)
- addressable (~> 2.4.0)
- backports
- faraday (~> 0.8)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
+ ffi (1.13.1)
+ gh (0.17.0)
+ activesupport (~> 5.0)
+ addressable (~> 2.4)
+ faraday (~> 1.0)
+ faraday_middleware (~> 1.0)
multi_json (~> 1.0)
net-http-persistent (~> 2.9)
net-http-pipeline
- highline (1.7.10)
+ highline (2.0.3)
+ i18n (1.8.3)
+ concurrent-ruby (~> 1.0)
json (2.3.0)
launchy (2.4.3)
addressable (~> 2.3)
method_source (0.9.2)
+ minitest (5.14.1)
multi_json (1.14.1)
multipart-post (2.1.1)
net-http-persistent (2.9.4)
@@ -30,20 +40,24 @@ GEM
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
+ public_suffix (4.0.5)
pusher-client (0.6.2)
json
websocket (~> 1.0)
- travis (1.8.11)
- backports
- faraday (~> 0.9)
- faraday_middleware (~> 0.9, >= 0.9.1)
+ thread_safe (0.3.6)
+ travis (1.9.1)
+ faraday (~> 1.0)
+ faraday_middleware (~> 1.0)
gh (~> 0.13)
- highline (~> 1.6)
- launchy (~> 2.1)
+ highline (~> 2.0)
+ json (~> 2.3)
+ launchy (~> 2.1, < 2.5.0)
pusher-client (~> 0.4)
typhoeus (~> 0.6, >= 0.6.8)
typhoeus (0.8.0)
ethon (>= 0.8.0)
+ tzinfo (1.2.7)
+ thread_safe (~> 0.1)
websocket (1.2.8)
PLATFORMS
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
index da2f5e8e7ac..e10475a916b 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -1,31 +1,45 @@
{
- addressable = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
- type = "gem";
- };
- version = "2.4.0";
- };
- backports = {
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5";
+ sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6";
type = "gem";
};
- version = "3.16.1";
+ version = "5.2.4.3";
+ };
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
};
coderay = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+ sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
type = "gem";
};
- version = "1.1.2";
+ version = "1.1.3";
+ };
+ concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ type = "gem";
+ };
+ version = "1.1.6";
};
ethon = {
dependencies = ["ffi"];
@@ -42,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2";
+ sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
type = "gem";
};
- version = "0.17.3";
+ version = "1.0.1";
};
faraday_middleware = {
dependencies = ["faraday"];
@@ -53,37 +67,52 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc";
+ sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
type = "gem";
};
- version = "0.14.0";
+ version = "1.0.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+ sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
type = "gem";
};
- version = "1.12.2";
+ version = "1.13.1";
};
gh = {
- dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"];
+ dependencies = ["activesupport" "addressable" "faraday" "faraday_middleware" "multi_json" "net-http-persistent" "net-http-pipeline"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg";
+ sha256 = "1nj2dm2pahfa4d39y8csvjv5l3hpsm6yjq2y96vj2bqgg0qs26bj";
type = "gem";
};
- version = "0.15.1";
+ version = "0.17.0";
};
highline = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
- version = "1.7.10";
+ version = "2.0.3";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
+ type = "gem";
+ };
+ version = "1.8.3";
};
json = {
groups = ["default"];
@@ -114,6 +143,16 @@
};
version = "0.9.2";
};
+ minitest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+ type = "gem";
+ };
+ version = "5.14.1";
+ };
multi_json = {
groups = ["default"];
platforms = [];
@@ -159,6 +198,16 @@
};
version = "0.11.3";
};
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+ type = "gem";
+ };
+ version = "4.0.5";
+ };
pusher-client = {
dependencies = ["json" "websocket"];
source = {
@@ -168,16 +217,26 @@
};
version = "0.6.2";
};
- travis = {
- dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"];
+ thread_safe = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18zbi46as4d2wn83safawciyny0g2sk7yz5fvjvqmfk4ywpfrwrr";
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
- version = "1.8.11";
+ version = "0.3.6";
+ };
+ travis = {
+ dependencies = ["faraday" "faraday_middleware" "gh" "highline" "json" "launchy" "pusher-client" "typhoeus"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yizj5nqvyrfbyiv1kfwc33dylhsmk5l007z06djj152v04z63i3";
+ type = "gem";
+ };
+ version = "1.9.1";
};
typhoeus = {
dependencies = ["ethon"];
@@ -188,6 +247,17 @@
};
version = "0.8.0";
};
+ tzinfo = {
+ dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
websocket = {
source = {
remotes = ["https://rubygems.org"];
diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
index d46ad59109e..13649b387a3 100644
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@@ -1,30 +1,24 @@
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
-index 4b432785..fa45e87e 100644
+index 3beddf54..0f859b8d 100644
--- a/src/dist/component/package.rs
+++ b/src/dist/component/package.rs
-@@ -109,10 +109,11 @@ impl Package for DirectoryPackage {
- match &*part.0 {
- "file" => {
- if self.copy {
-- builder.copy_file(path.clone(), &src_path)?
-+ builder.copy_file(path.clone(), &src_path)?;
+@@ -113,6 +113,7 @@ impl Package for DirectoryPackage {
} else {
-- builder.move_file(path.clone(), &src_path)?
-+ builder.move_file(path.clone(), &src_path)?;
+ builder.move_file(path.clone(), &src_path)?
}
+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
}
"dir" => {
if self.copy {
-@@ -135,6 +136,22 @@ impl Package for DirectoryPackage {
+@@ -135,6 +136,29 @@ impl Package for DirectoryPackage {
}
}
+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
-+ let is_bin = if let Some(p) = src_path.parent() {
-+ p.ends_with("bin")
++ let (is_bin, is_lib) = if let Some(p) = src_path.parent() {
++ (p.ends_with("bin"), p.ends_with("lib"))
+ } else {
-+ false
++ (false, false)
+ };
+
+ if is_bin {
@@ -34,6 +28,13 @@ index 4b432785..fa45e87e 100644
+ .arg(dest_path)
+ .output();
+ }
++ else if is_lib {
++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
++ .arg("--set-rpath")
++ .arg("@libPath@")
++ .arg(dest_path)
++ .output();
++ }
+}
+
#[derive(Debug)]
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 959eb6875ce..688159445d5 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, runCommand, patchelf
, fetchFromGitHub, rustPlatform
-, pkgconfig, curl, Security, CoreServices }:
+, pkgconfig, curl, zlib, Security, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "rustup";
@@ -18,18 +18,25 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- curl
+ curl zlib
] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
cargoBuildFlags = [ "--features no-self-update" ];
patches = lib.optionals stdenv.isLinux [
- (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } ''
+ (let
+ libPath = lib.makeLibraryPath [
+ zlib # libz.so.1
+ ];
+ in
+ (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } ''
export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
--subst-var patchelf \
- --subst-var dynamicLinker
+ --subst-var dynamicLinker \
+ --subst-var libPath
'')
+ )
];
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix
new file mode 100644
index 00000000000..83a8f927694
--- /dev/null
+++ b/pkgs/games/openttd/jgrpp.nix
@@ -0,0 +1,13 @@
+{ fetchFromGitHub, openttd, ... }:
+
+openttd.overrideAttrs (oldAttrs: rec {
+ pname = "openttd-jgrpp";
+ version = "0.34.4";
+
+ src = fetchFromGitHub rec {
+ owner = "JGRennison";
+ repo = "OpenTTD-patches";
+ rev = "jgrpp-${version}";
+ sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v";
+ };
+})
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 2eb45ded7e2..ce375392041 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
- version = "1.14.12";
+ version = "1.14.13";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
- sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8";
+ sha256 = "1ka07h4sgmbc24qbaz0pbryx0yk339l4jzg32hy01qdvl2n40w3h";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9e2120d9da3..5cd7df4597f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4021,6 +4021,18 @@ let
meta.homepage = "https://github.com/bling/vim-bufferline/";
};
+ vim-bsv = buildVimPluginFrom2Nix {
+ pname = "vim-bsv";
+ version = "2019-07-11";
+ src = fetchFromGitHub {
+ owner = "mtikekar";
+ repo = "vim-bsv";
+ rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a";
+ sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc";
+ };
+ meta.homepage = "https://github.com/mtikekar/vim-bsv/";
+ };
+
vim-bufkill = buildVimPluginFrom2Nix {
pname = "vim-bufkill";
version = "2020-04-29";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 11ffbfed9ad..d3893934900 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -554,6 +554,10 @@ self: super: {
dependencies = with super; [ vim-maktaba ];
});
+ vim-beancount = super.vim-beancount.overrideAttrs(old: {
+ passthru.python3Dependencies = ps: with ps; [ beancount ];
+ });
+
vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
dependencies = with super; [ vim-maktaba ];
});
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9bd1657e4bd..7b34ff4bd8b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -302,6 +302,7 @@ mopp/sky-color-clock.vim
morhetz/gruvbox
motus/pig.vim
mpickering/hlint-refactor-vim
+mtikekar/vim-bsv
nanotech/jellybeans.vim
natebosch/vim-lsc
nathanaelkane/vim-indent-guides
diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix
new file mode 100644
index 00000000000..b79f8af6f8e
--- /dev/null
+++ b/pkgs/os-specific/linux/gobi_loader/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gobi_loader";
+ version = "0.7";
+
+ src = fetchurl {
+ url = "https://www.codon.org.uk/~mjg59/gobi_loader/download/${pname}-${version}.tar.gz";
+ sha256 = "0jkmpqkiddpxrzl2s9s3kh64ha48m00nn53f82m1rphw8maw5gbq";
+ };
+
+ postPatch = ''
+ substituteInPlace 60-gobi.rules --replace "gobi_loader" "${placeholder "out"}/lib/udev/gobi_loader"
+ substituteInPlace 60-gobi.rules --replace "/lib/firmware" "/run/current-system/firmware"
+ '';
+
+ makeFlags = "prefix=${placeholder "out"}";
+
+ meta = with stdenv.lib; {
+ description = "Firmware loader for Qualcomm Gobi USB chipsets";
+ homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/";
+ license = with licenses; [ gpl2 ];
+ maintainers = [ maintainers."0x4A6F" ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 9e8de46edba..abf7b0dac45 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
- version = "4.0.5";
+ version = "4.0.9";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
rev = "v${version}";
- sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3";
+ sha256 = "0zhdpk1sbsv1iyr9rvj94wk853684avz3zzn4cv2k4254d7n25m7";
};
}
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 654615ebe50..9fbe914f266 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,22 +1,22 @@
{
"4.14": {
- "name": "linux-hardened-4.14.184.a.patch",
- "sha256": "1g12kz6ikdwp6b7000pfy3myga90mvxyl04b9267fk88jwih6yhk",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.184.a/linux-hardened-4.14.184.a.patch"
+ "name": "linux-hardened-4.14.185.a.patch",
+ "sha256": "0kj18z2mbffnc0zksg7bfyy3hljiga0gzk0s3axvbxlp41vpvwp3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.185.a/linux-hardened-4.14.185.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.128.a.patch",
- "sha256": "19ayzx9rf4j31ypavxwamd290lm95wmi7v165avxslahnx6pdsxs",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.128.a/linux-hardened-4.19.128.a.patch"
+ "name": "linux-hardened-4.19.129.a.patch",
+ "sha256": "0fyz4m2ih8biadziiqbyq4ddx8asn65z94wwrhi7krjqxlbdzgvs",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.129.a/linux-hardened-4.19.129.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.46.a.patch",
- "sha256": "0f2d53na7g6dhiba2ym09lm4fp3hwm6kw6mpm5jk46jmb6j7iwk5",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.46.a/linux-hardened-5.4.46.a.patch"
+ "name": "linux-hardened-5.4.48.a.patch",
+ "sha256": "0vcy64gl88l12rqv0z3g8858zdr82a68sfalaf768j4z537bpany",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.48.a/linux-hardened-5.4.48.a.patch"
},
"5.6": {
- "name": "linux-hardened-5.6.18.a.patch",
- "sha256": "0idvgjg7kji4w3341acfqywi0qqn3pvxcmiz70cd7inhlqaqrw63",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.18.a/linux-hardened-5.6.18.a.patch"
+ "name": "linux-hardened-5.6.19.a.patch",
+ "sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 7ee05ed47de..62dac23d72e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.184";
+ version = "4.14.185";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g";
+ sha256 = "1iixxwidp53s2i2br58wbx5s69f2jcllb116z73pv7fmd06b2czk";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 92281ffdd3e..d33038fe567 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.128";
+ version = "4.19.129";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9";
+ sha256 = "0p0apfviv699mda5zmqphymfybcm932s5yffhvrpqvy2fpas0yx8";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index fe040623316..59c86a5e141 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.227";
+ version = "4.4.228";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40";
+ sha256 = "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 5be2d7ac9bd..9afd8686c19 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.227";
+ version = "4.9.228";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q";
+ sha256 = "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index a2fbbbe3734..006f469aa98 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.47";
+ version = "5.4.48";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp";
+ sha256 = "0lqxryxn0bfly337ddhl7m7qdwblxg8i1fsl8v9i9h84rnpxs85z";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix
index c299cc09872..2f0223b59d0 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.7.4";
+ version = "5.7.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w";
+ sha256 = "008bpcvcdbwy3w829zc0s6ighn820nr51y24l6df5qfvah1zjdvc";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix
new file mode 100644
index 00000000000..91da7e179b4
--- /dev/null
+++ b/pkgs/servers/code-server/default.nix
@@ -0,0 +1,187 @@
+{ stdenv, fetchFromGitHub, makeWrapper, runCommand
+, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2
+, nodejs-12_x, libsecret, xorg, ripgrep, nettools }:
+
+let
+ system = stdenv.hostPlatform.system;
+
+ nodejs = nodejs-12_x;
+ python = python2;
+ yarn' = yarn.override { inherit nodejs; };
+ defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
+
+in stdenv.mkDerivation rec {
+ pname = "code-server";
+ version = "3.4.1";
+ commit = "d3773c11f147bdd7a4f5acfefdee23c26f069e76";
+
+ src = fetchFromGitHub {
+ owner = "cdr";
+ repo = "code-server";
+ rev = version;
+ sha256 = "PfDD0waloppGZ09zCQ9ggBeVL/Dhfv6QmEs/fs7QLtA=";
+ fetchSubmodules = true;
+ };
+
+ yarnCache = stdenv.mkDerivation {
+ name = "${pname}-${version}-${system}-yarn-cache";
+ inherit src;
+ phases = ["unpackPhase" "buildPhase"];
+ nativeBuildInputs = [ yarn' git ];
+ buildPhase = ''
+ export HOME=$PWD
+
+ patchShebangs ./ci
+
+ # apply code-server patches as code-server has patched vscode yarn.lock
+ yarn vscode:patch
+
+ yarn config set yarn-offline-mirror $out
+ find "$PWD" -name "yarn.lock" -printf "%h\n" | \
+ xargs -I {} yarn --cwd {} \
+ --frozen-lockfile --ignore-scripts --ignore-platform \
+ --ignore-engines --no-progress --non-interactive
+ '';
+ outputHashMode = "recursive";
+ outputHashAlgo = "sha256";
+
+ # to get hash values use nix-build -A code-server.yarnPrefetchCache
+ outputHash = {
+ x86_64-linux = "Zze2hEm2Np+SyQ0KXy5CZr5wilZbHBYXNYcRJBUUkQo=";
+ aarch64-linux = "LiIvGuBismWSL2yV2DuKUWDjIzuIQU/VVxtiD4xJ+6Q=";
+ }.${system} or (throw "Unsupported system ${system}");
+ };
+
+ # Extract the Node.js source code which is used to compile packages with
+ # native bindings
+ nodeSources = runCommand "node-sources" {} ''
+ tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+ mv node-* $out
+ '';
+
+ nativeBuildInputs = [
+ nodejs yarn' python pkgconfig zip makeWrapper git rsync jq moreutils
+ ];
+ buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ];
+
+ patchPhase = ''
+ export HOME=$PWD
+
+ patchShebangs ./ci
+
+ # apply code-server vscode patches
+ yarn vscode:patch
+
+ # allow offline install for vscode
+ substituteInPlace lib/vscode/build/npm/postinstall.js \
+ --replace '--ignore-optional' '--offline'
+
+ # fix path to ifconfig, so vscode can get mac address
+ substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \
+ --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'
+
+ # disable automatic updates
+ sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \
+ lib/vscode/src/vs/platform/update/common/update.config.contribution.ts
+
+ # inject git commit
+ substituteInPlace ci/build/build-release.sh \
+ --replace '$(git rev-parse HEAD)' "$commit"
+
+ # remove all built-in extensions, as these are 3rd party extensions that
+ # gets downloaded from vscode marketplace
+ jq --slurp '.[0] * .[1]' "lib/vscode/product.json" <(
+ cat << EOF
+ {
+ "builtInExtensions": []
+ }
+ EOF
+ ) | sponge lib/vscode/product.json
+ '';
+
+ configurePhase = ''
+ # set default yarn opts
+ ${stdenv.lib.concatMapStrings (option: ''
+ yarn --offline config set ${option}
+ '') defaultYarnOpts}
+
+ # set offline mirror to yarn cache we created in previous steps
+ yarn --offline config set yarn-offline-mirror "${yarnCache}"
+
+ # set nodedir, so we can build binaries later
+ npm config set nodedir "${nodeSources}"
+
+ # skip browser downloads for playwright
+ export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true"
+ '';
+
+ buildPhase = ''
+ # install code-server dependencies
+ yarn --offline
+
+ # install vscode dependencies without running script for all vscode packages
+ # that require patching for postinstall scripts to succeed
+ for d in lib/vscode lib/vscode/build; do
+ yarn --offline --cwd $d --offline --ignore-scripts
+ done
+
+ # put ripgrep binary into bin, so postinstall does not try to download it
+ find -name vscode-ripgrep -type d \
+ -execdir mkdir -p {}/bin \; \
+ -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
+
+ # patch shebangs of everything, also cached files, as otherwise postinstall
+ # will not be able to find /usr/bin/env, as it does not exists in sandbox
+ patchShebangs .
+
+ # rebuild binaries, we use npm here, as yarn does not provider alternative
+ # that would not atempt to try to reinstall everything and break out
+ # patching attempts
+ npm rebuild --prefix lib/vscode --update-binary
+
+ # run postinstall scripts, which eventually do yarn install on all
+ # additional requirements
+ yarn --cwd lib/vscode postinstall --frozen-lockfile --offline
+
+ # build code-server
+ yarn build
+
+ # build vscode
+ yarn build:vscode
+
+ # create release
+ yarn release
+ '';
+
+ installPhase = ''
+ mkdir -p $out/libexec/code-server $out/bin
+
+ # copy release to libexec path
+ cp -R -T release "$out/libexec/code-server"
+
+ # install only production dependencies
+ yarn --offline --cwd "$out/libexec/code-server" --production
+
+ # create wrapper
+ makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \
+ --add-flags "$out/libexec/code-server/out/node/entry.js"
+ '';
+
+ passthru = {
+ prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: {
+ outputHash = stdenv.lib.fakeSha256;
+ });
+ };
+
+ meta = with stdenv.lib; {
+ description = "Run VS Code on a remote server.";
+ longDescription = ''
+ code-server is VS Code running on a remote server, accessible through the
+ browser.
+ '';
+ homepage = "https://github.com/cdr/code-server";
+ license = licenses.mit;
+ maintainers = with maintainers; [ offline ];
+ platforms = ["x86_64-linux"];
+ };
+}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 366415dd9e2..0d9a3b25665 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -27,6 +27,11 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
+ # We have 3.x in nixpkgs which is incompatible with home-assistant atm:
+ # https://github.com/home-assistant/core/blob/dev/requirements_all.txt
+ (mkOverride "pyowm" "2.10.0"
+ "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g")
+
# required by aioesphomeapi
(self: super: {
protobuf = super.protobuf.override {
@@ -132,6 +137,6 @@ in with py.pkgs; buildPythonApplication rec {
homepage = "https://home-assistant.io/";
description = "Open-source home automation platform running on Python 3";
license = licenses.asl20;
- maintainers = with maintainers; [ dotlambda globin mic92 ];
+ maintainers = with maintainers; [ dotlambda globin mic92 hexa ];
};
}
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index 769a8605f03..dffe48db58a 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -1,8 +1,8 @@
-{ buildGoPackage, fetchFromGitHub, stdenv }:
+{ buildGoPackage, fetchFromGitHub, stdenv, nixosTests }:
buildGoPackage rec {
pname = "nginx-sso";
- version = "0.24.1";
+ version = "0.25.0";
rev = "v${version}";
goPackagePath = "github.com/Luzifer/nginx-sso";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "Luzifer";
repo = "nginx-sso";
- sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx";
+ sha256 = "0z5h92rpr1rcfk11ggsb9w4ipg93fcb9byll7vl4c0mfcqkpm2dr";
};
postInstall = ''
@@ -19,6 +19,10 @@ buildGoPackage rec {
cp -R $src/frontend $out/share
'';
+ passthru.tests = {
+ inherit (nixosTests) nginx-sso;
+ };
+
meta = with stdenv.lib; {
description = "SSO authentication provider for the auth_request nginx module";
homepage = "https://github.com/Luzifer/nginx-sso";
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index 0a6d1a8cf61..e824298c488 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgbouncer";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchurl {
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
- sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c";
+ sha256 = "1rzy06hqzhnijm32vah9icgrx95pmf9iglvyzwv7wmcg2h83vhd0";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index bcfa8a41021..730e5c41bbf 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub, fetchpatch }:
with python3Packages;
@@ -14,6 +14,11 @@ buildPythonApplication rec {
sha256 = "0hfa4nmis98yvghxw866rzjpmhb2ln8l6l8g9yx4m79b2lk76xcs";
};
+ patches = [(fetchpatch {
+ url = "https://github.com/asciimoo/searx/commit/b8b13372c8fd3bfe978a1c724ab98b05348df054.patch";
+ sha256 = "1zc3dx8pgqfg0bj48ihckjk9xrrm33jlnmj8k02g17gfcmj7566a";
+ })];
+
postPatch = ''
substituteInPlace requirements.txt \
--replace 'certifi==2019.3.9' 'certifi' \
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 37374900a4e..e04aac62294 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-06-18";
+ version = "2020-06-23";
pname = "oh-my-zsh";
- rev = "5ffc0d036c587741fd25092e7809dad2b00b3677";
+ rev = "cea89f54391c810198a7ace05f1063dd7e596bb7";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "04a9zg3l824wywk0qcm0pc4n4522cqljyix7kh3frc4psqnhh8qr";
+ sha256 = "091ws4q8rgd9gzim9x8v7rgx99lw1d8kym4r1r2jy7fdxfxh6z5k";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix
index de967578d5c..ac5bf918634 100644
--- a/pkgs/tools/admin/lexicon/default.nix
+++ b/pkgs/tools/admin/lexicon/default.nix
@@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "lexicon";
- version = "3.3.22";
+ version = "3.3.26";
propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ];
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "AnalogJ";
repo = pname;
rev = "v${version}";
- sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a";
+ sha256 = "0k41l5n80hsfr0dkijf4hhkhz6iiwja4aj9q2jdiqsg9fjrmhfrv";
};
meta = with lib; {
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index a4d201fd4c4..4657c64d330 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,8 +1,8 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
- versionMajor = "6.10";
- versionMinor = "12";
+ versionMajor = "6.11";
+ versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
@@ -17,7 +17,7 @@ in
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
];
- sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01";
+ sha256 = "1b6r9bwkr8mhaljma19ikxpkmlx8iy5r1vf5hlv27bja2zz1r8xr";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
@@ -25,7 +25,7 @@ in
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
];
- sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg";
+ sha256 = "0dl138ry9n1qh651zh0zvp88qhgxrs2kvvnq329jw0py5v70b9pm";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
index 64a711606f8..81e16ad005b 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -1,14 +1,14 @@
{ stdenv, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
- version = "2.1.16";
+ version = "2.1.19";
name = "grab-site-${version}";
src = fetchFromGitHub {
rev = version;
owner = "ArchiveTeam";
repo = "grab-site";
- sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z";
+ sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
index 5aeff6baaa9..2d66dfcee9b 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bashmount";
- version = "3.2.0";
+ version = "4.2.5";
src = fetchFromGitHub {
owner = "jamielinux";
repo = "bashmount";
rev = version;
- sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644";
+ sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0";
};
installPhase = ''
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 610c1306ecf..b167a73466d 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
- version = "2.9.0";
+ version = "2.9.1";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "1df4x1dadf5llf8r0845vr2bv4pin2079an3gk69v697kdgnjcv2";
+ sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index 445dfd6f085..930f1f59a8a 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
- version = "4.10";
+ version = "4.11";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
- sha256 = "1mj2hrwm8zr3814yig1f78hzflgih93hmy3dsyx6k0fdcfjkjvmx";
+ sha256 = "0lbizfnf3qwsiz2ggia6ff7sjjj8gwhys8bm6wixdc4n0qlycp5v";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index bbde732aadf..a43101f607d 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "progress";
- version = "0.14";
+ version = "0.15";
src = fetchFromGitHub {
owner = "Xfennec";
repo = "progress";
rev = "v${version}";
- sha256 = "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl";
+ sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm";
};
nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 21e464c6d29..ca146bcf0fc 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "4.7.0";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m";
+ sha256 = "1rskk3cb253xbdn42ccm5ks39xac4q1hgz67nfi1hpwnavpx5g6p";
};
- cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm";
+ cargoSha256 = "0d00r52qhahdx1yylpri7cm85csvy0bwzspwgwqwgilxcfnf5a16";
buildInputs = lib.optional stdenv.isDarwin Foundation;
diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix
deleted file mode 100644
index 51c97e6cb7e..00000000000
--- a/pkgs/tools/networking/connman/connmanui/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }:
-
-stdenv.mkDerivation rec {
- pname = "connmanui";
- rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
- version = "22062015-${rev}";
-
- src = fetchgit {
- inherit rev;
- url = "git://github.com/tbursztyka/connman-ui.git";
- sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ];
-
- preConfigure = ''
- rm m4/intltool.m4
- ln -s ${intltool}/share/aclocal/intltool.m4 m4/
- set -e
- ./autogen.sh
- sed -i "s/\/usr\/bin\/file/file/g" ./configure
- '';
-
- configureScript = "./configure";
-
- meta = {
- description = "A full-featured GTK based trayicon UI for ConnMan";
- homepage = "https://github.com/tbursztyka/connman-ui";
- maintainers = [ stdenv.lib.maintainers.matejc ];
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index f39b061c34d..f4fb4fe9607 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "httplab";
- version = "0.3.0";
+ version = "0.4.0";
rev = "v${version}";
goPackagePath = "github.com/gchaincl/httplab";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "gchaincl";
repo = "httplab";
inherit rev;
- sha256 = "1q9rp43z59nryfm79gci5a1gmqw552rqd4cki81rymbj3f6xvrf9";
+ sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 363a7cb0498..a7eca679780 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -13,7 +13,7 @@ common =
, bash, coreutils, gzip, gnutar
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
- , jq, libarchive, rustc, cargo
+ , jq, libarchive
# Used by tests
, gmock
, busybox-sandbox-shell
@@ -23,7 +23,7 @@ common =
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? false
- , name, suffix ? "", src, crates ? null
+ , name, suffix ? "", src
}:
let
@@ -49,7 +49,7 @@ common =
brotli boost editline
]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
- ++ lib.optionals is24 [ libarchive rustc cargo ]
+ ++ lib.optionals is24 [ libarchive ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {
@@ -88,11 +88,6 @@ common =
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''}
'' +
- # Unpack the Rust crates.
- lib.optionalString is24 ''
- tar xvf ${crates} -C nix-rust/
- mv nix-rust/nix-vendored-crates* nix-rust/vendor
- '' +
# For Nix-2.3, patch around an issue where the Nix configure step pulls in the
# build system's bash and other utilities when cross-compiling
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) ''
@@ -200,18 +195,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre7534_b92f58f6";
+ suffix = "pre7805_984e5213";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c";
- sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg";
- };
-
- crates = fetchurl {
- url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz";
- sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc";
+ rev = "984e521392b3f41f7cdab203e5c00f3e00e27a28";
+ sha256 = "1dch48018dwzx9cysnfxrdpszav87s0d635zqw810mgmqpm25fw8";
};
inherit storeDir stateDir confDir boehmgc;
@@ -219,18 +209,13 @@ in rec {
nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20200521_00b562c";
+ suffix = "pre20200622_334e26b";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "00b562c87ec4c3bbe514f5dc1f4d1c41f66f66bf";
- sha256 = "0s8is2czpkcj1x1kcjqgbnsbbl03w3fwjjiclsd44zh1ij3wb90s";
- };
-
- crates = fetchurl {
- url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz";
- sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl";
+ rev = "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221";
+ sha256 = "14a2yyn1ygymlci6hl5d308fs3p3m0mgcfs5dc8dn0s3lg5qvbmp";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 9b58aa97dd5..4f286badebf 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2
-, libmspack, systemd
+, libmspack, systemd, Foundation
}:
stdenv.mkDerivation rec {
@@ -20,13 +20,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack
- systemd
- ];
+ ] ++ stdenv.lib.optional stdenv.isLinux systemd
+ ++ stdenv.lib.optional stdenv.isDarwin Foundation;
configureFlags = [
"--libdir=$(out)/lib"
"--sysconfdir=/etc/clamav"
- "--with-systemdsystemunitdir=$(out)/lib/systemd"
"--disable-llvm" # enabling breaks the build at the moment
"--with-zlib=${zlib.dev}"
"--with-xml=${libxml2.dev}"
@@ -34,7 +33,8 @@ stdenv.mkDerivation rec {
"--with-libcurl=${curl.dev}"
"--with-system-libmspack"
"--enable-milter"
- ];
+ ] ++ stdenv.lib.optional stdenv.isLinux
+ "--with-systemdsystemunitdir=$(out)/lib/systemd";
postInstall = ''
mkdir $out/etc
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
license = licenses.gpl2;
maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix
index 914fe006735..fe8330e9eb4 100644
--- a/pkgs/tools/text/epubcheck/default.nix
+++ b/pkgs/tools/text/epubcheck/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "epubcheck";
- version = "4.2.2";
+ version = "4.2.3";
src = fetchzip {
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
- sha256 = "0vz7k6i6y60ml20pbw2p9iqy6kxw4ziqszg6hbgz102x1jk8788d";
+ sha256 = "0pqvqjc7vzvygddl8x4y0nqiwca883rh8lfqx0ml1a9gdhq0r5k4";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index ee4d0dfe588..fb3e6668a47 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -49,6 +49,10 @@ in buildEnv {
ignoreCollisions = false;
paths = pkgList.nonbin;
+ pathsToLink = [
+ "/"
+ "/tex/generic/config" # make it a real directory for scheme-infraonly
+ ];
buildInputs = [ makeWrapper ] ++ pkgList.extraInputs;
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index c16eb003d8d..47953d21dfe 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -13,21 +13,21 @@
let
spec = fetchurl {
- url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml";
- sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0";
+ url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.67.0/openapi.yaml";
+ sha256 = "0vsblprkqlr9508x5rkm0wj6lc3w72xiwiqxia9asgr5k45hhfnr";
};
in
buildPythonApplication rec {
pname = "linode-cli";
- version = "2.14.1";
+ version = "2.15.0";
src = fetchFromGitHub {
owner = "linode";
repo = pname;
rev = version;
- sha256 = "1hpdmbzs182iag471yvq3kwd1san04a58sczzbmw6vjv2kswn1c2";
+ sha256 = "06iz9xjj6h1ry176558488fl9j18a5vf724zh4cxlcksdy72dnna";
};
patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c92e4f475b..fcef4c4608b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2482,7 +2482,7 @@ in
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
- boost = boost167.override { enablePython = true; python = python37; };
+ boost = boost16x.override { enablePython = true; python = python38; };
})
ceph
ceph-client;
@@ -2589,8 +2589,6 @@ in
connman-notify = callPackage ../tools/networking/connman/connman-notify { };
- connmanui = callPackage ../tools/networking/connman/connmanui { };
-
connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { };
convertlit = callPackage ../tools/text/convertlit { };
@@ -2720,7 +2718,9 @@ in
ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
- clamav = callPackage ../tools/security/clamav { };
+ clamav = callPackage ../tools/security/clamav {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
clex = callPackage ../tools/misc/clex { };
@@ -3626,6 +3626,8 @@ in
fusee-launcher = callPackage ../development/tools/fusee-launcher { };
+ fverb = callPackage ../applications/audio/fverb { };
+
fwknop = callPackage ../tools/security/fwknop { };
exfat = callPackage ../tools/filesystems/exfat { };
@@ -9054,6 +9056,8 @@ in
mkcl = callPackage ../development/compilers/mkcl {};
+ mlkit = callPackage ../development/compilers/mlkit {};
+
inherit (callPackage ../development/compilers/mlton {})
mlton20130715
mlton20180207Binary
@@ -9803,7 +9807,7 @@ in
inherit (callPackage ../development/interpreters/ruby {
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
- bison = bison_3_5;
+ bison = buildPackages.bison_3_5;
})
ruby_2_5
ruby_2_6
@@ -12082,7 +12086,9 @@ in
gperftools = callPackage ../development/libraries/gperftools { };
- grab-site = callPackage ../tools/backup/grab-site { };
+ grab-site = callPackage ../tools/backup/grab-site {
+ python3Packages = python37Packages;
+ };
grib-api = callPackage ../development/libraries/grib-api { };
@@ -13420,6 +13426,8 @@ in
libpqxx = callPackage ../development/libraries/libpqxx { };
+ libprom = callPackage ../development/libraries/libprom { };
+
libproxy = callPackage ../development/libraries/libproxy {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore;
};
@@ -16713,6 +16721,8 @@ in
fwts = callPackage ../os-specific/linux/fwts { };
+ gobi_loader = callPackage ../os-specific/linux/gobi_loader { };
+
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
libuuid = if stdenv.isLinux
@@ -18824,6 +18834,8 @@ in
autotrace = callPackage ../applications/graphics/autotrace {};
+ av-98 = callPackage ../applications/networking/browsers/av-98 { };
+
avocode = callPackage ../applications/graphics/avocode {};
azpainter = callPackage ../applications/graphics/azpainter { };
@@ -19057,8 +19069,6 @@ in
inherit (python3Packages) python wrapPython pygments markdown;
};
- cgminer = callPackage ../applications/misc/cgminer { };
-
chirp = callPackage ../applications/radio/chirp { };
browsh = callPackage ../applications/networking/browsers/browsh { };
@@ -19853,7 +19863,11 @@ in
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
- freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; };
+ freecad = qt5.callPackage ../applications/graphics/freecad {
+ mpi = openmpi;
+ # pyside2 5.12 is broken under python 3.8
+ python3Packages = python37Packages;
+ };
freemind = callPackage ../applications/misc/freemind { };
@@ -20521,7 +20535,7 @@ in
inherit (kdeApplications)
akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b
- kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
+ kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
@@ -22163,9 +22177,9 @@ in
dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
- maestral = callPackage ../applications/networking/maestral { };
+ maestral = with python3Packages; toPythonApplication maestral;
- maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; };
+ maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };
insync = callPackage ../applications/networking/insync { };
@@ -22278,6 +22292,8 @@ in
git = gitMinimal;
};
+ sslyze = with python3Packages; toPythonApplication sslyze;
+
ssr = callPackage ../applications/audio/soundscape-renderer {};
ssrc = callPackage ../applications/audio/ssrc { };
@@ -22811,6 +22827,8 @@ in
vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };
+ code-server = callPackage ../servers/code-server { };
+
vue = callPackage ../applications/misc/vue { };
vuze = callPackage ../applications/networking/p2p/vuze { };
@@ -23424,6 +23442,8 @@ in
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; };
+ cgminer = callPackage ../applications/blockchains/cgminer { };
+
clightning = callPackage ../applications/blockchains/clightning.nix { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; };
@@ -24052,6 +24072,11 @@ in
static = true;
};
};
+ openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix {
+ zlib = zlib.override {
+ static = true;
+ };
+ };
opentyrian = callPackage ../games/opentyrian { };
@@ -26766,7 +26791,7 @@ in
simplehttp2server = callPackage ../servers/simplehttp2server { };
- diceware = callPackage ../tools/security/diceware { };
+ diceware = with python3Packages; toPythonApplication diceware;
xml2rfc = with python3Packages; toPythonApplication xml2rfc;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d5d7a81a087..1ff7c8a5198 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -170,11 +170,9 @@ let
cstruct =
if lib.versionAtLeast ocaml.version "4.2"
then callPackage ../development/ocaml-modules/cstruct {}
- else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; };
+ else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { };
- cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix {
- lwt = ocaml_lwt;
- };
+ cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { };
cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};
@@ -459,37 +457,25 @@ let
llvm = pkgs.llvm_8;
};
- logs = callPackage ../development/ocaml-modules/logs {
- lwt = ocaml_lwt;
- };
+ logs = callPackage ../development/ocaml-modules/logs { };
lru = callPackage ../development/ocaml-modules/lru { };
lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
- lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
+ lwt = callPackage ../development/ocaml-modules/lwt { };
- lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { };
-
- ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2;
+ ocaml_lwt = lwt;
lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { };
- lwt_log = callPackage ../development/ocaml-modules/lwt_log {
- lwt = lwt4;
- };
+ lwt_log = callPackage ../development/ocaml-modules/lwt_log { };
- lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
- lwt = ocaml_lwt;
- };
+ lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { };
- lwt_react = callPackage ../development/ocaml-modules/lwt_react {
- lwt = ocaml_lwt;
- };
+ lwt_react = callPackage ../development/ocaml-modules/lwt_react { };
- lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl {
- lwt = ocaml_lwt;
- };
+ lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { };
macaddr = callPackage ../development/ocaml-modules/macaddr { };
@@ -499,7 +485,7 @@ let
magick = callPackage ../development/ocaml-modules/magick { };
- markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; };
+ markup = callPackage ../development/ocaml-modules/markup { };
mdx = callPackage ../development/ocaml-modules/mdx { };
@@ -569,9 +555,7 @@ let
nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
- notty = callPackage ../development/ocaml-modules/notty {
- lwt = ocaml_lwt;
- };
+ notty = callPackage ../development/ocaml-modules/notty { };
npy = callPackage ../development/ocaml-modules/npy {
inherit (pkgs.python3Packages) numpy;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d4a3ad052b..1a7d87a9ae3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -645,6 +645,8 @@ in {
dkimpy = callPackage ../development/python-modules/dkimpy { };
+ diceware = callPackage ../development/python-modules/diceware { };
+
dictionaries = callPackage ../development/python-modules/dictionaries { };
diff_cover = callPackage ../development/python-modules/diff_cover { };
@@ -972,6 +974,8 @@ in {
nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; };
+ nassl = callPackage ../development/python-modules/nassl { };
+
nbsmoke = callPackage ../development/python-modules/nbsmoke { };
nbsphinx = callPackage ../development/python-modules/nbsphinx { };
@@ -1556,6 +1560,8 @@ in {
sslib = callPackage ../development/python-modules/sslib { };
+ sslyze = callPackage ../development/python-modules/sslyze { };
+
statistics = callPackage ../development/python-modules/statistics { };
stm32loader = callPackage ../development/python-modules/stm32loader { };
@@ -1586,6 +1592,8 @@ in {
tesserocr = callPackage ../development/python-modules/tesserocr { };
+ tls-parser = callPackage ../development/python-modules/tls-parser { };
+
trueskill = callPackage ../development/python-modules/trueskill { };
trustme = callPackage ../development/python-modules/trustme {};
@@ -4469,6 +4477,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
};
+ maestral = callPackage ../development/python-modules/maestral { };
+
manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {};
marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {};
mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {};