Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5917794eda
@ -660,6 +660,7 @@
|
||||
./services/monitoring/do-agent.nix
|
||||
./services/monitoring/fusion-inventory.nix
|
||||
./services/monitoring/grafana.nix
|
||||
./services/monitoring/grafana-agent.nix
|
||||
./services/monitoring/grafana-image-renderer.nix
|
||||
./services/monitoring/grafana-reporter.nix
|
||||
./services/monitoring/graphite.nix
|
||||
|
||||
152
nixos/modules/services/monitoring/grafana-agent.nix
Normal file
152
nixos/modules/services/monitoring/grafana-agent.nix
Normal file
@ -0,0 +1,152 @@
|
||||
{ lib, pkgs, config, generators, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.grafana-agent;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
configFile = settingsFormat.generate "grafana-agent.yaml" cfg.settings;
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
|
||||
options.services.grafana-agent = {
|
||||
enable = mkEnableOption "grafana-agent";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.grafana-agent;
|
||||
defaultText = "pkgs.grafana-agent";
|
||||
description = "The grafana-agent package to use.";
|
||||
};
|
||||
|
||||
credentials = mkOption {
|
||||
description = ''
|
||||
Credentials to load at service startup. Keys that are UPPER_SNAKE will be loaded as env vars. Values are absolute paths to the credentials.
|
||||
'';
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
|
||||
example = {
|
||||
logs_remote_write_password = "/run/keys/grafana_agent_logs_remote_write_password";
|
||||
LOGS_REMOTE_WRITE_URL = "/run/keys/grafana_agent_logs_remote_write_url";
|
||||
LOGS_REMOTE_WRITE_USERNAME = "/run/keys/grafana_agent_logs_remote_write_username";
|
||||
metrics_remote_write_password = "/run/keys/grafana_agent_metrics_remote_write_password";
|
||||
METRICS_REMOTE_WRITE_URL = "/run/keys/grafana_agent_metrics_remote_write_url";
|
||||
METRICS_REMOTE_WRITE_USERNAME = "/run/keys/grafana_agent_metrics_remote_write_username";
|
||||
};
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
description = ''
|
||||
Configuration for <package>grafana-agent</package>.
|
||||
|
||||
See https://grafana.com/docs/agent/latest/configuration/
|
||||
'';
|
||||
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
};
|
||||
|
||||
default = {
|
||||
server = {
|
||||
# Don't bind on 0.0.0.0
|
||||
grpc_listen_address = "127.0.0.1";
|
||||
http_listen_address = "127.0.0.1";
|
||||
# Don't bind on the default port 80
|
||||
http_listen_port = 9090;
|
||||
};
|
||||
prometheus = {
|
||||
wal_directory = "\${STATE_DIRECTORY}";
|
||||
global.scrape_interval = "5s";
|
||||
};
|
||||
integrations = {
|
||||
agent.enabled = true;
|
||||
agent.scrape_integration = true;
|
||||
node_exporter.enabled = true;
|
||||
replace_instance_label = true;
|
||||
};
|
||||
};
|
||||
|
||||
example = {
|
||||
loki.configs = [{
|
||||
name = "default";
|
||||
scrape_configs = [
|
||||
{
|
||||
job_name = "journal";
|
||||
journal = {
|
||||
max_age = "12h";
|
||||
labels.job = "systemd-journal";
|
||||
};
|
||||
relabel_configs = [
|
||||
{
|
||||
source_labels = [ "__journal__systemd_unit" ];
|
||||
target_label = "systemd_unit";
|
||||
}
|
||||
{
|
||||
source_labels = [ "__journal__hostname" ];
|
||||
target_label = "nodename";
|
||||
}
|
||||
{
|
||||
source_labels = [ "__journal_syslog_identifier" ];
|
||||
target_label = "syslog_identifier";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
positions.filename = "\${STATE_DIRECTORY}/loki_positions.yaml";
|
||||
clients = [{
|
||||
url = "\${LOGS_REMOTE_WRITE_URL}";
|
||||
basic_auth.username = "\${LOGS_REMOTE_WRITE_USERNAME}";
|
||||
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/logs_remote_write_password";
|
||||
}];
|
||||
}];
|
||||
integrations = {
|
||||
prometheus_remote_write = [{
|
||||
url = "\${METRICS_REMOTE_WRITE_URL}";
|
||||
basic_auth.username = "\${METRICS_REMOTE_WRITE_USERNAME}";
|
||||
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/metrics_remote_write_password";
|
||||
}];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.grafana-agent = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = ''
|
||||
set -euo pipefail
|
||||
shopt -u nullglob
|
||||
|
||||
# Load all credentials into env if they are in UPPER_SNAKE form.
|
||||
if [[ -n "''${CREDENTIALS_DIRECTORY:-}" ]]; then
|
||||
for file in "$CREDENTIALS_DIRECTORY"/*; do
|
||||
key=$(basename "$file")
|
||||
if [[ $key =~ ^[A-Z0-9_]+$ ]]; then
|
||||
echo "Environ $key"
|
||||
export "$key=$(< "$file")"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part.
|
||||
export HOSTNAME=$(< /proc/sys/kernel/hostname)
|
||||
|
||||
exec ${cfg.package}/bin/agent -config.expand-env -config.file ${configFile}
|
||||
'';
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
DynamicUser = true;
|
||||
RestartSec = 2;
|
||||
SupplementaryGroups = [
|
||||
# allow to read the systemd journal for loki log forwarding
|
||||
"systemd-journal"
|
||||
];
|
||||
StateDirectory = "grafana-agent";
|
||||
LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials;
|
||||
Type = "simple";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -189,6 +189,7 @@ in {
|
||||
google-oslogin = handleTest ./google-oslogin {};
|
||||
gotify-server = handleTest ./gotify-server.nix {};
|
||||
grafana = handleTest ./grafana.nix {};
|
||||
grafana-agent = handleTest ./grafana-agent.nix {};
|
||||
graphite = handleTest ./graphite.nix {};
|
||||
graylog = handleTest ./graylog.nix {};
|
||||
grocy = handleTest ./grocy.nix {};
|
||||
|
||||
32
nixos/tests/grafana-agent.nix
Normal file
32
nixos/tests/grafana-agent.nix
Normal file
@ -0,0 +1,32 @@
|
||||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
nodes = {
|
||||
machine = {
|
||||
services.grafana-agent = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "grafana-agent";
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ zimbatm ];
|
||||
};
|
||||
|
||||
inherit nodes;
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
with subtest("Grafana-agent is running"):
|
||||
machine.wait_for_unit("grafana-agent.service")
|
||||
machine.wait_for_open_port(9090)
|
||||
machine.succeed(
|
||||
"curl -sSfN http://127.0.0.1:9090/-/healthy"
|
||||
)
|
||||
machine.shutdown()
|
||||
'';
|
||||
})
|
||||
@ -32,6 +32,14 @@ let
|
||||
maintainers = [ synthetica turion ];
|
||||
};
|
||||
enableOCR = true;
|
||||
|
||||
# testScriptWithTypes:55: error: Item "function" of
|
||||
# "Union[Callable[[Callable[..., Any]], ContextManager[Any]], ContextManager[Any]]"
|
||||
# has no attribute "__enter__"
|
||||
# with codium_running:
|
||||
# ^
|
||||
skipTypeCheck = true;
|
||||
|
||||
testScript = ''
|
||||
@polling_condition
|
||||
def codium_running():
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.54";
|
||||
version = "1.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lNiQ0X2vvPGubb4Pde+eh0Z6ClCQgigIUM+PddaiVUg=";
|
||||
sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
versions = {
|
||||
atom = {
|
||||
version = "1.58.0";
|
||||
sha256 = "sha256-QxDhr4gwlS9O/lk0nfqsw5sFiPckSTFL15XtRpQh0tU=";
|
||||
version = "1.60.0";
|
||||
sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY=";
|
||||
};
|
||||
|
||||
atom-beta = {
|
||||
version = "1.59.0";
|
||||
version = "1.61.0";
|
||||
beta = 0;
|
||||
sha256 = "sha256-s1XHR2e4JPywdLiIcjTqMRILARDthHxBeTQOCIkhmXE=";
|
||||
sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY=";
|
||||
broken = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -14,11 +14,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1ns4cpkihbrwgh8pvn1kjlnipssinjkxy28szidnz6q71zyvsjyw";
|
||||
x86_64-darwin = "05v0gxal74igc29qjy0ficlyna17bzh1lpfqvyxdpg22is894h2l";
|
||||
aarch64-linux = "1x6lhcvdly3a2n0shp2vlgk3s2pj9byxn9dc9pjg4k5ff24dql7l";
|
||||
aarch64-darwin = "03knkj0y6n45lin0v6288zbq1nz5qh81ijyw1w3zrpd7pijn9j0x";
|
||||
armv7l-linux = "0iwlr5q1qwq3jgldrhz4bbyl3xmdhd4ss690x1lqb4vxm2m7v5jw";
|
||||
x86_64-linux = "0k3m6gdmcv5blfczb7wnvsslq9sx07rbmzbs1q1yf9mb5q916dcf";
|
||||
x86_64-darwin = "0074vrjvv52gss0cibgkfkkf6g5fjcwjhz8bpl4b42j07qryh642";
|
||||
aarch64-linux = "1ps8ql740832gdjx7kwsi8akbdgk7lx1l85hg1aa5qwgm65xcb0g";
|
||||
aarch64-darwin = "1gqzwy5fkmbw2zmcgiakczr51zv9rlkhp7aq182p43jrsk6lqqnn";
|
||||
armv7l-linux = "0km1vjd2jnl9kxfxz52fkf2jkqhx121jngxjcy581fhnipp268zb";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
@ -28,7 +28,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.67.2";
|
||||
version = "1.68.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "487";
|
||||
version = "488d";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-4FYUIEk8KJO4nqONNpLUtxAMud3vdfl50zbKQxC5Hw4=";
|
||||
sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pixinsight";
|
||||
version = "1.8.9";
|
||||
version = "1.8.9-1";
|
||||
|
||||
src = requireFile rec {
|
||||
name = "PI-linux-x64-${version}-20220313-c.tar.xz";
|
||||
name = "PI-linux-x64-${version}-20220518-c.tar.xz";
|
||||
url = "https://pixinsight.com/";
|
||||
sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU=";
|
||||
sha256 = "sha256-AVeDJ7YYqCo7KfelUUQurjglNnTwCf0pOzJCV/bQrrw=";
|
||||
message = ''
|
||||
PixInsight is available from ${url} and requires a commercial (or trial) license.
|
||||
After a license has been obtained, PixInsight can be downloaded from the software distribution
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "100.0.2-1",
|
||||
"packageVersion": "101.0.1-1",
|
||||
"source": {
|
||||
"rev": "100.0.2-1",
|
||||
"sha256": "1hss4kvy4n4wxwlbb0pk7f02qra1dk8xgc6v6xqg252i7453vg9d"
|
||||
"rev": "101.0.1-1",
|
||||
"sha256": "1b4zrfi5ig2aywsrfblxznds894ib8gx66yjm8n4hxmpsinmqfp9"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "100.0.2",
|
||||
"sha512": "6d9922e35e496fa63833ba03d1466e075287e40e50854ddc4f4a2036d9c7ca1f35c03bc6f708a3c469e0ec3b389b3346ac754bb84df0fecb86955fc21c05e00f"
|
||||
"version": "101.0.1",
|
||||
"sha512": "435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4"
|
||||
}
|
||||
}
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0SKBy78a+GxyN1/mrZNG7Q4sLziKHq6FjOzmQGCm66g=";
|
||||
sha256 = "rnzGOq6WoCqlmbbWo0hYX0529ylTbznvt0QwKwW1+70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-o8hQgDO/tjqLSKBirB5nssMzugFTh5s4xmGWihA60Vw=";
|
||||
sha256 = "sha256-5W1KjNy86KjxwIgbRd55n4slIF7Ay/ImnlMgJXYcxdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, qt4, cmake }:
|
||||
|
||||
let
|
||||
baseName = "libdbusmenu-qt";
|
||||
v = "0.9.2";
|
||||
homepage = "https://launchpad.net/${baseName}";
|
||||
name = "${baseName}-${v}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2";
|
||||
sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [ "-DWITH_DOC=OFF" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides a Qt implementation of the DBusMenu spec";
|
||||
inherit homepage;
|
||||
inherit (qt4.meta) platforms;
|
||||
license = licenses.lgpl2;
|
||||
};
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtscriptgenerator";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qtscriptgenerator/qtscriptgenerator-src-${version}.tar.gz";
|
||||
sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6";
|
||||
};
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# remove phonon stuff which causes errors (thanks to Gentoo bug reports)
|
||||
sed -i "/typesystem_phonon.xml/d" generator/generator.qrc
|
||||
sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
( cd generator; qmake )
|
||||
( cd qtbindings; qmake )
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
makeFlags="SHELL=$SHELL ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}"
|
||||
make $makeFlags -C generator
|
||||
|
||||
# Set QTDIR, see https://code.google.com/archive/p/qtscriptgenerator/issues/38
|
||||
( cd generator; QTDIR=${qt4} ./generator )
|
||||
make $makeFlags -C qtbindings
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/qt4/plugins/script
|
||||
cp -av plugins/script/* $out/lib/qt4/plugins/script
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "QtScript bindings generator";
|
||||
homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/";
|
||||
inherit (qt4.meta) platforms;
|
||||
license = lib.licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD
|
||||
diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
|
||||
--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600
|
||||
+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600
|
||||
@@ -2233,7 +2233,6 @@
|
||||
|
||||
|
||||
</object-type>
|
||||
- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/>
|
||||
<object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut">
|
||||
<modify-function signature="reason()const">
|
||||
<remove/>
|
||||
diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml
|
||||
--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600
|
||||
+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600
|
||||
@@ -2555,7 +2555,6 @@
|
||||
|
||||
|
||||
</object-type>
|
||||
- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/>
|
||||
<object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut">
|
||||
<modify-function signature="reason()const">
|
||||
<remove/>
|
||||
@ -1,11 +0,0 @@
|
||||
diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
|
||||
--- qtscriptgenerator-src-0.1.0/generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100
|
||||
+++ qtscriptgenerator-src-0.1.0/generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <cctype>
|
||||
|
||||
#include <fcntl.h>
|
||||
+#include <cstdio>
|
||||
|
||||
#ifdef HAVE_MMAP
|
||||
# include <sys/mman.h>
|
||||
@ -32,6 +32,7 @@
|
||||
, "audiosprite"
|
||||
, "autoprefixer"
|
||||
, "aws-azure-login"
|
||||
, "aws-cdk"
|
||||
, "awesome-lint"
|
||||
, "balanceofsatoshis"
|
||||
, "bash-language-server"
|
||||
|
||||
2922
pkgs/development/node-packages/node-packages.nix
generated
2922
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-qjAaW7YYmzGBNpc8T5RyOdP5evkKOdzUGzQ9JXKioxw=";
|
||||
hash = "sha256-NJxklOpIbSbi/SB/rafBNllpnNb1yWLVpyB2f/U0i78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "2.0.2";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Ozf3qmD9JRH19N/eERhDHz4LUoWwCVepLbSRCg6lWnQ=";
|
||||
sha256 = "sha256-ThUkDCoRKefAqTmOxCk9W9LZlCqUU+jxF0egjthH4JI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "container-inspector";
|
||||
version = "31.0.0";
|
||||
version = "31.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-44sTZelCT6sGPyMteJZBcPRReTHuO1ZUxeQ0Vp7Zmqo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-debian";
|
||||
version = "0.1.43";
|
||||
version = "0.1.44";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "abc702511c4e268da49c22fd97c83de355c559f3271e0798a6b67964be3d8248";
|
||||
sha256 = "sha256-ZVkv47ZPbGyT2U4tJZnbXgwigx07z/B8t7ltOECxMz4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ chardet ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discogs-client";
|
||||
version = "2.3.14";
|
||||
version = "2.3.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "joalla";
|
||||
repo = "discogs_client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HJxqTwZ9byjZxdftQPTkVo0Ufio9gNGH69q5Q2gYR00=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-teI0sbvluwVFmEOL/V1zLNGFVbeM7QzZ9rCOl3+A+aY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "osmpythontools";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mocnik-science";
|
||||
repo = "osm-python-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7r42b/B9h7cMgM+wFS0Fink/3WjUNvz+PwLn3C5hawc=";
|
||||
sha256 = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -55,6 +55,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/mocnik-science/osm-python-tools";
|
||||
license = licenses.gpl3Only;
|
||||
changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md";
|
||||
maintainers = with maintainers; [ das-g ];
|
||||
maintainers = with maintainers; [ das-g erictapen ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-eytv61aTGL6rTLHfZD9Tsl9FycdExo+TGsVBCNu1fIo=";
|
||||
sha256 = "sha256-2ESoMJtoh0f7E427q7IFZZJW2ZcwgnjFDasKbHyF844=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -27,21 +27,20 @@ let
|
||||
yaehmop = fetchFromGitHub {
|
||||
owner = "greglandrum";
|
||||
repo = "yaehmop";
|
||||
rev = "1b13b52e2738a77715b1bad876e3b4e93f2b5269";
|
||||
sha256 = "1jp7wz8win4mgwxkaz2gnrgsaaqgln04n2lwgfr96isdv1klf62d";
|
||||
rev = "cfb5aeebbdf5ae93c4f4eeb14c7a507dea54ae9e";
|
||||
sha256 = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ=";
|
||||
};
|
||||
freesasa = fetchFromGitHub {
|
||||
owner = "mittinatten";
|
||||
repo = "freesasa";
|
||||
rev = "2.1.1";
|
||||
sha256 = "sha256-fUJvLDTVhpBWl9MavZwp0kAO5Df1QuHEKqe20CXNfcg=";
|
||||
};
|
||||
freesasa = fetchFromGitHub
|
||||
{
|
||||
owner = "mittinatten";
|
||||
repo = "freesasa";
|
||||
rev = "2.0.3";
|
||||
sha256 = "0x686zm9fpyg5647fdgxnxgbwav99nc6ymh4bmkr2063yyda4kzc";
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "rdkit";
|
||||
version = "2020.09.5";
|
||||
version = "2022.03.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@ -51,7 +50,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Release_${versionTag}";
|
||||
sha256 = "1ycbjia223d0w9xiwk36x2vkdidsx198rzkfyxz48cbax9vvklzq";
|
||||
sha256 = "sha256-YZq1JKDlCQVvjv7+XpEhD/wfFcQ5m3i5VO4rNQ3ONRQ=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -114,6 +113,7 @@ buildPythonPackage rec {
|
||||
"-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
|
||||
"-DRDK_INSTALL_INTREE=OFF"
|
||||
"-DRDK_INSTALL_STATIC_LIBS=OFF"
|
||||
"-DRDK_INSTALL_COMIC_FONTS=OFF"
|
||||
"-DRDK_BUILD_INCHI_SUPPORT=ON"
|
||||
"-DRDK_BUILD_AVALON_SUPPORT=ON"
|
||||
"-DRDK_BUILD_FREESASA_SUPPORT=ON"
|
||||
|
||||
28
pkgs/development/python-modules/rpi-gpio2/default.nix
Normal file
28
pkgs/development/python-modules/rpi-gpio2/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, libgpiod, buildPythonPackage, fetchurl }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rpi-gpio2";
|
||||
version = "0.3.0a3";
|
||||
|
||||
# PyPi source does not work for some reason
|
||||
src = fetchurl {
|
||||
url = "https://github.com/underground-software/RPi.GPIO2/archive/refs/tags/v${version}.tar.gz";
|
||||
sha256 = "sha256-AY1AD2Yu66eJUqB4OStZnUeEhmISLVRrTOAcmEHjuOM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libgpiod
|
||||
];
|
||||
|
||||
# Disable checks because they need to run on the specific platform
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/underground-software/RPi.GPIO2";
|
||||
description = ''
|
||||
Compatibility layer between RPi.GPIO syntax and libgpiod semantics
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-XyxvJsALAEuAJWORhIs4bGB4vYnCbFHecerA4gTr6ak=";
|
||||
sha256 = "sha256-FWjhfvBx8FXAMFKxWB4Vvjg5PPw9v7ciKU+oIEGD36s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.38.6";
|
||||
version = "0.38.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = version;
|
||||
hash = "sha256-P5yAXh/5J5/giOZTOuk9ay3PF8MNxPOJgtoWeX7xxFk=";
|
||||
hash = "sha256-Q/rrN7xzbehwMa3yFVP5F9ztUcJCDsfBIGf0b/GPzLM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
"test_launch_and_close_v4_v6"
|
||||
"test_launch_and_close_v6_only"
|
||||
"test_integration_with_listener_ipv6"
|
||||
# Starting with 0.38.6: AssertionError: assert [('add', '_ht..._tcp.local.')]
|
||||
# Starting with 0.38.7: AssertionError: assert [('add', '_ht..._tcp.local.')]
|
||||
"test_service_browser_expire_callbacks"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_lots_of_names"
|
||||
|
||||
@ -81,6 +81,7 @@
|
||||
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
|
||||
tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
|
||||
tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
|
||||
tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
|
||||
tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
|
||||
tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
|
||||
tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
{
|
||||
"url": "https://github.com/ambroisie/tree-sitter-tiger",
|
||||
"rev": "eb1d3714998977ae76ca7c6a102b10ee37efc2b5",
|
||||
"date": "2022-06-13T13:43:12+02:00",
|
||||
"path": "/nix/store/97jbgip2nh59zrxyhnqlmw14g25c7g89-tree-sitter-tiger",
|
||||
"sha256": "1p1hn99lsmqlmqgv7i3yw2jsqbj5xrrnvs87wkir74y7li2h9g4i",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
@ -334,6 +334,10 @@ let
|
||||
orga = "6cdh";
|
||||
repo = "tree-sitter-scheme";
|
||||
};
|
||||
"tree-sitter-tiger" = {
|
||||
orga = "ambroisie";
|
||||
repo = "tree-sitter-tiger";
|
||||
};
|
||||
};
|
||||
|
||||
allGrammars =
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.16";
|
||||
version = "0.9.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-XxsJSuUyw2q2kXaITWbkka8R6fx0ikoRMtw0hiySJ+M=";
|
||||
sha256 = "sha256-dsXjoXoFliaALA/tz8/QqC5FpapE/E9nNMJYgvkI+nw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-aE/yKf2HIjN/yk3Euj2KaX4DPB4wFywAAHWkRQ1SWKw=";
|
||||
cargoSha256 = "sha256-3aooeKfQtElWuGtdh0gYvdm62Cm7IhebsintQgOi1Mo=";
|
||||
|
||||
cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix
|
||||
"--"
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||
hash = "sha256-gbRUMifbIowD+KG/XdvIE7C7j2VVzkYGTvchpvxoBBM=";
|
||||
};
|
||||
buildUBoot = {
|
||||
buildUBoot = lib.makeOverridable ({
|
||||
version ? null
|
||||
, src ? null
|
||||
, filesToInstall
|
||||
@ -114,7 +114,7 @@ let
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ];
|
||||
} // extraMeta;
|
||||
} // removeAttrs args [ "extraMeta" ]);
|
||||
} // removeAttrs args [ "extraMeta" ]));
|
||||
in {
|
||||
inherit buildUBoot;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, systemd }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
@ -36,6 +36,8 @@ buildGoModule rec {
|
||||
$out/bin/agent
|
||||
'';
|
||||
|
||||
passthru.tests.grafana-agent = nixosTests.grafana-agent;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -22,5 +22,8 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://gitlab.com/kevincox/watchlog";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ kevincox ];
|
||||
|
||||
# Dependency only supports Linux + Windows: https://github.com/mentaljam/standard_paths/tree/master/src
|
||||
platforms = with lib.platforms; linux ++ windows;
|
||||
};
|
||||
}
|
||||
|
||||
50
pkgs/tools/networking/discord-sh/default.nix
Normal file
50
pkgs/tools/networking/discord-sh/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, curl, jq, coreutils }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "discord-sh";
|
||||
version = "unstable-2022-05-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ChaoticWeg";
|
||||
repo = "discord.sh";
|
||||
rev = "6aaea548f88eb48b7adeef824fbddac1c4749447";
|
||||
sha256 = "sha256-RoPhn/Ot4ID1nEbZEz1bd2iq8g7mU2e7kwNRvZOD/pc=";
|
||||
};
|
||||
|
||||
# ignore Makefile by disabling buildPhase. Upstream Makefile tries to download
|
||||
# binaries from the internet for linting
|
||||
dontBuild = true;
|
||||
|
||||
# discord.sh looks for the .webhook file in the source code directory, which
|
||||
# isn't mutable on Nix
|
||||
postPatch = ''
|
||||
substituteInPlace discord.sh \
|
||||
--replace 'thisdir="$(cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" && pwd)"' 'thisdir="$(pwd)"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
$out/bin/discord.sh --help
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 discord.sh $out/bin/discord.sh
|
||||
wrapProgram $out/bin/discord.sh \
|
||||
--set PATH "${lib.makeBinPath [ curl jq coreutils ]}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Write-only command-line Discord webhook integration written in 100% Bash script";
|
||||
homepage = "https://github.com/ChaoticWeg/discord.sh";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-06-11";
|
||||
version = "2022-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nquqOmQYuEcvHYTkf+90kyAfVkVdZ0Z2I67+R5hmn1o=";
|
||||
hash = "sha256-Qh9MoNZ0B8cL8G5maFvkGWLDuwQ3LDpqh3BYyJx3/Rk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, cudatoolkit
|
||||
, libdrm
|
||||
, ncurses
|
||||
@ -23,24 +24,25 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvtop" + pname-suffix;
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Syllo";
|
||||
repo = "nvtop";
|
||||
rev = version;
|
||||
sha256 = "sha256-4Alc5pBXb38PUhTRhdKZMiW+P3daDB0q3jiVL8qqEe4=";
|
||||
sha256 = "sha256-TlhCU7PydzHG/YMlk922mxEJ3CZw40784U0w1YawI3I=";
|
||||
};
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_TESTING=ON"
|
||||
] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
|
||||
++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so"
|
||||
++ optional (!amd) "-DAMDGPU_SUPPORT=OFF"
|
||||
++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF"
|
||||
++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2"
|
||||
;
|
||||
nativeBuildInputs = [ cmake] ++ lib.optional nvidia addOpenGLRunpath;
|
||||
nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath;
|
||||
buildInputs = with lib; [ ncurses ]
|
||||
++ optional nvidia cudatoolkit
|
||||
++ optional amd libdrm
|
||||
@ -49,11 +51,13 @@ stdenv.mkDerivation rec {
|
||||
# ordering of fixups is important
|
||||
postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup);
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A (h)top like task monitor for AMD and NVIDIA GPUs";
|
||||
longDescription = ''
|
||||
Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way.
|
||||
'';
|
||||
'';
|
||||
homepage = "https://github.com/Syllo/nvtop";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.28.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-krY1NbFilUHn6ePMRX4+EddsIu33Y7W8Wt5bIeB6wRE=";
|
||||
sha256 = "sha256-eOW+cNIE/H4VtwqbWLGSmS/UAbKMoHFBFcUaLpcPHfw=";
|
||||
};
|
||||
|
||||
depsExtraArgs = {
|
||||
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
popd
|
||||
'';
|
||||
};
|
||||
cargoSha256 = "sha256-nE6sl8n12fHLWH/tEXZhDjVBxGDoLyFDtVC5GFNClzM=";
|
||||
cargoSha256 = "sha256-/z+jimIDNej1vottvqmG3exd5BpOBUfmx1qaILhLKJU=";
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = difftastic; };
|
||||
|
||||
|
||||
@ -691,6 +691,7 @@ mapAliases ({
|
||||
libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16
|
||||
libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04
|
||||
libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22
|
||||
libdbusmenu_qt = throw "'libdbusmenu_qt' (Qt4) is deprecated and unused, use 'libsForQt5.libdbusmenu'"; # Added 2022-06-14
|
||||
libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22
|
||||
libdigidoc = throw "'libdigidoc' is unused in nixpkgs, deprecated and archived by upstream, use 'libdigidocpp' instead"; # Added 2022-06-03
|
||||
liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22
|
||||
@ -1174,6 +1175,7 @@ mapAliases ({
|
||||
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
|
||||
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
|
||||
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
|
||||
qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14
|
||||
quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22
|
||||
quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22
|
||||
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09
|
||||
|
||||
@ -17092,6 +17092,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
discord-sh = callPackage ../tools/networking/discord-sh { };
|
||||
|
||||
dlib = callPackage ../development/libraries/dlib { };
|
||||
|
||||
doctest = callPackage ../development/libraries/doctest { };
|
||||
@ -18454,8 +18456,6 @@ with pkgs;
|
||||
libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
|
||||
libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
|
||||
|
||||
libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
|
||||
|
||||
libdc1394 = callPackage ../development/libraries/libdc1394 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
@ -20361,8 +20361,6 @@ with pkgs;
|
||||
inherit lib pkgs qt6;
|
||||
});
|
||||
|
||||
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
|
||||
|
||||
quark-engine = callPackage ../tools/security/quark-engine { };
|
||||
|
||||
quesoglc = callPackage ../development/libraries/quesoglc { };
|
||||
|
||||
@ -9342,6 +9342,8 @@ in {
|
||||
|
||||
rpi-gpio = callPackage ../development/python-modules/rpi-gpio { };
|
||||
|
||||
rpi-gpio2 = callPackage ../development/python-modules/rpi-gpio2 { };
|
||||
|
||||
rply = callPackage ../development/python-modules/rply { };
|
||||
|
||||
rpm = toPythonModule (pkgs.rpm.override {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user