From 3d6c926c4f6464ba73a176686d65536f3ce17da4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 17 Jun 2022 00:40:08 +0100 Subject: [PATCH] treewide/servers,shells,tools: add sourceType for more packages --- pkgs/servers/monitoring/newrelic-sysmond/default.nix | 1 + pkgs/servers/monitoring/plugins/wmic-bin.nix | 1 + pkgs/servers/ombi/default.nix | 1 + pkgs/servers/redpanda/default.nix | 1 + pkgs/servers/search/elasticsearch/6.x.nix | 1 + pkgs/servers/search/elasticsearch/7.x.nix | 4 ++++ pkgs/shells/powershell/default.nix | 4 ++++ pkgs/tools/audio/stt/default.nix | 1 + pkgs/tools/cd-dvd/ventoy-bin/default.nix | 1 + pkgs/tools/compression/kzipmix/default.nix | 1 + pkgs/tools/filesystems/yandex-disk/default.nix | 1 + pkgs/tools/games/opentracker/default.nix | 6 ++++++ pkgs/tools/graphics/agi/default.nix | 5 ++++- pkgs/tools/graphics/pngout/default.nix | 1 + pkgs/tools/misc/fxlinuxprintutil/default.nix | 1 + pkgs/tools/misc/geekbench/4.nix | 1 + pkgs/tools/misc/geekbench/default.nix | 1 + pkgs/tools/misc/logstash/6.x.nix | 5 +++++ pkgs/tools/misc/logstash/7.x.nix | 5 +++++ pkgs/tools/misc/megacli/default.nix | 1 + pkgs/tools/networking/logmein-hamachi/default.nix | 1 + pkgs/tools/security/enpass/default.nix | 1 + pkgs/tools/security/gorilla-bin/default.nix | 1 + pkgs/tools/security/pcsc-scm-scl011/default.nix | 1 + pkgs/tools/security/vault/vault-bin.nix | 1 + pkgs/tools/system/mlc/default.nix | 1 + pkgs/tools/text/gpt2tc/default.nix | 1 + pkgs/tools/virtualization/ovftool/default.nix | 1 + 28 files changed, 50 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 3cdcbde161b7..35a6a5e828e5 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "System-wide monitoring for newrelic"; homepage = "https://newrelic.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix index e091727e48e2..00e76624d102 100644 --- a/pkgs/servers/monitoring/plugins/wmic-bin.nix +++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMI client for Linux (binary)"; homepage = "https://www.openvas.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 7215571b3aec..a8251b1c42e1 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -49,6 +49,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Self-hosted web application that automatically gives your shared Plex or Emby users the ability to request content by themselves"; homepage = "https://ombi.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2Only; maintainers = with maintainers; [ woky ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index f7c11fe39f63..80d5e8743f77 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! "; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; homepage = "https://redpanda.com/"; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 798fa83e6d58..32f6d67925c5 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 9ef1c3cc6349..aad6403cf6ab 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.elastic; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e03a2e24e7e4..435f54cdf4af 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; maintainers = with maintainers; [ yrashk srgom p3psi ]; mainProgram = "pwsh"; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index c8fff7ddbb4a..91e18f409a21 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/coqui-ai/STT"; description = "Deep learning toolkit for Speech-to-Text, battle-tested in research and production"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 4e88ac186483..07d73f980525 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -187,6 +187,7 @@ in stdenv.mkDerivation rec { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; maintainers = with maintainers; [ k4leg ]; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 4bfc39e87186..bde65af03e90 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ maintainers.sander ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 4b8de7402a62..109781f612a2 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { description = "A free cloud file storage service"; maintainers = with lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; longDescription = '' Yandex.Disk console client for Linux lets you manage files on Disk without diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index a184aa381a5f..33dc69ff4e68 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -57,6 +57,12 @@ buildDotnetModule rec { meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; + sourceProvenance = with sourceTypes; [ + fromSource + # deps + binaryBytecode + binaryNativeCode + ]; license = licenses.mit; maintainers = [ maintainers.ivar ]; mainProgram = "OpenTracker"; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 4fad46f295ae..cad785372dce 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -60,7 +60,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/google/agi/"; description = "Android GPU Inspector"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.ivar ]; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 02f3930a09c8..2b86f5e5e136 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; homepage = "http://advsys.net/ken/utils.htm"; platforms = lib.attrNames platforms; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index b97e082128ac..ce78ae0d7afe 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optional configuration tool for fxlinuxprint"; homepage = "https://onlinesupport.fujixerox.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/tools/misc/geekbench/4.nix index 03a79644ffb2..d7b6152e0785 100644 --- a/pkgs/tools/misc/geekbench/4.nix +++ b/pkgs/tools/misc/geekbench/4.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index bb25b7502f18..ba9117a29722 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index c1136ed88768..4de78cf4cbd7 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -53,6 +53,11 @@ let this = stdenv.mkDerivation rec { meta = with lib; { description = "A data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # bundled jruby includes native code + ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index f0a760e42f28..2dabcee2a052 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -68,6 +68,11 @@ let meta = with lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # bundled jruby includes native code + ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 3f86a073c096..e2eef587f27c 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 4512e1dc6254..74d32b452381 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; homepage = "https://secure.logmein.com/products/hamachi/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 00c161eeb730..e7a3eb8bae3c 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -54,6 +54,7 @@ let meta = with lib; { description = "A well known password manager"; homepage = "https://www.enpass.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux"]; maintainers = with maintainers; [ ewok ]; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 228271742c64..388996c62fb5 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zdia/gorilla/wiki"; maintainers = [ lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index aa1580e24598..af3a95f0a2aa 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { description = "SCM Microsystems SCL011 chipcard reader user space driver"; homepage = "https://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; downloadPage = "https://support.identiv.com/scl010-scl011/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 0e679ccb7afe..b52d30e3dd63 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for managing secrets, this binary includes the UI"; homepage = "https://www.vaultproject.io"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; mainProgram = "vault"; diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index 257cd31c0606..447ab30d4975 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html"; description = "Intel Memory Latency Checker"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ basvandijk ]; platforms = with platforms; linux; diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 4d6ac33d61d9..93cf684c1990 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text completion and compression using GPT-2"; homepage = "https://bellard.org/libnc/gpt2tc.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ anna328p ]; diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index c4b4acdbb48d..9db01094bb30 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VMWare tools for working with OVF, OVA, and VMX images"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ numinit wolfangaukang ]; platforms = builtins.attrNames ovftoolSystems;