Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
16287a8cb8
|
|
@ -96,6 +96,47 @@
|
|||
The options are named identically for all other display managers.
|
||||
</para>
|
||||
</simplesect>
|
||||
<simplesect xml:id="sec-x11--graphics-cards-intel">
|
||||
<title>Intel Graphics drivers</title>
|
||||
<para>
|
||||
There are two choices for Intel Graphics drivers in X.org:
|
||||
<literal>modesetting</literal> (included in the <package>xorg-server</package> itself)
|
||||
and <literal>intel</literal> (provided by the package <package>xf86-video-intel</package>).
|
||||
</para>
|
||||
<para>
|
||||
The default and recommended is <literal>modesetting</literal>.
|
||||
It is a generic driver which uses the kernel
|
||||
<link xlink:href="https://en.wikipedia.org/wiki/Mode_setting">mode setting</link>
|
||||
(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).
|
||||
</para>
|
||||
<para>
|
||||
The second driver, <literal>intel</literal>, 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.
|
||||
</para>
|
||||
<para>
|
||||
The results vary depending on the hardware, so you may have to try both drivers.
|
||||
Use the option <xref linkend="opt-services.xserver.videoDrivers"/> to set one.
|
||||
The recommended configuration for modern systems is:
|
||||
<programlisting>
|
||||
<xref linkend="opt-services.xserver.videoDrivers"/> = [ "modesetting" ];
|
||||
<xref linkend="opt-services.xserver.useGlamor"/> = true;
|
||||
</programlisting>
|
||||
If you experience screen tearing no matter what, this configuration was
|
||||
reported to resolve the issue:
|
||||
<programlisting>
|
||||
<xref linkend="opt-services.xserver.videoDrivers"/> = [ "intel" ];
|
||||
<xref linkend="opt-services.xserver.deviceSection"/> = ''
|
||||
Option "DRI" "2"
|
||||
Option "TearFree" "true"
|
||||
'';
|
||||
</programlisting>
|
||||
Note that this will likely downgrade the performance compared to
|
||||
<literal>modesetting</literal> or <literal>intel</literal> with DRI 3 (default).
|
||||
</para>
|
||||
</simplesect>
|
||||
<simplesect xml:id="sec-x11-graphics-cards-nvidia">
|
||||
<title>Proprietary NVIDIA drivers</title>
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -628,6 +628,7 @@ EOF
|
|||
write_file($fn, <<EOF);
|
||||
@configuration@
|
||||
EOF
|
||||
print STDERR "For more hardware-specific settings, see https://github.com/NixOS/nixos-hardware"
|
||||
} else {
|
||||
print STDERR "warning: not overwriting existing $fn\n";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ in {
|
|||
<literal>"iponly"</literal>: specifies no authentication. ACLs authorization is used.
|
||||
</para></listitem>
|
||||
<listitem><para>
|
||||
<literal>"strong"</literal>: authentication by username/password. If user is not registered his access is denied regardless of ACLs.
|
||||
<literal>"strong"</literal>: authentication by username/password. If user is not registered their access is denied regardless of ACLs.
|
||||
</para></listitem>
|
||||
</itemizedlist>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <literal>-c <path-to-default-configuration></literal>
|
||||
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}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ export PATH=/empty
|
|||
for i in @path@; do PATH=$PATH:$i/bin; done
|
||||
|
||||
usage() {
|
||||
echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>]" >&2
|
||||
echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>] [-n <dtbName>]" >&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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"):
|
||||
|
|
|
|||
|
|
@ -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".
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
34
pkgs/applications/audio/fverb/default.nix
Normal file
34
pkgs/applications/audio/fverb/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
49
pkgs/applications/blockchains/cgminer/default.nix
Normal file
49
pkgs/applications/blockchains/cgminer/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
8
pkgs/applications/editors/micro/deps.nix
generated
8
pkgs/applications/editors/micro/deps.nix
generated
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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 {};
|
||||
|
|
|
|||
24
pkgs/applications/kde/kapptemplate.nix
Normal file
24
pkgs/applications/kde/kapptemplate.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = [];
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
21
pkgs/applications/networking/browsers/av-98/default.nix
Normal file
21
pkgs/applications/networking/browsers/av-98/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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}" ];
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
49
pkgs/applications/networking/maestral-qt/default.nix
Normal file
49
pkgs/applications/networking/maestral-qt/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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; [
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ in buildBazelPackage rec {
|
|||
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
|
||||
'';
|
||||
|
||||
sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v";
|
||||
sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
|
||||
substituteInPlace Makefile --replace 'gzip' 'gzip -n'
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
24
pkgs/development/compilers/mlkit/default.nix
Normal file
24
pkgs/development/compilers/mlkit/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
48
pkgs/development/libraries/libprom/default.nix
Normal file
48
pkgs/development/libraries/libprom/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ let
|
|||
bazelTarget = ":install";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3";
|
||||
sha256 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci";
|
||||
};
|
||||
|
||||
bazelFlags = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 = [];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
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
|
||||
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
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
|
||||
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
57
pkgs/development/python-modules/maestral/default.nix
Normal file
57
pkgs/development/python-modules/maestral/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
120
pkgs/development/python-modules/nassl/default.nix
Normal file
120
pkgs/development/python-modules/nassl/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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)";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
52
pkgs/development/python-modules/sslyze/default.nix
Normal file
52
pkgs/development/python-modules/sslyze/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ let
|
|||
bazelTarget = ":pip_pkg";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i";
|
||||
sha256 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue