Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-28 18:01:16 +00:00 committed by GitHub
commit 6fcda9f1ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 393 additions and 154 deletions

1
.github/labeler.yml vendored
View file

@ -70,6 +70,7 @@
"6.topic: nixos": "6.topic: nixos":
- nixos/**/* - nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*
"6.topic: ocaml": "6.topic: ocaml":
- doc/languages-frameworks/ocaml.section.md - doc/languages-frameworks/ocaml.section.md

View file

@ -125,6 +125,14 @@
<link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>. <link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<link xlink:href="https://github.com/prometheus/influxdb_exporter">influxdb-exporter</link>
a Prometheus exporter that exports metrics received on an
InfluxDB compatible endpoint is now available as
<link linkend="opt-services.prometheus.exporters.influxdb.enable">services.prometheus.exporters.influxdb</link>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-release-21.11-incompatibilities"> <section xml:id="sec-release-21.11-incompatibilities">

View file

@ -39,6 +39,8 @@ pt-services.clipcat.enable).
- [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable). - [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable).
- [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities} ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1

View file

@ -33,6 +33,7 @@ let
"domain" "domain"
"dovecot" "dovecot"
"fritzbox" "fritzbox"
"influxdb"
"json" "json"
"jitsi" "jitsi"
"kea" "kea"

View file

@ -0,0 +1,34 @@
{ config, lib, pkgs, options }:
with lib;
let
cfg = config.services.prometheus.exporters.influxdb;
in
{
port = 9122;
extraOpts = {
sampleExpiry = mkOption {
type = types.str;
default = "5m";
example = "10m";
description = "How long a sample is valid for";
};
udpBindAddress = mkOption {
type = types.str;
default = ":9122";
example = "192.0.2.1:9122";
description = "Address on which to listen for udp packets";
};
};
serviceOpts = {
serviceConfig = {
RuntimeDirectory = "prometheus-influxdb-exporter";
ExecStart = ''
${pkgs.prometheus-influxdb-exporter}/bin/influxdb_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--influxdb.sample-expiry ${cfg.sampleExpiry} ${concatStringsSep " " cfg.extraFlags}
'';
};
};
}

View file

@ -273,6 +273,26 @@ let
''; '';
}; };
influxdb = {
exporterConfig = {
enable = true;
sampleExpiry = "3s";
};
exporterTest = ''
wait_for_unit("prometheus-influxdb-exporter.service")
succeed(
"curl -XPOST http://localhost:9122/write --data-binary 'influxdb_exporter,distro=nixos,added_in=21.09 value=1'"
)
succeed(
"curl -sSf http://localhost:9122/metrics | grep 'nixos'"
)
execute("sleep 5")
fail(
"curl -sSf http://localhost:9122/metrics | grep 'nixos'"
)
'';
};
jitsi = { jitsi = {
exporterConfig = { exporterConfig = {
enable = true; enable = true;

View file

@ -14,16 +14,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ncspot"; pname = "ncspot";
version = "0.7.3"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrkfdn"; owner = "hrkfdn";
repo = "ncspot"; repo = "ncspot";
rev = "v${version}"; rev = "v${version}";
sha256 = "0lfly3d8pag78pabmna4i6xjwzi65dx1mwfmsk7nx64brq3iypbq"; sha256 = "0sgnd6n8j8lygmb9qvv6i2ir28fdsrpmzlviz7d0gbx684qj0zkc";
}; };
cargoSha256 = "0a6d41ll90fza6k3lixjqzwxim98q6zbkqa3zvxvs7q5ydzg8nsp"; cargoSha256 = "0piipqf5y5bczbwkaplv6niqh3rp2di1gn7wwpd0gaa2cw7ylbb1";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

View file

@ -1,12 +1,28 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost { lib
, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , stdenv
, withGui, python3, jemalloc, zeromq4 }: , mkDerivation
, fetchFromGitHub
with lib; , pkg-config
, cmake
, openssl
, db53
, boost
, zlib
, miniupnpc
, qtbase ? null
, qttools ? null
, util-linux
, protobuf
, qrencode
, libevent
, withGui
, python3
, jemalloc
, zeromq4
}:
mkDerivation rec { mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.21.13"; version = "0.21.13";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -19,11 +35,21 @@ mkDerivation rec {
patches = [ ./fix-bitcoin-qt-build.patch ]; patches = [ ./fix-bitcoin-qt-build.patch ];
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 buildInputs = [
miniupnpc util-linux protobuf libevent ] openssl
++ optionals withGui [ qtbase qttools qrencode ]; db53
boost
zlib
python3
jemalloc
zeromq4
miniupnpc
util-linux
protobuf
libevent
] ++ lib.optionals withGui [ qtbase qttools qrencode ];
cmakeFlags = optionals (!withGui) [ cmakeFlags = lib.optionals (!withGui) [
"-DBUILD_BITCOIN_QT=OFF" "-DBUILD_BITCOIN_QT=OFF"
]; ];
@ -32,9 +58,9 @@ mkDerivation rec {
find ./. -type f -iname "*.sh" -exec chmod +x {} \; find ./. -type f -iname "*.sh" -exec chmod +x {} \;
''; '';
meta = { meta = with lib; {
description = "Peer-to-peer electronic cash system (Cash client)"; description = "Peer-to-peer electronic cash system (Cash client)";
longDescription= '' longDescription = ''
Bitcoin ABC is the name of open source software which enables the use of Bitcoin. Bitcoin ABC is the name of open source software which enables the use of Bitcoin.
It is designed to facilite a hard fork to increase Bitcoin's block size limit. It is designed to facilite a hard fork to increase Bitcoin's block size limit.
"ABC" stands for "Adjustable Blocksize Cap". "ABC" stands for "Adjustable Blocksize Cap".

View file

@ -1,12 +1,24 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost { lib
, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent , stdenv
, withGui }: , fetchFromGitHub
, pkg-config
with lib; , autoreconfHook
, openssl
, db48
, boost
, zlib
, miniupnpc
, qtbase ? null
, qttools ? null
, util-linux
, protobuf
, qrencode
, libevent
, withGui
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic";
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
version = "1.3.8uahf"; version = "1.3.8uahf";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,22 +29,30 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl db48 boost zlib buildInputs = [
miniupnpc util-linux protobuf libevent ] openssl
++ optionals withGui [ qtbase qttools qrencode ]; db48
boost
zlib
miniupnpc
util-linux
protobuf
libevent
] ++ lib.optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt5" ++ lib.optionals withGui [
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" "--with-gui=qt5"
]; "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];
enableParallelBuilding = true; enableParallelBuilding = true;
dontWrapQtApps = true; dontWrapQtApps = true;
meta = { meta = with lib; {
description = "Peer-to-peer electronic cash system (Classic client)"; description = "Peer-to-peer electronic cash system (Classic client)";
longDescription= '' longDescription = ''
Bitcoin is a free open source peer-to-peer electronic cash system that is Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly parties. Users hold the crypto keys to their own money and transact directly

View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.26.77"; version = "1.27.108";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw="; sha256 = "Lz6rNTRoxt/UQFMQ9vurFhXWUshLDfWMxFON4nXfIiY=";
}; };
dontConfigure = true; dontConfigure = true;
@ -124,9 +124,11 @@ stdenv.mkDerivation rec {
ln -sf $BINARYWRAPPER $out/bin/brave ln -sf $BINARYWRAPPER $out/bin/brave
for exe in $out/opt/brave.com/brave/{brave,crashpad_handler}; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}" $out/opt/brave.com/brave/brave --set-rpath "${rpath}" $exe
done
# Fix paths # Fix paths
substituteInPlace $out/share/applications/brave-browser.desktop \ substituteInPlace $out/share/applications/brave-browser.desktop \

View file

@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec { in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser"; pname = "qutebrowser";
version = "2.3.0"; version = "2.3.1";
# the release tarballs are different from the git checkout! # the release tarballs are different from the git checkout!
src = fetchurl { src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "09fz6rd0laisq7pqf9nrllcx58yb129fc05kdk45zrwwggq03b8h"; sha256 = "05n64mw9lzzxpxr7lhakbkm9ir3x8p0rwk6vbbg01aqg5iaanyj0";
}; };
# Needs tox # Needs tox

View file

@ -634,9 +634,10 @@
"owner": "equinix", "owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal", "provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal", "repo": "terraform-provider-metal",
"rev": "v2.1.0", "rev": "v3.0.0",
"sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172", "sha256": "08h1h0rpaxpidhslpq1i4bmc6i48rwcg7fsvwgqc202l5m7yk3wd",
"version": "2.1.0" "vendorSha256": null,
"version": "3.0.0"
}, },
"metalcloud": { "metalcloud": {
"owner": "terraform-providers", "owner": "terraform-providers",

View file

@ -13,21 +13,21 @@
}: }:
let let
version = "1.16.3"; version = "1.16.4";
# Using two URLs as the first one will break as soon as a new version is released # Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl { src_bin = fetchurl {
urls = [ urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
]; ];
hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg="; sha256 = "18kalql846b9ggl3nsz2dpbg51byn8pj0y68fsdcgwwkgvsx7yr2";
}; };
src_oss = fetchurl { src_oss = fetchurl {
urls = [ urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
]; ];
hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0="; sha256 = "0ssg3q1z80652d4gkv1z7kpsxx82xcw6kpsw266c8q4y2n8x7c76";
}; };
in mkDerivation { in mkDerivation {
pname = "makemkv"; pname = "makemkv";

View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "streamlink"; pname = "streamlink";
version = "2.2.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "streamlink"; owner = "streamlink";
repo = "streamlink"; repo = "streamlink";
rev = version; rev = version;
sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v"; sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g=";
}; };
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [
@ -35,9 +35,11 @@ python3.pkgs.buildPythonApplication rec {
ffmpeg ffmpeg
]; ];
disabledTests = [ # note that upstream currently uses requests 2.25.1 in Windows builds
"test_plugin_not_in_removed_list" postPatch = ''
]; substituteInPlace setup.py \
--replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0'
'';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/streamlink/streamlink"; homepage = "https://github.com/streamlink/streamlink";

View file

@ -14,20 +14,21 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "vyper"; pname = "vyper";
version = "0.2.11"; version = "0.2.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU=";
}; };
nativeBuildInputs = [ pytest-runner ]; nativeBuildInputs = [ pytest-runner ];
# Replace the dynamic commit hash lookup with the hash from the tag
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace 'asttokens==' 'asttokens>=' \ --replace 'asttokens==' 'asttokens>=' \
--replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \ --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \
--replace 'commithash.decode("utf-8").strip()' "'069936fa3fee8646ff362145593128d7ef07da38'" --replace 'commithash.decode("utf-8").strip()' "'6e7dba7a8b5f29762d3470da4f44634b819c808d'"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -78,6 +78,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/gcab"; homepage = "https://gitlab.gnome.org/GNOME/gcab";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
let let
version = "0.7.0"; version = "0.7.0";
@ -14,6 +14,15 @@ stdenv.mkDerivation {
sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
}; };
patches = [
(fetchpatch {
name = "CVE-2016-20011.patch";
# https://gitlab.gnome.org/GNOME/libgrss/-/merge_requests/7, not yet merged!
url = "https://gitlab.gnome.org/GNOME/libgrss/-/commit/2c6ea642663e2a44efc8583fae7c54b7b98f72b3.patch";
sha256 = "1ijvq2jl97vphcvrbrqxvszdmv6yyjfygdca9vyaijpafwyzzb18";
})
];
nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ glib libxml2 libsoup ]; buildInputs = [ glib libxml2 libsoup ];

View file

@ -49,21 +49,17 @@ let
version = "5.212.0-alpha4"; version = "5.212.0-alpha4";
}; };
# Even if developed in the public, QtWebEngine does not have official
# releases or new tags since the Qt company made 5.15.3 proprietary.
# Apparently they care more about licensing than the security of their users.
# See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html
qtwebengine = qtwebengine =
let let
branchName = "5.15.3"; branchName = "5.15.5";
rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0"; rev = "v${branchName}-lts";
in in
{ {
version = "${branchName}-${lib.substring 0 7 rev}"; version = "${branchName}-${lib.substring 0 7 rev}";
src = fetchgit { src = fetchgit {
url = "https://github.com/qt/qtwebengine.git"; url = "https://github.com/qt/qtwebengine.git";
sha256 = "1vdgxfbmx4z4qrm2g61dl64gqn3fv5f83jwpp7h1gyfx5z2qvfmv"; sha256 = "12wf30d34sgn82mbz91xybxyn3j1mhvxda452cfkxm232n1f2kjb";
inherit rev branchName; inherit rev branchName;
fetchSubmodules = true; fetchSubmodules = true;
leaveDotGit = true; leaveDotGit = true;
@ -125,11 +121,6 @@ let
qtscript = [ ./qtscript.patch ]; qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ]; qtserialport = [ ./qtserialport.patch ];
qtwebengine = [ qtwebengine = [
# Fix crashes with non en_US.UTF-8 locales
(fetchpatch {
url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch";
sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2";
})
# Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074 # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch"; url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch";

View file

@ -166,7 +166,7 @@ qtModule {
# X11 libs # X11 libs
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
xorg.libXcomposite xorg.libXdamage libdrm xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile
] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [
# Pipewire # Pipewire

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "buf"; pname = "buf";
version = "0.44.0"; version = "0.46.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bufbuild"; owner = "bufbuild";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ZcZvsFw/l/7N8Yb4HG6w96ce9c4g4iiG/TcDoj8RYmA="; sha256 = "sha256-5mjk31HuPNO/RhmMhIm3dAZAED/Kk33ObjC8KbPKRxk=";
leaveDotGit = true; # Required by TestWorkspaceGit leaveDotGit = true; # Required by TestWorkspaceGit
}; };
vendorSha256 = "sha256-g0wrHPeHFOL6KB0SUgBy2WK54Kttiks4cuYg8jf3N9g="; vendorSha256 = "sha256-K8UZDEhAvD292RCEDKfY9PdZGS389vLF3oukcBndUF4=";
patches = [ patches = [
# Skip a test that requires networking to be available to work. # Skip a test that requires networking to be available to work.

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "conftest"; pname = "conftest";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "conftest"; repo = "conftest";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pxPqBUOsXbP9giaV5NS3a6Z6auN4vUTIrIKcNh8xURU="; sha256 = "sha256-AIFZhe0N6FT06IrDVF2OVfSwmQVg62ZglOcnnDL9TK8=";
}; };
vendorSha256 = "sha256-y8DRrthaUzMKxFbdbASvqsRMT+jex7jMJA6g7YF/VxI="; vendorSha256 = "sha256-7wj1n5ggYYrmMrDuQkbbJ2C1S1LHawkkj91owHDIwr0=";
doCheck = false; doCheck = false;
@ -36,6 +36,6 @@ buildGoModule rec {
''; '';
inherit (src.meta) homepage; inherit (src.meta) homepage;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ yurrriq ]; maintainers = with maintainers; [ yurrriq jk ];
}; };
} }

View file

@ -59,7 +59,8 @@ stdenv.mkDerivation rec {
bzip2 bzip2
]; ];
doCheck = true; # WiX tests fail on darwin
doCheck = !stdenv.isDarwin;
postPatch = '' postPatch = ''
patchShebangs subprojects/bats-core/{bin,libexec} patchShebangs subprojects/bats-core/{bin,libexec}

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "usbsdmux"; pname = "usbsdmux";
version = "0.2.0"; version = "0.2.1";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-ydDUSqBTY62iOtWdgrFh2qrO9LMi+OCYIw5reh6uoIA="; sha256 = "sha256-gCxwR5jxzkH22B6nxBwAd0HpwWMIj/zp5VROJ0IWq7c=";
}; };
# usbsdmux is not meant to be used as an importable module and has no tests # usbsdmux is not meant to be used as an importable module and has no tests

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "open-policy-agent"; pname = "open-policy-agent";
version = "0.30.2"; version = "0.31.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "opa"; repo = "opa";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pyqG8k2jHUhYZ1ftfAjxpJ4H1P1uWfqSdGcyR7pw1rE="; sha256 = "sha256-SUMTyqzeaCTj/fVdDHFZkh43t+mIFGNt6wendOt9gfw=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -5,13 +5,13 @@
}: }:
let let
version = "0.3.4"; version = "0.3.4.1";
openrct2-src = fetchFromGitHub { openrct2-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "OpenRCT2"; repo = "OpenRCT2";
rev = "v${version}"; rev = "v${version}";
sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4"; sha256 = "0zjqn47pbgd2nrrbdl3lqk1mcdvwvvpjby2g0gfv6ssfw72fji7d";
}; };
objects-src = fetchFromGitHub { objects-src = fetchFromGitHub {

View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.13.5"; version = "5.13.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,9 +13,8 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0lqh7krxxnbrvr3w1kag92z9r4n9436fr6answjkjfbvw0z7q74m"; sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
} // (args.argsOverride or { })) } // (args.argsOverride or { }))

View file

@ -4,6 +4,7 @@ if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi;
set -e set -e
set -o pipefail set -o pipefail
shopt -s inherit_errexit
export PATH=@path@:$PATH export PATH=@path@:$PATH

View file

@ -0,0 +1,38 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "influxdb_exporter";
version = "0.8.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "influxdb_exporter";
sha256 = "sha256-aNj4ru3yDet+jdcEpckFVaymmjWmKzTMPcTxPMNFbgo=";
};
vendorSha256 = null;
buildFlagsArray = let
goPackagePath = "github.com/prometheus/influxdb_exporter";
in ''
-ldflags=
-s -w
-X github.com/prometheus/common/version.Version=${version}
-X github.com/prometheus/common/version.Revision=${rev}
-X github.com/prometheus/common/version.Branch=unknown
-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
-X github.com/prometheus/common/version.BuildDate=unknown
'';
passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; };
meta = with lib; {
description = "Prometheus exporter that accepts InfluxDB metrics";
homepage = "https://github.com/prometheus/influxdb_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
platforms = platforms.unix;
};
}

View file

@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap
index 0d88ffe..814a436 100644 index 0d88ffe..814a436 100644
--- a/lib/googlecloudsdk/api_lib/sql/instances.py --- a/lib/googlecloudsdk/api_lib/sql/instances.py
+++ b/lib/googlecloudsdk/api_lib/sql/instances.py +++ b/lib/googlecloudsdk/api_lib/sql/instances.py
@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone): @@ -85,18 +85,19 @@ def GetRegionFromZone(gce_zone):
def _GetCloudSqlProxyPath(): def _GetCloudSqlProxyPath():
"""Determines the path to the cloud_sql_proxy binary.""" """Determines the path to the cloud_sql_proxy binary."""
sdk_bin_path = config.Paths().sdk_bin_path sdk_bin_path = config.Paths().sdk_bin_path
@ -14,7 +14,7 @@ index 0d88ffe..814a436 100644
- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) - 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
- return proxy_path - return proxy_path
- else: - else:
- raise exceptions.ToolException( - raise sql_exceptions.SqlProxyNotFound(
- 'A Cloud SQL Proxy SDK root could not be found. Please check your ' - 'A Cloud SQL Proxy SDK root could not be found. Please check your '
- 'installation.') - 'installation.')
- return os.path.join(sdk_bin_path, 'cloud_sql_proxy') - return os.path.join(sdk_bin_path, 'cloud_sql_proxy')
@ -28,7 +28,7 @@ index 0d88ffe..814a436 100644
+ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) + 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
+ return proxy_path + return proxy_path
+ +
+ raise exceptions.ToolException( + raise sql_exceptions.SqlProxyNotFound(
+ 'A Cloud SQL Proxy SDK root could not be found. Please check your ' + 'A Cloud SQL Proxy SDK root could not be found. Please check your '
+ 'installation.') + 'installation.')

View file

@ -21,23 +21,23 @@ let
sources = name: system: { sources = name: system: {
x86_64-darwin = { x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs"; sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "${baseUrl}/${name}-darwin-arm.tar.gz"; url = "${baseUrl}/${name}-darwin-arm.tar.gz";
sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr"; sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla";
}; };
x86_64-linux = { x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3"; sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6";
}; };
}.${system}; }.${system};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "google-cloud-sdk"; pname = "google-cloud-sdk";
version = "348.0.0"; version = "350.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

View file

@ -0,0 +1,32 @@
{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }:
mkDerivation rec {
pname = "coreshot";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8=";
};
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtbase
qtx11extras
libcprime
];
meta = with lib; {
description = "A screen capture utility from the C Suite";
homepage = "https://gitlab.com/cubocore/coreapps/coreshot";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "proxify"; pname = "proxify";
version = "0.0.3"; version = "0.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "proxify"; repo = "proxify";
rev = "v${version}"; rev = "v${version}";
sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn"; sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s";
}; };
vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig"; vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx";
meta = with lib; { meta = with lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture"; description = "Proxy tool for HTTP/HTTPS traffic capture";

View file

@ -2,11 +2,12 @@
assert stdenv.isLinux && stdenv ? glibc; assert stdenv.isLinux && stdenv ? glibc;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "checkinstall-1.6.2"; pname = "checkinstall";
version = "1.6.2";
src = fetchurl { src = fetchurl {
url = "http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz"; url = "https://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-${version}.tar.gz";
sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw"; sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw";
}; };

View file

@ -1,9 +1,10 @@
{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "DisnixWebService-0.10.1"; pname = "DisnixWebService";
version = "0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz"; url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-${version}/DisnixWebService-${version}.tar.gz";
sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr";
}; };
buildInputs = [ apacheAnt jdk ]; buildInputs = [ apacheAnt jdk ];

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: { lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "disnix-0.10.1"; pname = "disnix";
version = "0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz"; url = "https://github.com/svanderburg/disnix/releases/download/disnix-${version}/disnix-${version}.tar.gz";
sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq";
}; };

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "disnixos-0.9.1"; pname = "disnixos";
version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz"; url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-${version}/disnixos-${version}.tar.gz";
sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b";
}; };

View file

@ -38,10 +38,11 @@ assert enableNginxWebApplication -> nginx != null;
assert enableS6RCService -> s6-rc != null; assert enableS6RCService -> s6-rc != null;
assert enableXinetdService -> xinetd != null; assert enableXinetdService -> xinetd != null;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "dysnomia-0.10.1"; pname = "dysnomia";
version = "0.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-${version}/dysnomia-${version}.tar.gz";
sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3";
}; };

View file

@ -16,7 +16,8 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-serve-0.2-${substring 0 7 rev}"; pname = "nix-serve";
version = "0.2-${substring 0 7 rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "edolstra"; owner = "edolstra";

View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit }: { lib, stdenv, fetchgit }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "opkg-utils-20141030"; pname = "opkg-utils";
version = "unstable-2014-10-30";
# No releases, only a git tree # No releases, only a git tree
src = fetchgit { src = fetchgit {

View file

@ -3910,6 +3910,8 @@ in
coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; coregarage = libsForQt5.callPackage ../applications/misc/coregarage { };
coreshot = libsForQt5.callPackage ../tools/misc/coreshot { };
c14 = callPackage ../applications/networking/c14 { }; c14 = callPackage ../applications/networking/c14 { };
corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; corehunt = libsForQt5.callPackage ../applications/misc/corehunt { };
@ -20165,6 +20167,7 @@ in
prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { };
prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };
prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
@ -28588,38 +28591,60 @@ in
balanceofsatoshis = nodePackages.balanceofsatoshis; balanceofsatoshis = nodePackages.balanceofsatoshis;
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; miniupnpc = miniupnpc_2;
withGui = true;
};
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; bitcoind = callPackage ../applications/blockchains/bitcoin {
miniupnpc = miniupnpc_2;
withGui = false;
};
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; };
cgminer = callPackage ../applications/blockchains/cgminer { }; cgminer = callPackage ../applications/blockchains/cgminer { };
chia = callPackage ../applications/blockchains/chia { }; chia = callPackage ../applications/blockchains/chia { };
clightning = callPackage ../applications/blockchains/clightning.nix { }; clightning = callPackage ../applications/blockchains/clightning { };
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165;
withGui = true;
};
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {
boost = boost165; boost = boost165;
mkDerivation = stdenv.mkDerivation; mkDerivation = stdenv.mkDerivation;
withGui = false; withGui = false;
}; };
bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited {
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
withGui = true; withGui = true;
}; };
bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited {
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
withGui = false; withGui = false;
}; };
bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic {
bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; boost = boost165;
withGui = true;
};
bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic {
boost = boost165;
withGui = false;
};
bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold {
bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; boost = boost165;
withGui = true;
};
bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold {
boost = boost165;
withGui = false;
};
btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
@ -28627,25 +28652,37 @@ in
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
dashpay = callPackage ../applications/blockchains/dashpay.nix { }; dashpay = callPackage ../applications/blockchains/dashpay { };
dcrd = callPackage ../applications/blockchains/dcrd.nix { }; dcrd = callPackage ../applications/blockchains/dcrd { };
dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; dero = callPackage ../applications/blockchains/dero { boost = boost165; };
digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; };
digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; };
dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoin = callPackage ../applications/blockchains/dogecoin {
dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; boost = boost165;
withGui = true;
};
dogecoind = callPackage ../applications/blockchains/dogecoin {
boost = boost165;
withGui = false;
};
eclair = callPackage ../applications/blockchains/eclair.nix { }; eclair = callPackage ../applications/blockchains/eclair { };
electrs = callPackage ../applications/blockchains/electrs.nix { }; electrs = callPackage ../applications/blockchains/electrs { };
elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; elements = libsForQt5.callPackage ../applications/blockchains/elements {
elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; miniupnpc = miniupnpc_2;
withGui = true;
};
elementsd = callPackage ../applications/blockchains/elements {
miniupnpc = miniupnpc_2;
withGui = false;
};
ergo = callPackage ../applications/blockchains/ergo { }; ergo = callPackage ../applications/blockchains/ergo { };
@ -28653,7 +28690,7 @@ in
faraday = callPackage ../applications/blockchains/faraday { }; faraday = callPackage ../applications/blockchains/faraday { };
go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { go-ethereum = callPackage ../applications/blockchains/go-ethereum {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit;
}; };
@ -28666,18 +28703,18 @@ in
lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; lightning-pool = callPackage ../applications/blockchains/lightning-pool { };
litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin {
inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin.apple_sdk.frameworks) AppKit;
}; };
litecoind = litecoin.override { withGui = false; }; litecoind = litecoin.override { withGui = false; };
livedl = callPackage ../tools/misc/livedl { }; livedl = callPackage ../tools/misc/livedl { };
lnd = callPackage ../applications/blockchains/lnd.nix { }; lnd = callPackage ../applications/blockchains/lnd { };
lndconnect = callPackage ../applications/blockchains/lndconnect { }; lndconnect = callPackage ../applications/blockchains/lndconnect { };
lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; lndmanage = callPackage ../applications/blockchains/lndmanage { };
monero = callPackage ../applications/blockchains/monero { monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
@ -28692,17 +28729,17 @@ in
boost = boost17x; boost = boost17x;
}; };
masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; masari = callPackage ../applications/blockchains/masari { boost = boost165; };
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; };
pivxd = callPackage ../applications/blockchains/pivx.nix { pivxd = callPackage ../applications/blockchains/pivx {
withGui = false; withGui = false;
autoreconfHook = buildPackages.autoreconfHook269; autoreconfHook = buildPackages.autoreconfHook269;
}; };
@ -28711,22 +28748,28 @@ in
pycoin = with python3Packages; toPythonApplication pycoin; pycoin = with python3Packages; toPythonApplication pycoin;
stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; stellar-core = callPackage ../applications/blockchains/stellar-core { };
sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost165; };
tessera = callPackage ../applications/blockchains/tessera.nix { }; tessera = callPackage ../applications/blockchains/tessera { };
turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { }; turbo-geth = callPackage ../applications/blockchains/turbo-geth { };
vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin {
vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; boost = boost165;
withGui = true;
};
vertcoind = callPackage ../applications/blockchains/vertcoin {
boost = boost165;
withGui = false;
};
wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; };
wownero = callPackage ../applications/blockchains/wownero.nix {}; wownero = callPackage ../applications/blockchains/wownero { };
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
@ -28738,9 +28781,9 @@ in
polkadot = callPackage ../applications/blockchains/polkadot { }; polkadot = callPackage ../applications/blockchains/polkadot { };
particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
quorum = callPackage ../applications/blockchains/quorum.nix { }; quorum = callPackage ../applications/blockchains/quorum { };
whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { };
@ -30427,7 +30470,7 @@ in
cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet.nix { }; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
caprice32 = callPackage ../misc/emulators/caprice32 { }; caprice32 = callPackage ../misc/emulators/caprice32 { };
@ -32505,7 +32548,7 @@ in
fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {};
btcdeb = callPackage ../applications/blockchains/btcdeb {}; btcdeb = callPackage ../applications/blockchains/btcdeb { };
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };