Merge master into staging-next
This commit is contained in:
commit
9c2957b47d
|
@ -76,7 +76,11 @@ in
|
|||
# needs newuidmap from pkgs.shadow
|
||||
path = [ "/run/wrappers" ];
|
||||
environment = proxy_env;
|
||||
unitConfig.StartLimitInterval = "60s";
|
||||
unitConfig = {
|
||||
# docker-rootless doesn't support running as root.
|
||||
ConditionUser = "!root";
|
||||
StartLimitInterval = "60s";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = "${cfg.package}/bin/dockerd-rootless --config-file=${daemonSettingsFile}";
|
||||
|
|
36
pkgs/applications/blockchains/fulcrum/default.nix
Normal file
36
pkgs/applications/blockchains/fulcrum/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qmake
|
||||
, python3
|
||||
, qtbase
|
||||
, rocksdb
|
||||
, zeromq
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oywxGg+Ss7qBITI2PBXQs5ph7PZbJ3c1smtT/TcVoLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
buildInputs = [ python3 qtbase rocksdb zeromq ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC";
|
||||
homepage = "https://github.com/cculianu/Fulcrum";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
name = "chrootenv";
|
||||
src = ./.;
|
||||
src = ./src;
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
buildInputs = [ glib ];
|
||||
|
|
|
@ -54,11 +54,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.18beta1";
|
||||
version = "1.18beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-QYwCjbFGmctbLUkHrTpBnXn3ibMZFu+HZIZ+SnjmU6E=";
|
||||
sha256 = "sha256-PLFOLILaNm9zk8mI8fP8LBa3GlSSvT1J01iGzfJ6nRM=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
@ -16,13 +16,13 @@ assert docSupport -> doxygen != null;
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waylandpp";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NilsBrause";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq";
|
||||
sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
|
||||
|
||||
buildDunePackage (rec {
|
||||
pname = "ppxfind";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
|
||||
sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ ocaml-migrate-parsetree ];
|
||||
|
||||
# Don't run the native `strip' when cross-compiling.
|
||||
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/diml/ppxfind";
|
||||
description = "ocamlfind ppx tool";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
} // (
|
||||
if lib.versions.majorMinor ocaml.version == "4.04" then {
|
||||
dontStrip = true;
|
||||
} else {}
|
||||
))
|
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy";
|
||||
vendorSha256 = "sha256-Evn5R/LzripRgG0zOVP/DJrtjwNRwgKapsRdtZaZhlU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Make JSON greppable!";
|
||||
|
|
|
@ -13,7 +13,7 @@ buildGoModule rec {
|
|||
sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz";
|
||||
};
|
||||
|
||||
vendorSha256 = "0dkq240ch1z3gihn8yc5d723nnvfxirk2nhw12r1c2hj1ga088g3";
|
||||
vendorSha256 = "sha256-4yEE1AsSChayCBxaMXPsbls7xGmFeWRhfOMHyAAReDY=";
|
||||
|
||||
# package does not contain any tests as of v0.2.1
|
||||
doCheck = false;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dovecot";
|
||||
version = "2.3.17.1";
|
||||
version = "2.3.18";
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config ];
|
||||
buildInputs =
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1f525bvpjvi4rnwqjsqaqrbdii08sqmc1v8xq03m19w1vk6cqrqw";
|
||||
hash = "sha256-Buc/ZoxsCTxFve7rfCA5irjcSTFyNPS1eBrF4sxdbDM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -3,11 +3,11 @@ let
|
|||
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "dovecot-pigeonhole";
|
||||
version = "0.5.17.1";
|
||||
version = "0.5.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
|
||||
sha256 = "04j5z3y8yyci4ni9j9i7cy0zg1qj2sm9zfarmjcvs9vydpga7i1w";
|
||||
hash = "sha256-ptgo+Nby3sulEFND7OXHplJFvZTkaorkQyptl1QxCKU=";
|
||||
};
|
||||
|
||||
buildInputs = [ dovecot openssl ];
|
||||
|
|
|
@ -15,23 +15,32 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8a68iFbqqKwtZvufu1Vnv6hGHIQ3HU34wjuQsmr1NUA=";
|
||||
sha256 = "sha256-9fNYNhHS9wqrk2bZnrkkGU1OaDu/16RA8fz+Zj9xsyQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i requirements.txt \
|
||||
-e 's!librosa==[^"]*!librosa!' \
|
||||
-e 's!gruut\[.*\]~=2.0.0!gruut!' \
|
||||
-e 's!mecab-python3==[^"]*!mecab-python3!' \
|
||||
-e 's!numba==[^"]*!numba!' \
|
||||
-e 's!numpy==[^"]*!numpy!' \
|
||||
-e 's!umap-learn==[^"]*!umap-learn!'
|
||||
postPatch = let
|
||||
relaxedConstraints = [
|
||||
"gruut"
|
||||
"librosa"
|
||||
"mecab-python3"
|
||||
"numba"
|
||||
"numpy"
|
||||
"umap-learn"
|
||||
"torch"
|
||||
];
|
||||
in ''
|
||||
sed -r -i \
|
||||
${lib.concatStringsSep "\n" (map (package:
|
||||
''-e 's/${package}.*[<>=]+.*/${package}/g' \''
|
||||
) relaxedConstraints)}
|
||||
requirements.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
@ -43,8 +52,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
coqpit
|
||||
flask
|
||||
fsspec
|
||||
gruut
|
||||
gdown
|
||||
gruut
|
||||
inflect
|
||||
jieba
|
||||
librosa
|
||||
|
@ -54,15 +63,17 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pandas
|
||||
pypinyin
|
||||
pysbd
|
||||
pytorch
|
||||
pytorch-bin
|
||||
pyworld
|
||||
scipy
|
||||
soundfile
|
||||
tensorboardx
|
||||
tensorflow
|
||||
torchaudio-bin
|
||||
tqdm
|
||||
umap-learn
|
||||
unidic-lite
|
||||
webrtcvad
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -6211,9 +6211,7 @@ with pkgs;
|
|||
inherit (xorg) libXdmcp;
|
||||
};
|
||||
|
||||
gron = callPackage ../development/tools/gron {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
gron = callPackage ../development/tools/gron { };
|
||||
|
||||
groonga = callPackage ../servers/search/groonga { };
|
||||
|
||||
|
@ -21949,9 +21947,7 @@ with pkgs;
|
|||
|
||||
redstore = callPackage ../servers/http/redstore { };
|
||||
|
||||
reproxy = callPackage ../servers/reproxy {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
reproxy = callPackage ../servers/reproxy { };
|
||||
|
||||
restic = callPackage ../tools/backup/restic { };
|
||||
|
||||
|
@ -22128,9 +22124,7 @@ with pkgs;
|
|||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
|
||||
victoriametrics = callPackage ../servers/nosql/victoriametrics {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
victoriametrics = callPackage ../servers/nosql/victoriametrics { };
|
||||
|
||||
virtiofsd = callPackage ../servers/misc/virtiofsd { };
|
||||
|
||||
|
@ -25126,7 +25120,6 @@ with pkgs;
|
|||
dd-agent = callPackage ../tools/networking/dd-agent/5.nix { };
|
||||
datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
|
||||
pythonPackages = datadog-integrations-core {};
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
|
||||
datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
|
||||
|
@ -27746,9 +27739,7 @@ with pkgs;
|
|||
|
||||
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
|
||||
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
|
||||
|
||||
openshift = callPackage ../applications/networking/cluster/openshift { };
|
||||
|
||||
|
@ -29231,9 +29222,7 @@ with pkgs;
|
|||
|
||||
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
|
||||
|
||||
tendermint = callPackage ../tools/networking/tendermint {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
tendermint = callPackage ../tools/networking/tendermint { };
|
||||
|
||||
termdbms = callPackage ../development/tools/database/termdbms { };
|
||||
|
||||
|
@ -30455,6 +30444,8 @@ with pkgs;
|
|||
|
||||
faraday = callPackage ../applications/blockchains/faraday { };
|
||||
|
||||
fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
|
||||
|
||||
go-ethereum = callPackage ../applications/blockchains/go-ethereum {
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
|
@ -31615,9 +31606,7 @@ with pkgs;
|
|||
|
||||
typespeed = callPackage ../games/typespeed { };
|
||||
|
||||
uchess = callPackage ../games/uchess {
|
||||
buildGoModule = buildGo116Module;
|
||||
};
|
||||
uchess = callPackage ../games/uchess { };
|
||||
|
||||
udig = callPackage ../applications/gis/udig { };
|
||||
|
||||
|
|
|
@ -1055,8 +1055,6 @@ let
|
|||
|
||||
ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };
|
||||
|
||||
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
|
||||
|
||||
ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
|
||||
|
||||
psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };
|
||||
|
|
Loading…
Reference in a new issue