Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
ef9f91f3cf
@ -4,42 +4,41 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.fancontrol;
|
||||
configFile = pkgs.writeText "fan.conf" cfg.config;
|
||||
|
||||
in {
|
||||
configFile = pkgs.writeText "fancontrol.conf" cfg.config;
|
||||
|
||||
in{
|
||||
options.hardware.fancontrol = {
|
||||
enable = mkEnableOption "fancontrol (requires fancontrol.config)";
|
||||
enable = mkEnableOption "software fan control (requires fancontrol.config)";
|
||||
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = null;
|
||||
type = types.lines;
|
||||
description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
|
||||
example = ''
|
||||
# Configuration file generated by pwmconfig
|
||||
INTERVAL=1
|
||||
DEVPATH=hwmon0=devices/platform/nct6775.656 hwmon1=devices/pci0000:00/0000:00:18.3
|
||||
DEVNAME=hwmon0=nct6779 hwmon1=k10temp
|
||||
FCTEMPS=hwmon0/pwm2=hwmon1/temp1_input
|
||||
FCFANS=hwmon0/pwm2=hwmon0/fan2_input
|
||||
MINTEMP=hwmon0/pwm2=25
|
||||
MAXTEMP=hwmon0/pwm2=60
|
||||
MINSTART=hwmon0/pwm2=25
|
||||
MINSTOP=hwmon0/pwm2=10
|
||||
MINPWM=hwmon0/pwm2=0
|
||||
MAXPWM=hwmon0/pwm2=255
|
||||
INTERVAL=10
|
||||
DEVPATH=hwmon3=devices/virtual/thermal/thermal_zone2 hwmon4=devices/platform/f71882fg.656
|
||||
DEVNAME=hwmon3=soc_dts1 hwmon4=f71869a
|
||||
FCTEMPS=hwmon4/device/pwm1=hwmon3/temp1_input
|
||||
FCFANS= hwmon4/device/pwm1=hwmon4/device/fan1_input
|
||||
MINTEMP=hwmon4/device/pwm1=35
|
||||
MAXTEMP=hwmon4/device/pwm1=65
|
||||
MINSTART=hwmon4/device/pwm1=150
|
||||
MINSTOP=hwmon4/device/pwm1=0
|
||||
'';
|
||||
description = "Contents for configuration file. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry>.";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.fancontrol = {
|
||||
description = "Fan speed control from lm_sensors";
|
||||
unitConfig.Documentation = "man:fancontrol(8)";
|
||||
description = "software fan control";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "lm_sensors.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.lm_sensors}/bin/fancontrol ${configFile}";
|
||||
ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -81,6 +81,7 @@ in
|
||||
env = handleTest ./env.nix {};
|
||||
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
|
||||
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
|
||||
fancontrol = handleTest ./fancontrol.nix {};
|
||||
ferm = handleTest ./ferm.nix {};
|
||||
firefox = handleTest ./firefox.nix {};
|
||||
firewall = handleTest ./firewall.nix {};
|
||||
|
||||
25
nixos/tests/fancontrol.nix
Normal file
25
nixos/tests/fancontrol.nix
Normal file
@ -0,0 +1,25 @@
|
||||
import ./make-test.nix ({ pkgs, ... } : {
|
||||
name = "fancontrol";
|
||||
|
||||
machine =
|
||||
{ ... }:
|
||||
{ hardware.fancontrol.enable = true;
|
||||
hardware.fancontrol.config = ''
|
||||
INTERVAL=42
|
||||
DEVPATH=hwmon1=devices/platform/dummy
|
||||
DEVNAME=hwmon1=dummy
|
||||
FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
|
||||
FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
|
||||
MINTEMP=hwmon1/device/pwm1=25
|
||||
MAXTEMP=hwmon1/device/pwm1=65
|
||||
MINSTART=hwmon1/device/pwm1=150
|
||||
MINSTOP=hwmon1/device/pwm1=0
|
||||
'';
|
||||
};
|
||||
|
||||
# This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error.
|
||||
testScript = ''
|
||||
$machine->waitForUnit("fancontrol.service");
|
||||
$machine->waitUntilSucceeds("journalctl -eu fancontrol | grep 'Configuration appears to be outdated'");
|
||||
'';
|
||||
})
|
||||
@ -7,7 +7,7 @@ import ./make-test.nix ({ lib, ... }:
|
||||
fonts.fonts = with pkgs; [
|
||||
noto-fonts-emoji
|
||||
cantarell-fonts
|
||||
twitter-color-emoji
|
||||
#twitter-color-emoji # Can't be generated with Python 3 version of nototools
|
||||
source-code-pro
|
||||
gentium
|
||||
];
|
||||
|
||||
@ -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.8.3";
|
||||
version = "3.10.0";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
@ -18,7 +18,7 @@ in mkDerivation rec {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "16axjih48qn8ri3p71d8f7k0y3rd05wghmg1fcbyda871b45b2f8";
|
||||
sha256 = "0qq4dznxxbpj8b4ypkz7dixc0b0v6rmf3c5hs4m3ka3rzck8jsqc";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
|
||||
let
|
||||
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
|
||||
|
||||
version = "3.0.306796.1020";
|
||||
version = "3.0.309708.1027";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
|
||||
sha256 = "0nh93pyincwfmx3z5x4s0ym3n0ff492nwd9wh3xkcl518pslxpxy";
|
||||
sha256 = "0g0nmlbcps331vdnfj571lzhcw8cb2gxbll09jananxdpnmwv5l6";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "rclone";
|
||||
version = "1.50.0";
|
||||
version = "1.49.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0k4fybz4670cqg1rpx0c1ximf1x6yl1f788hx9raxkwp5wv703kw";
|
||||
sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/rclone/rclone";
|
||||
|
||||
@ -10,17 +10,16 @@
|
||||
# Needed for running tests:
|
||||
, qtbase, xvfb_run
|
||||
|
||||
# For weboob, which only supports Python 2.x:
|
||||
, python2Packages
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kmymoney";
|
||||
version = "5.0.5";
|
||||
version = "5.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
|
||||
sha256 = "1h5mzvgpfyl2j66b3nsw17yxvg0ja1qhjlcmfkz62221vcqsrp6m";
|
||||
};
|
||||
|
||||
# Hidden dependency that wasn't included in CMakeLists.txt:
|
||||
@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython
|
||||
doxygen extra-cmake-modules graphviz kdoctools python3Packages.wrapPython
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
@ -41,10 +40,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Put it into buildInputs so that CMake can find it, even though we patch
|
||||
# it into the interface later.
|
||||
python2Packages.weboob
|
||||
python3Packages.weboob
|
||||
];
|
||||
|
||||
weboobPythonPath = [ python2Packages.weboob ];
|
||||
weboobPythonPath = [ python3Packages.weboob ];
|
||||
|
||||
postInstall = ''
|
||||
buildPythonPath "$weboobPythonPath"
|
||||
@ -70,6 +69,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://kmymoney.org/;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
pname = "softmaker-office";
|
||||
version = "970";
|
||||
version = "972";
|
||||
edition = "2018";
|
||||
suiteName = "SoftMaker Office";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
|
||||
sha256 = "14f94p1jms41s2iz5sa770rcyfp4mv01r6jjjis9amx37zrc8yid";
|
||||
sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1";
|
||||
};
|
||||
|
||||
archive = "office${edition}.tar.lzma";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
project = "conmon";
|
||||
name = "${project}-${version}";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = project;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sigcylya668f5jzkf1vgfsgqy26l3glh9a3g8lhd2468ax6wymk";
|
||||
sha256 = "1ha5vhjlb12kshh0j1vpl1vjk8ym9w2j1x762y6zdspkdha1w3dv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virt-top";
|
||||
version = "2017-11-18-unstable";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://git.annexia.org/git/virt-top.git;
|
||||
rev = "18a751d8c26548bb090ff05e30ccda3092e3373b";
|
||||
sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i";
|
||||
url = git://git.annexia.org/virt-top.git;
|
||||
rev = "v${version}";
|
||||
sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
|
||||
{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, python3Packages, pkgconfig, pngquant, which, imagemagick }:
|
||||
|
||||
let
|
||||
mkNoto = { name, weights, sha256, }:
|
||||
@ -89,20 +89,22 @@ in
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
};
|
||||
};
|
||||
noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation {
|
||||
noto-fonts-emoji = let
|
||||
version = "unstable-2019-10-22";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "noto-fonts-emoji";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlei18n";
|
||||
repo = "noto-emoji";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y54zsvwf5pqhcd9cl2zz5l52qyswn6kycvrq03zm5kqqsngbw3p";
|
||||
rev = "018aa149d622a4fea11f01c61a7207079da301bc";
|
||||
sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c";
|
||||
};
|
||||
|
||||
buildInputs = [ cairo ];
|
||||
nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ]
|
||||
++ (with pythonPackages; [ python fonttools nototools ]);
|
||||
++ (with python3Packages; [ python fonttools nototools ]);
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile
|
||||
|
||||
@ -1,28 +1,45 @@
|
||||
{ fetchFromGitHub, pythonPackages, lib }:
|
||||
{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "nototools";
|
||||
version = "unstable-2019-03-20";
|
||||
version = "unstable-2019-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "nototools";
|
||||
rev = "9c4375f07c9adc00c700c5d252df6a25d7425870";
|
||||
sha256 = "0z9i23vl6xar4kvbqbc8nznq3s690mqc5zfv280l1c02l5n41smc";
|
||||
rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca";
|
||||
sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ fonttools numpy ];
|
||||
propagatedBuildInputs = [ fonttools numpy ];
|
||||
|
||||
patches = lib.optionals isPy3k [
|
||||
# Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497
|
||||
(fetchpatch {
|
||||
url = https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch;
|
||||
sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pillow six bash
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
patchShebangs tests/
|
||||
cd tests
|
||||
rm gpos_diff_test.py # needs ttxn?
|
||||
./run_tests
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp -r third_party $out
|
||||
'';
|
||||
|
||||
disabled = pythonPackages.isPy3k;
|
||||
|
||||
meta = {
|
||||
description = "Noto fonts support tools and scripts plus web site generation";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, imagemagick
|
||||
, pkg-config
|
||||
, pngquant
|
||||
, python2
|
||||
, python3
|
||||
, which
|
||||
, zopfli
|
||||
}:
|
||||
@ -33,7 +33,7 @@ let
|
||||
sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn";
|
||||
};
|
||||
|
||||
python = python2.withPackages (pp: with pp; [
|
||||
python = python3.withPackages (pp: with pp; [
|
||||
nototools
|
||||
]);
|
||||
in
|
||||
@ -118,5 +118,6 @@ stdenv.mkDerivation rec {
|
||||
## Non-artwork is MIT
|
||||
license = with licenses; [ asl20 ofl cc-by-40 mit ];
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
broken = true; # Can't be build using the current Python 3 version of nototools
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,39 @@
|
||||
{ stdenv, fetchFromGitHub, coq }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq${coq.coq-version}-coq-extensible-records-1.2.0";
|
||||
let
|
||||
versions = {
|
||||
pre_8_9 = {
|
||||
owner = "gmalecha";
|
||||
rev = "1.2.0";
|
||||
version = "1.2.0";
|
||||
sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4";
|
||||
};
|
||||
post_8_9 = {
|
||||
owner = "Ptival";
|
||||
rev = "bd7082a3571ee3c111096ff6b5eb28c8d3a99ce5";
|
||||
version = "1.2.0+8.9-fix";
|
||||
sha256 = "0625qd8pyxi0v704fwnawrfw5fk966vnk120il0g6qv42siyck95";
|
||||
};
|
||||
};
|
||||
params =
|
||||
{
|
||||
"8.5" = versions.pre_8_9;
|
||||
"8.6" = versions.pre_8_9;
|
||||
"8.7" = versions.pre_8_9;
|
||||
"8.8" = versions.pre_8_9;
|
||||
"8.9" = versions.post_8_9;
|
||||
"8.10" = versions.post_8_9;
|
||||
};
|
||||
param = params.${coq.coq-version};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (param) version;
|
||||
name = "coq${coq.coq-version}-coq-extensible-records-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gmalecha";
|
||||
inherit (param) owner rev sha256;
|
||||
repo = "coq-extensible-records";
|
||||
rev = "1.2.0";
|
||||
sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4";
|
||||
};
|
||||
|
||||
buildInputs = [ coq ];
|
||||
@ -27,6 +53,6 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -65,10 +65,10 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "5";
|
||||
patch = "7";
|
||||
patch = "8";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18";
|
||||
sha256 = "0hgzn8l4ps93f3h4b47vczsbhy2kihvzdisjjx6mrn85rndk3c8v";
|
||||
inherit (darwin) CF configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libedit";
|
||||
version = "20190324-3.1";
|
||||
version = "20191025-3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
|
||||
sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc";
|
||||
sha256 = "0fdznw6fklis39xqk30ihw8dl8kdw9fzq1z42jmbyy6lc1k07zvd";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -42,6 +42,11 @@ in stdenv.mkDerivation rec {
|
||||
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
|
||||
sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fixes CVE-2019-1010238
|
||||
url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.diff";
|
||||
sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -18,6 +18,9 @@ buildPackage {
|
||||
"--dynlibdir=\${lib}/lib"
|
||||
"--includedir=\${dev}/include"
|
||||
"--sysdepdir=\${lib}/lib/skalibs/sysdeps"
|
||||
# Empty the default path, which would be "/usr/bin:bin".
|
||||
# It would be set when PATH is empty. This hurts hermeticity.
|
||||
"--with-default-path="
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
19
pkgs/development/ocaml-modules/angstrom-async/default.nix
Normal file
19
pkgs/development/ocaml-modules/angstrom-async/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "angstrom-async";
|
||||
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.04.1";
|
||||
|
||||
propagatedBuildInputs = [ angstrom async ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (angstrom.meta) homepage license;
|
||||
description = "Async support for Angstrom";
|
||||
maintainers = with stdenv.lib.maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
19
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
Normal file
19
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "angstrom-lwt-unix";
|
||||
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
propagatedBuildInputs = [ angstrom ocaml_lwt ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (angstrom.meta) homepage license;
|
||||
description = "Lwt_unix support for Angstrom";
|
||||
maintainers = with stdenv.lib.maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
19
pkgs/development/ocaml-modules/angstrom-unix/default.nix
Normal file
19
pkgs/development/ocaml-modules/angstrom-unix/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "angstrom-unix";
|
||||
|
||||
inherit (angstrom) version src;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
propagatedBuildInputs = [ angstrom ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (angstrom.meta) homepage license;
|
||||
description = "Unix support for Angstrom";
|
||||
maintainers = with stdenv.lib.maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "angstrom";
|
||||
version = "0.10.0";
|
||||
version = "0.12.1";
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
@ -10,7 +10,7 @@ buildDunePackage rec {
|
||||
owner = "inhabitedtype";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
|
||||
sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2";
|
||||
};
|
||||
|
||||
buildInputs = [ alcotest ];
|
||||
|
||||
24
pkgs/development/ocaml-modules/earlybird/default.nix
Normal file
24
pkgs/development/ocaml-modules/earlybird/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix,
|
||||
batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson,
|
||||
ppx_tools_versioned, yojson }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "earlybird";
|
||||
version = "0.1.5";
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hackwaly/ocamlearlybird/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "10yflmsicw4sdmm075zjpbmxpwm9fvibnl3sl18zjpwnm6l9sv7d";
|
||||
};
|
||||
|
||||
buildInputs = [ angstrom angstrom-lwt-unix batteries cmdliner lwt_ppx ocaml_lwt ppx_deriving_yojson ppx_tools_versioned yojson ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/hackwaly/ocamlearlybird";
|
||||
description = "OCaml debug adapter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@ -19,6 +19,11 @@ buildPythonPackage rec {
|
||||
rm tests/cache/test_memcached_backend.py
|
||||
'';
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest pytestcov mock Mako ];
|
||||
|
||||
propagatedBuildInputs = [ decorator ];
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ buildPythonPackage, lib, fetchFromGitHub
|
||||
, click, numpy, pyparsing
|
||||
, pytest
|
||||
, pytest, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snuggs";
|
||||
version = "1.4.3";
|
||||
version = "1.4.7";
|
||||
|
||||
# Pypi doesn't ship the tests, so we fetch directly from GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "198nbgkhlg4ik2i1r2cp900iqlairh2hnii2y8v5wy1qk3rv0s9g";
|
||||
sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click numpy pyparsing ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytest hypothesis ];
|
||||
checkPhase = "pytest test_snuggs.py";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
{ buildPythonPackage, fetchurl, stdenv, isPy27
|
||||
{ buildPythonPackage, fetchPypi, stdenv
|
||||
, nose, pillow, prettytable, pyyaml, dateutil, gdata
|
||||
, requests, mechanize, feedparser, lxml, gnupg, pyqt5
|
||||
, libyaml, simplejson, cssselect, futures, pdfminer
|
||||
, libyaml, simplejson, cssselect, pdfminer
|
||||
, termcolor, google_api_python_client, html2text
|
||||
, unidecode
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weboob";
|
||||
version = "1.3";
|
||||
disabled = ! isPy27;
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz";
|
||||
sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c9z9gid1mbm1cakb2wj6jjkbrmji8y8ac46iqpih9x1h498bhbs";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -37,7 +36,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
|
||||
gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml
|
||||
simplejson cssselect futures pdfminer termcolor
|
||||
simplejson cssselect pdfminer termcolor
|
||||
google_api_python_client html2text unidecode ];
|
||||
|
||||
checkPhase = ''
|
||||
@ -50,4 +49,3 @@ buildPythonPackage rec {
|
||||
license = stdenv.lib.licenses.agpl3;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "buildah";
|
||||
version = "1.11.3";
|
||||
version = "1.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gpxlqakfw3r40w6fsd1d6x45slmivxpcbngnv9lv7762irykz12";
|
||||
sha256 = "11jdjrmyafy3fnnp4cdxh3fncjbcy7gggpzwp4n857ij7k2581hl";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "man" "out" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.190.1";
|
||||
version = "2.190.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "01bg8g1x0g479k0vz2dxzfkn6a3pp5sdqj6nmmmccgs2v4jivys6";
|
||||
sha256 = "09zij2gpg1i0pkx1nsgccc26p8z4gy4ljhch8m767xaa0000lqj7";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "0.25.1";
|
||||
sha256 = "1i66m6l4q8vkygn24v5s06kxaxm9gdd8y75fjyzz189pnmijj1as";
|
||||
version = "0.26.0";
|
||||
sha256 = "1njclj07amj9n187k3rbjvddkhmsc4aljdbsgjxpj58fv7zdy7kq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -23,14 +23,14 @@ let
|
||||
else throw "Only x86_64 Linux and Darwin are supported.";
|
||||
|
||||
languageServerSha256 = {
|
||||
linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
|
||||
osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
|
||||
linux-x64 = "1w3y0sn6ijk1vspi4lailg1q1iy9lwslhx92c7jbrrkiaszvaqwn";
|
||||
osx-x64 = "11l4fic8cvgh1l3dq6qxi51pwhcic79zf13rhyajl5w5g13caafp";
|
||||
}.${arch};
|
||||
|
||||
# version is languageServerVersion in the package.json
|
||||
languageServer = extractNuGet rec {
|
||||
name = "Python-Language-Server";
|
||||
version = "0.3.40";
|
||||
version = "0.4.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";
|
||||
@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "python";
|
||||
publisher = "ms-python";
|
||||
version = "2019.6.24221";
|
||||
sha256 = "1l82y3mbplzipcij5a0wqlykypik0sbba4hwr2r4vwiwb6kxscmx";
|
||||
version = "2019.10.44104";
|
||||
sha256 = "1k0wws430psrl8zp9ky5mifbg02qmh2brjyqk5k9pn3y1dks5gns";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8,8 +8,8 @@ in
|
||||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "2.2.0";
|
||||
sha256 = "0mwn72cp8rd9zc527k9l08iyap1wyqzpvzbj8142fa7nsy64jd04";
|
||||
version = "2.2.1";
|
||||
sha256 = "18hdmx993wvhcv13z9p8ylp3lf480axv4lyl0qx52pw2y2jgj1z8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.150";
|
||||
version = "4.14.151";
|
||||
|
||||
# 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 = "1c2pxfvv31af0mzcqnbfjk8pc0wrhg4yhspl8a3ab2w5dfwa9ib5";
|
||||
sha256 = "1bizb1wwni5r4m5i0mrsqbc5qw73lwrfrdadm09vbfz9ir19qlgz";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.80";
|
||||
version = "4.19.81";
|
||||
|
||||
# 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 = "1v776s6q5wxn8ci86dwa8s8y41b94g09fnpgvzysg2h89rvbmac0";
|
||||
sha256 = "17g2wiaa7l7mxi72k79drxij2zqk3nsj8wi17bl4nfvb1ypc2gi9";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.197";
|
||||
version = "4.4.198";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0ypfl1q1bdbk81hk0bm8a0grqzz4z5rp7z7asa3191ji3r8q9x4w";
|
||||
sha256 = "04pkryy1lc75c88vq5wcjjcxs43i7bb8hhplbfi6s204ipc0iy7c";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.197";
|
||||
version = "4.9.198";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "032as6g4xvqjarqhvx7mr14yhn6idak4g0ps1skmsl4dfav6hdam";
|
||||
sha256 = "1b05jra6q695s1d4rzdr39i6m8xsi5xjrdn73sgwzvx0dgxfnwlm";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.3.7";
|
||||
version = "5.3.8";
|
||||
|
||||
# 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 = "00j8sdrmmppqf38vl50a4zas5gy7yv37n43b61f8472k45773jf6";
|
||||
sha256 = "0jb6yya9yx4z52p5m32dqj0kgc6aaz9df8mvq0hzy40bqb3czwvq";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "0.99.2";
|
||||
version = "0.100.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ ];
|
||||
"acer_projector" = ps: with ps; [ pyserial ];
|
||||
@ -158,6 +158,7 @@
|
||||
"dlna_dmr" = ps: with ps; [ ];
|
||||
"dnsip" = ps: with ps; [ aiodns ];
|
||||
"dominos" = ps: with ps; [ aiohttp-cors ];
|
||||
"doods" = ps: with ps; [ ];
|
||||
"doorbird" = ps: with ps; [ ];
|
||||
"dovado" = ps: with ps; [ ];
|
||||
"downloader" = ps: with ps; [ ];
|
||||
@ -213,7 +214,6 @@
|
||||
"familyhub" = ps: with ps; [ ];
|
||||
"fan" = ps: with ps; [ ];
|
||||
"fastdotcom" = ps: with ps; [ ];
|
||||
"fedex" = ps: with ps; [ ];
|
||||
"feedreader" = ps: with ps; [ ];
|
||||
"ffmpeg" = ps: with ps; [ ha-ffmpeg ];
|
||||
"ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
|
||||
@ -301,6 +301,7 @@
|
||||
"hdmi_cec" = ps: with ps; [ ];
|
||||
"heatmiser" = ps: with ps; [ ];
|
||||
"heos" = ps: with ps; [ ];
|
||||
"here_travel_time" = ps: with ps; [ ];
|
||||
"hikvision" = ps: with ps; [ ];
|
||||
"hikvisioncam" = ps: with ps; [ ];
|
||||
"hipchat" = ps: with ps; [ ];
|
||||
@ -338,7 +339,7 @@
|
||||
"iglo" = ps: with ps; [ ];
|
||||
"ign_sismologia" = ps: with ps; [ ];
|
||||
"ihc" = ps: with ps; [ defusedxml ];
|
||||
"image_processing" = ps: with ps; [ aiohttp-cors ];
|
||||
"image_processing" = ps: with ps; [ aiohttp-cors pillow ];
|
||||
"imap" = ps: with ps; [ ];
|
||||
"imap_email_content" = ps: with ps; [ ];
|
||||
"incomfort" = ps: with ps; [ ];
|
||||
@ -362,9 +363,11 @@
|
||||
"isy994" = ps: with ps; [ ];
|
||||
"itach" = ps: with ps; [ ];
|
||||
"itunes" = ps: with ps; [ ];
|
||||
"izone" = ps: with ps; [ ];
|
||||
"jewish_calendar" = ps: with ps; [ ];
|
||||
"joaoapps_join" = ps: with ps; [ ];
|
||||
"juicenet" = ps: with ps; [ ];
|
||||
"kaiterra" = ps: with ps; [ ];
|
||||
"kankun" = ps: with ps; [ ];
|
||||
"keba" = ps: with ps; [ ];
|
||||
"keenetic_ndms2" = ps: with ps; [ ];
|
||||
@ -391,7 +394,6 @@
|
||||
"light" = ps: with ps; [ ];
|
||||
"lightwave" = ps: with ps; [ ];
|
||||
"limitlessled" = ps: with ps; [ limitlessled ];
|
||||
"linksys_ap" = ps: with ps; [ beautifulsoup4 ];
|
||||
"linksys_smart" = ps: with ps; [ ];
|
||||
"linky" = ps: with ps; [ ];
|
||||
"linode" = ps: with ps; [ linode-api ];
|
||||
@ -412,7 +414,7 @@
|
||||
"london_underground" = ps: with ps; [ ];
|
||||
"loopenergy" = ps: with ps; [ ];
|
||||
"lovelace" = ps: with ps; [ ];
|
||||
"luci" = ps: with ps; [ packaging ];
|
||||
"luci" = ps: with ps; [ ];
|
||||
"luftdaten" = ps: with ps; [ luftdaten ];
|
||||
"lupusec" = ps: with ps; [ ];
|
||||
"lutron" = ps: with ps; [ ];
|
||||
@ -516,6 +518,7 @@
|
||||
"octoprint" = ps: with ps; [ ];
|
||||
"oem" = ps: with ps; [ ];
|
||||
"ohmconnect" = ps: with ps; [ defusedxml ];
|
||||
"ombi" = ps: with ps; [ ];
|
||||
"onboarding" = ps: with ps; [ aiohttp-cors ];
|
||||
"onewire" = ps: with ps; [ ];
|
||||
"onkyo" = ps: with ps; [ onkyo-eiscp ];
|
||||
@ -558,7 +561,7 @@
|
||||
"pjlink" = ps: with ps; [ ];
|
||||
"plaato" = ps: with ps; [ aiohttp-cors ];
|
||||
"plant" = ps: with ps; [ ];
|
||||
"plex" = ps: with ps; [ ];
|
||||
"plex" = ps: with ps; [ aiohttp-cors ];
|
||||
"plugwise" = ps: with ps; [ ];
|
||||
"plum_lightpad" = ps: with ps; [ ];
|
||||
"pocketcasts" = ps: with ps; [ ];
|
||||
@ -628,6 +631,7 @@
|
||||
"russound_rio" = ps: with ps; [ ];
|
||||
"russound_rnet" = ps: with ps; [ ];
|
||||
"sabnzbd" = ps: with ps; [ ];
|
||||
"saj" = ps: with ps; [ ];
|
||||
"samsungtv" = ps: with ps; [ wakeonlan ];
|
||||
"satel_integra" = ps: with ps; [ ];
|
||||
"scene" = ps: with ps; [ ];
|
||||
@ -676,6 +680,7 @@
|
||||
"solaredge" = ps: with ps; [ stringcase ];
|
||||
"solaredge_local" = ps: with ps; [ ];
|
||||
"solax" = ps: with ps; [ ];
|
||||
"soma" = ps: with ps; [ ];
|
||||
"somfy" = ps: with ps; [ ];
|
||||
"somfy_mylink" = ps: with ps; [ ];
|
||||
"sonarr" = ps: with ps; [ ];
|
||||
@ -692,7 +697,6 @@
|
||||
"spotify" = ps: with ps; [ aiohttp-cors ];
|
||||
"sql" = ps: with ps; [ sqlalchemy ];
|
||||
"squeezebox" = ps: with ps; [ ];
|
||||
"srp_energy" = ps: with ps; [ ];
|
||||
"ssdp" = ps: with ps; [ netdisco ];
|
||||
"starlingbank" = ps: with ps; [ ];
|
||||
"startca" = ps: with ps; [ xmltodict ];
|
||||
@ -723,7 +727,6 @@
|
||||
"system_health" = ps: with ps; [ aiohttp-cors ];
|
||||
"system_log" = ps: with ps; [ aiohttp-cors ];
|
||||
"systemmonitor" = ps: with ps; [ psutil ];
|
||||
"sytadin" = ps: with ps; [ beautifulsoup4 ];
|
||||
"tado" = ps: with ps; [ ];
|
||||
"tahoma" = ps: with ps; [ ];
|
||||
"tank_utility" = ps: with ps; [ ];
|
||||
@ -739,7 +742,7 @@
|
||||
"telnet" = ps: with ps; [ ];
|
||||
"temper" = ps: with ps; [ ];
|
||||
"template" = ps: with ps; [ ];
|
||||
"tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ];
|
||||
"tensorflow" = ps: with ps; [ numpy protobuf tensorflow ];
|
||||
"tesla" = ps: with ps; [ ];
|
||||
"tfiac" = ps: with ps; [ ];
|
||||
"thermoworks_smoke" = ps: with ps; [ stringcase ];
|
||||
@ -791,12 +794,10 @@
|
||||
"upcloud" = ps: with ps; [ ];
|
||||
"updater" = ps: with ps; [ distro ];
|
||||
"upnp" = ps: with ps; [ ];
|
||||
"ups" = ps: with ps; [ ];
|
||||
"uptime" = ps: with ps; [ ];
|
||||
"uptimerobot" = ps: with ps; [ ];
|
||||
"uscis" = ps: with ps; [ ];
|
||||
"usgs_earthquakes_feed" = ps: with ps; [ ];
|
||||
"usps" = ps: with ps; [ ];
|
||||
"utility_meter" = ps: with ps; [ ];
|
||||
"uvc" = ps: with ps; [ ];
|
||||
"vacuum" = ps: with ps; [ ];
|
||||
@ -838,7 +839,7 @@
|
||||
"wink" = ps: with ps; [ ];
|
||||
"wirelesstag" = ps: with ps; [ ];
|
||||
"withings" = ps: with ps; [ aiohttp-cors ];
|
||||
"workday" = ps: with ps; [ ];
|
||||
"workday" = ps: with ps; [ holidays ];
|
||||
"worldclock" = ps: with ps; [ ];
|
||||
"worldtidesinfo" = ps: with ps; [ ];
|
||||
"worxlandroid" = ps: with ps; [ ];
|
||||
@ -859,6 +860,7 @@
|
||||
"yale_smart_alarm" = ps: with ps; [ ];
|
||||
"yamaha" = ps: with ps; [ ];
|
||||
"yamaha_musiccast" = ps: with ps; [ ];
|
||||
"yandex_transport" = ps: with ps; [ ];
|
||||
"yandextts" = ps: with ps; [ ];
|
||||
"yeelight" = ps: with ps; [ ];
|
||||
"yeelightsunflower" = ps: with ps; [ ];
|
||||
|
||||
@ -11,13 +11,7 @@
|
||||
# Applied after defaultOverrides
|
||||
, packageOverrides ? self: super: {
|
||||
# TODO: Remove this override after updating to cryptography 2.8:
|
||||
cryptography = super.cryptography.overridePythonAttrs (oldAttrs: {
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.asn1crypto ];
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
|
||||
sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
|
||||
}) ];
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
# Skip pip install of required packages on startup
|
||||
@ -27,36 +21,34 @@ let
|
||||
|
||||
defaultOverrides = [
|
||||
# Override the version of some packages pinned in Home Assistant's setup.py
|
||||
(mkOverride "aiohttp" "3.5.4"
|
||||
"9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf")
|
||||
(mkOverride "astral" "1.10.1"
|
||||
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
|
||||
(mkOverride "async-timeout" "3.0.1"
|
||||
"0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
|
||||
(mkOverride "attrs" "19.1.0"
|
||||
"f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
|
||||
(mkOverride "bcrypt" "3.1.7"
|
||||
"0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42")
|
||||
(mkOverride "pyjwt" "1.7.1"
|
||||
"8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96")
|
||||
(mkOverride "cryptography" "2.7" # TODO for 2.8: Remove the override above
|
||||
# (mkOverride "aiohttp" "3.5.4"
|
||||
# "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf")
|
||||
# (mkOverride "astral" "1.10.1"
|
||||
# "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
|
||||
# (mkOverride "async-timeout" "3.0.1"
|
||||
# "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
|
||||
# (mkOverride "bcrypt" "3.1.7"
|
||||
# "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42")
|
||||
# (mkOverride "pyjwt" "1.7.1"
|
||||
# "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96")
|
||||
(mkOverride "cryptography" "2.7" # TODO for 2.8: Remove the override below
|
||||
"e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6")
|
||||
(mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7
|
||||
"f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc")
|
||||
(mkOverride "importlib-metadata" "0.18"
|
||||
"cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
|
||||
(mkOverride "python-slugify" "3.0.2"
|
||||
"57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758")
|
||||
(mkOverride "pyyaml" "5.1.1"
|
||||
"b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955")
|
||||
(mkOverride "requests" "2.22.0"
|
||||
"11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4")
|
||||
(mkOverride "ruamel_yaml" "0.15.97"
|
||||
"17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845")
|
||||
(mkOverride "voluptuous" "0.11.5"
|
||||
"567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
|
||||
(mkOverride "voluptuous-serialize" "2.1.0"
|
||||
"d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f")
|
||||
# (mkOverride "importlib-metadata" "0.18"
|
||||
# "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
|
||||
(mkOverride "python-slugify" "3.0.4"
|
||||
"0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap")
|
||||
# (mkOverride "pyyaml" "5.1.1"
|
||||
# "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955")
|
||||
# (mkOverride "requests" "2.22.0"
|
||||
# "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4")
|
||||
# (mkOverride "ruamel_yaml" "0.15.97"
|
||||
# "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845")
|
||||
# (mkOverride "voluptuous" "0.11.5"
|
||||
# "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
|
||||
# (mkOverride "voluptuous-serialize" "2.1.0"
|
||||
# "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f")
|
||||
|
||||
# used by auth.mfa_modules.totp
|
||||
(mkOverride "pyotp" "2.2.7"
|
||||
@ -74,6 +66,19 @@ let
|
||||
};
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
# TODO: Remove this override after updating to cryptography 2.8
|
||||
cryptography = super.cryptography.overridePythonAttrs (oldAttrs: {
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.asn1crypto ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
|
||||
sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
|
||||
})
|
||||
];
|
||||
});
|
||||
})
|
||||
|
||||
# hass-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
hass-frontend = self.callPackage ./frontend.nix { };
|
||||
@ -107,7 +112,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "0.99.2";
|
||||
hassVersion = "0.100.3";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -122,7 +127,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "home-assistant";
|
||||
rev = version;
|
||||
sha256 = "0qxdsr7zh2yqzignbhi8gcp67ba6gcp2yiyr1rww33a42r4fi0g5";
|
||||
sha256 = "1rrv71h91qjq5sii4wfcdjvrcpid2aci1dwadrcd35363ff0w200";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -138,10 +143,17 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "aiohttp==3.6.1" "aiohttp" \
|
||||
--replace "attrs==19.2.0" "attrs" \
|
||||
--replace "ruamel.yaml==0.15.100" "ruamel.yaml"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
# The components' dependencies are not included, so they cannot be tested
|
||||
# test_webhook_create_cloudhook imports hass_nabucasa and is thus excluded
|
||||
py.test --ignore tests/components -k "not test_webhook_create_cloudhook"
|
||||
py.test --ignore tests/components -k "not test_webhook_create_cloudhook and not test_webhook_config_flow_registers_webhook"
|
||||
# Some basic components should be tested however
|
||||
py.test \
|
||||
tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \
|
||||
|
||||
60
pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
Normal file
60
pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 411b8a413baf39e9b967949b17a992e81a11abfe Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Tue, 29 Oct 2019 14:08:07 +0100
|
||||
Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain
|
||||
versions
|
||||
|
||||
```
|
||||
File "setup.py", line 63, in <module>
|
||||
if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
|
||||
File
|
||||
"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
|
||||
line 40, in __init__
|
||||
self.parse(vstring)
|
||||
File
|
||||
"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
|
||||
line 137, in parse
|
||||
raise ValueError("invalid version number '%s'" % vstring)
|
||||
ValueError: invalid version number '41.4.0.post20191022'
|
||||
```
|
||||
---
|
||||
setup.py | 15 +--------------
|
||||
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 1f4838c90..831528d77 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -3,7 +3,6 @@ import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
-from distutils.version import StrictVersion
|
||||
from setuptools import find_packages, setup, __version__ as setuptools_version
|
||||
from setuptools.command.test import test as TestCommand
|
||||
|
||||
@@ -56,20 +55,8 @@ install_requires = [
|
||||
|
||||
# Add pywin32 on Windows platforms to handle low-level system calls.
|
||||
# This dependency needs to be added using environment markers to avoid its installation on Linux.
|
||||
-# However environment markers are supported only with setuptools >= 36.2.
|
||||
-# So this dependency is not added for old Linux distributions with old setuptools,
|
||||
-# in order to allow these systems to build certbot from sources.
|
||||
pywin32_req = 'pywin32>=224'
|
||||
-if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
|
||||
- install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
|
||||
-elif 'bdist_wheel' in sys.argv[1:]:
|
||||
- raise RuntimeError('Error, you are trying to build certbot wheels using an old version '
|
||||
- 'of setuptools. Version 36.2+ of setuptools is required.')
|
||||
-elif os.name == 'nt':
|
||||
- # This branch exists to improve this package's behavior on Windows. Without
|
||||
- # it, if the sdist is installed on Windows with an old version of
|
||||
- # setuptools, pywin32 will not be specified as a dependency.
|
||||
- install_requires.append(pywin32_req)
|
||||
+install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
|
||||
|
||||
dev_extras = [
|
||||
'astroid==1.6.5',
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -14,6 +14,7 @@ python37Packages.buildPythonApplication rec {
|
||||
|
||||
patches = [
|
||||
./0001-pebble_artifacts-hardcode-pebble-location.patch
|
||||
./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python37Packages; [
|
||||
|
||||
@ -21,18 +21,18 @@ let
|
||||
sources = name: system: {
|
||||
x86_64-darwin = {
|
||||
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
||||
sha256 = "17gqrfnqbhp9hhlb57nxii18pb5cnxn3k8p2djiw699qkx3aqs13";
|
||||
sha256 = "10h0khh8npj2j5f7h3z86h46zbb1skbfs74firssich6jk7rx6km";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||
sha256 = "1bgvwgyshh0icb07dacrip0q5xs5l2315m1gz5ggz5dhnf0vrz0q";
|
||||
sha256 = "182r9lgpks50ihcrkarc5w6l4rfmpdnx825lazamj5j2jsha73xw";
|
||||
};
|
||||
}.${system};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "google-cloud-sdk";
|
||||
version = "255.0.0";
|
||||
version = "268.0.0";
|
||||
|
||||
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
||||
|
||||
@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
|
||||
# This package contains vendored dependencies. All have free licenses.
|
||||
license = licenses.free;
|
||||
homepage = "https://cloud.google.com/sdk/";
|
||||
maintainers = with maintainers; [ stephenmw zimbatm ];
|
||||
maintainers = with maintainers; [ pradyuman stephenmw zimbatm ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 074b0ca..22f3bc5 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -286,7 +286,7 @@ dependencies = [
|
||||
diff --git i/Cargo.lock w/Cargo.lock
|
||||
index b39a076..03a2757 100644
|
||||
--- i/Cargo.lock
|
||||
+++ w/Cargo.lock
|
||||
@@ -281,7 +281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "pazi"
|
||||
-version = "0.2.0"
|
||||
+version = "0.3.0"
|
||||
-version = "0.3.0"
|
||||
+version = "0.4.0"
|
||||
dependencies = [
|
||||
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pazi";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "euank";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1gnh6047hacavcb9bhps9d1zjns66rdbd158fw20kjp1lln5srrn";
|
||||
sha256 = "1bbci7bvrwl7lsslf302jham1pcw32fi7nwgqyjpfjyzvnpfgndz";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
cargoSha256 = "15s03vwgl6562n5h9r4d5kp2r168jakn5nwnyibmrs8r5q0idmjs";
|
||||
cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5";
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
|
||||
@ -18,11 +18,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2019.10.22";
|
||||
version = "2019.10.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "06wg6wpyq0fawjxjrhd7zasfjr9b6w9wsk2amiqdl712zqlq2rwb";
|
||||
sha256 = "1lq6ycjbx07831s24yx42q6m6svas4mf02vbszw0965dbbzs7vp4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -397,6 +397,8 @@ mapAliases ({
|
||||
vimbWrapper = vimb; # added 2015-01
|
||||
vimprobable2Wrapper = vimprobable2; # added 2015-01
|
||||
virtviewer = virt-viewer; # added 2015-12-24
|
||||
virtmanager = virt-manager; # added 2019-10-29
|
||||
virtmanager-qt = virt-manager-qt; # added 2019-10-29
|
||||
vorbisTools = vorbis-tools; # added 2016-01-26
|
||||
webkit = webkitgtk; # added 2019-03-05
|
||||
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
|
||||
|
||||
@ -21375,12 +21375,12 @@ in
|
||||
|
||||
virt-what = callPackage ../applications/virtualization/virt-what { };
|
||||
|
||||
virtmanager = callPackage ../applications/virtualization/virt-manager {
|
||||
virt-manager = callPackage ../applications/virtualization/virt-manager {
|
||||
dconf = gnome3.dconf;
|
||||
system-libvirt = libvirt;
|
||||
};
|
||||
|
||||
virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
|
||||
virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
|
||||
qtermwidget = lxqt.qtermwidget;
|
||||
};
|
||||
|
||||
|
||||
@ -20,6 +20,12 @@ let
|
||||
|
||||
angstrom = callPackage ../development/ocaml-modules/angstrom { };
|
||||
|
||||
angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };
|
||||
|
||||
angstrom-lwt-unix = callPackage ../development/ocaml-modules/angstrom-lwt-unix { };
|
||||
|
||||
angstrom-unix = callPackage ../development/ocaml-modules/angstrom-unix { };
|
||||
|
||||
ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
|
||||
|
||||
apron = callPackage ../development/ocaml-modules/apron { };
|
||||
@ -225,6 +231,8 @@ let
|
||||
|
||||
earley = callPackage ../development/ocaml-modules/earley { };
|
||||
|
||||
earlybird = callPackage ../development/ocaml-modules/earlybird { };
|
||||
|
||||
easy-format = callPackage ../development/ocaml-modules/easy-format { };
|
||||
|
||||
elina = callPackage ../development/ocaml-modules/elina { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user