diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 1323336d866e..6459b22519db 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -239,7 +239,7 @@ in { }; environment.sessionVariables.LD_LIBRARY_PATH = - lib.optional cfg.jack.enable "${cfg.package.jack}/lib"; + lib.mkIf cfg.jack.enable [ "${cfg.package.jack}/lib" ]; users = lib.mkIf cfg.systemWide { users.pipewire = { diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index f528d1830424..489dd337bb7c 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -201,6 +201,8 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; + ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; + TimeoutStopSec = 60; Restart = "on-failure"; # User and group diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e61798676a0d..f9e32592e95b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -26,8 +26,22 @@ let featureFlags.minimalModules = {}; }; evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; }; -in -{ + + allDrivers = getDrivers tests; + + getDrivers = ts: + if isDerivation ts + then ts.driver or null + else if isAttrs ts + then recurseIntoAttrs (mapAttrs (k: getDrivers) ts) + else null; + + tests = { + + # for typechecking of the scripts and evaluation of + # the nodes, without running VMs. + inherit allDrivers; + _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; adguardhome = handleTest ./adguardhome.nix {}; @@ -620,4 +634,5 @@ in zookeeper = handleTest ./zookeeper.nix {}; zrepl = handleTest ./zrepl.nix {}; zsh-history = handleTest ./zsh-history.nix {}; -} +}; +in tests diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 94290ada7b35..d9d7bf19e7d6 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Discord music bot that's easy to set up and run yourself"; homepage = "https://github.com/jagrosh/MusicBot"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.all; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 5fbe31294196..d91f201f66bd 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A decentralized bitcoin exchange network"; homepage = "https://bisq.network"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ juaningan emmanuelrosa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 620cbd020b20..1ebcf47146fe 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open protocol that implements modern scientific ideas in the blockchain area"; homepage = "https://ergoplatform.org/en/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/blockchains/tessera/default.nix b/pkgs/applications/blockchains/tessera/default.nix index 5b1392525534..a0facc33b7dd 100644 --- a/pkgs/applications/blockchains/tessera/default.nix +++ b/pkgs/applications/blockchains/tessera/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Enterprise Implementation of Quorum's transaction manager"; homepage = "https://github.com/jpmorganchase/tessera"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; }; diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 552358319e15..a78cc65aa210 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; maintainers = with maintainers; [ chvp ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index c1217e2123c4..f81d439a3d25 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -108,6 +108,7 @@ rec { meta = with lib; { homepage = "https://github.com/tobiasmelcher/EclipseAceJump"; description = "Provides fast jumps to text based on initial letter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.all; }; @@ -130,6 +131,7 @@ rec { meta = with lib; { homepage = "https://mihai-nita.net/java/#ePluginAEC"; description = "Adds support for ANSI escape sequences in the Eclipse console"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; @@ -152,6 +154,7 @@ rec { meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -174,6 +177,7 @@ rec { meta = with lib; { description = "A powerful parser generator for processing structured text or binary files"; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -196,6 +200,7 @@ rec { meta = with lib; { homepage = "http://andrei.gmxhome.de/anyedit/"; description = "Adds new tools to the context menu of text-based editors"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -218,6 +223,7 @@ rec { meta = with lib; { homepage = "https://github.com/cypher256/eclipse-encoding-plugin"; description = "Show file encoding and line ending for the active editor in the eclipse status bar"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -240,6 +246,7 @@ rec { meta = with lib; { homepage = "http://andrei.gmxhome.de/bytecode/"; description = "Shows disassembled bytecode of current java editor or class file"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd2; platforms = platforms.all; }; @@ -259,6 +266,7 @@ rec { meta = with lib; { homepage = "https://eclipse.org/cdt/"; description = "C/C++ development tooling"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; @@ -278,6 +286,7 @@ rec { meta = with lib; { homepage = "https://eclipse-cs.sourceforge.net/"; description = "Checkstyle integration into the Eclipse IDE"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; platforms = platforms.all; }; @@ -301,6 +310,7 @@ rec { meta = with lib; { homepage = "http://eclipsecolorthemes.org/"; description = "Plugin to switch color themes conveniently and without side effects"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -333,6 +343,7 @@ rec { meta = with lib; { homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php"; description = "IDE for developing CUP based parsers"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; @@ -358,6 +369,7 @@ rec { meta = with lib; { homepage = "https://www.drools.org/"; description = "Drools is a Business Rules Management System (BRMS) solution"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; }; }; @@ -375,6 +387,7 @@ rec { meta = with lib; { homepage = "https://www.eclemma.org/"; description = "EclEmma is a free Java code coverage tool for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -397,6 +410,7 @@ rec { meta = with lib; { homepage = "http://findbugs.sourceforge.net/"; description = "Plugin that uses static analysis to look for bugs in Java code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -415,6 +429,7 @@ rec { meta = with lib; { homepage = "https://github.com/ddekany/jbosstools-freemarker"; description = "Plugin that provides an editor for Apache FreeMarker files"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; }; @@ -431,6 +446,7 @@ rec { meta = with lib; { homepage = "http://gnuarmeclipse.livius.net/"; description = "GNU ARM Eclipse Plug-ins"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; @@ -469,6 +485,7 @@ rec { meta = with lib; { description = "Adds support for JSON files to Eclipse"; homepage = "https://github.com/boothen/Json-Eclipse-Plugin"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -491,6 +508,7 @@ rec { meta = with lib; { homepage = "https://github.com/angelozerr/jdt-codemining"; description = "Provides JDT Java CodeMining"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -516,6 +534,7 @@ rec { meta = with lib; { homepage = "https://github.com/RustDT"; description = "Rust development tooling"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -533,6 +552,7 @@ rec { meta = with lib; { homepage = "http://scala-ide.org/"; description = "The Scala IDE for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.all; }; @@ -551,6 +571,7 @@ rec { meta = with lib; { homepage = "https://spotbugs.github.io/"; description = "Plugin that uses static analysis to look for bugs in Java code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; platforms = platforms.all; }; @@ -573,6 +594,7 @@ rec { meta = with lib; { homepage = "https://testng.org/doc/"; description = "Eclipse plugin for the TestNG testing framework"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; @@ -594,6 +616,7 @@ rec { meta = with lib; { homepage = "https://github.com/vrapper/vrapper"; description = "A wrapper to provide a Vim-like input scheme for moving around and editing text"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.stumoss ]; @@ -617,6 +640,7 @@ rec { meta = with lib; { homepage = "https://github.com/oyse/yedit"; description = "A YAML editor plugin for Eclipse"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; }; @@ -634,6 +658,7 @@ rec { meta = with lib; { homepage = "https://www.eclipse.org/gef/zest/"; description = "The Eclipse Visualization Toolkit"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; @@ -656,6 +681,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/ivyde/index.html"; description = "A plugin which integrates Apache Ivy's dependency management"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -683,6 +709,7 @@ rec { Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since it requires additional plugins to be installed (Zest). ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -706,6 +733,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/index.html"; description = "A popular dependency manager focusing on flexibility and simplicity"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; @@ -729,6 +757,7 @@ rec { meta = with lib; { homepage = "https://ant.apache.org/ivy/ivyde/index.html"; description = "Ant Tasks integrated into Eclipse's Ant runtime"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.r3dl3g ]; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 962710be2f50..6bf26b525b51 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; maintainers = [ maintainers.chvp ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 0d29eeb17dc2..1cffa831ef61 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mature programmer's text editor (Java based)"; homepage = "http://www.jedit.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index ffecd65d50f9..504d41768868 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -25,6 +25,7 @@ let meta = with lib; { description = "A Jupyter kernel for Clojure"; homepage = "https://github.com/clojupyter/clojupyter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; # deps from maven license = licenses.mit; maintainers = with maintainers; [ thomasjm ]; platforms = jre.meta.platforms; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 3605f6c6e4e2..cf20d102cb50 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. ''; homepage = "http://www.tuxguitar.com.ar/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; maintainers = [ maintainers.ardumont ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 8b7b1c32628a..742b3dc88ae2 100644 --- a/pkgs/applications/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A modular ComputerCraft emulator"; homepage = "https://github.com/CCEmuX/CCEmuX"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index a14109bc8572..956604cd6cc6 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -32,6 +32,10 @@ in stdenv.mkDerivation { done ''; + # Workaround build failure on -fno-common toolchains: + # ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cd src sed -i "/^STRIP/d" configure diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 1a95145cf40e..d855586c4381 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -68,6 +68,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.gov.br/receitafederal/pt-br"; license = licenses.unfree; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ atila ]; }; } diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 27d5ece57fe6..c37bc92a4065 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { an expanded range of ideas and possibilities in a serendipitous way. ''; homepage = "http://al.chemy.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 77ffc4b44c86..270132eca940 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://imagej.net/software/fiji/"; description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; maintainers = with maintainers; [ zane ]; }; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index f21f658ace30..35c8dbf2f19a 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation rec { inspired by NIH Image for the Macintosh. It runs on any computer with a Java 1.4 or later virtual machine. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ yuriaisaka ]; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 93a600fff847..6d2b6e4bb7a7 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { crop, etc), PDF and PNG output. ''; homepage = "http://swingsane.com/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 0385c5db9d86..b1d96f2d1f42 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; homepage = "https://www.yworks.com/products/yed"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index b5fc70494fcd..cf0dd52ee73c 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { # Quicker to unpack locally than load Hydra hydraPlatforms = []; maintainers = with lib.maintainers; [raskin]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index d185096aa797..8eec91d529d0 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -31,6 +31,7 @@ buildGraalvmNativeImage rec { homepage = "https://ehwiki.org/wiki/Hentai@Home"; description = "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; }; diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index f82ce53d9746..77a8adc69257 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -31,6 +31,7 @@ EOF meta = with lib; { homepage = "https://github.com/ebzzry/emem"; description = "A trivial Markdown to HTML converter"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 48708bc057c7..da5c8574ad05 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application for viewing, editing and converting GPS coordinate data"; homepage = "https://activityworkshop.net/software/gpsprune/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index a25806533ef8..579890c78ba3 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9a7ed898e51f..67807887ec61 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; changelog = "https://josm.openstreetmap.de/wiki/Changelog"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index ccdaa0ff21bb..f68a584fe83f 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { downloadPage = "https://jquake.net/?down"; changelog = "https://jquake.net/?docu"; maintainers = with maintainers; [ nessdoor ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 3daebeaabc97..fdac7cede170 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -87,6 +87,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; + dontWrapGApps = true; + postFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + buildInputs = [ curl botan2 diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 2863dd103d8d..2274aa00cb44 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.numinit ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 29bd197a9d6b..aa69148bd964 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 9956b61c9cfe..7851aedfe2c6 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "https://www.mkgmap.org.uk/"; downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 0a46393bd220..24fd23999786 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { translation leveraging into updated projects. ''; homepage = "http://www.omegat.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ t184256 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index b28b4da7dbef..0b0163b054d7 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { programmatically extract tables from PDFs. ''; homepage = "https://tabula.technology/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.jakewaksbaum ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index b396c578c903..d2978ec7bd32 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { Microsoft Excel spreadsheet using a simple, easy-to-use interface. ''; homepage = "https://tabula.technology/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index 887a979219db..690dd9d64ad6 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Electronic TV Program Guide"; homepage = "https://www.tvbrowser.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 5994df7c559a..db9313b6be61 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "Visual Understanding Environment - mind mapping software"; maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.free; # Apache License fork, actually }; } diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index bcc4fca33b13..a395ffd521f5 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { and save to Evernote. ''; homepage = "https://www.xmind.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 064213b01ae3..66ec0a7c7b47 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -57,6 +57,7 @@ let description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; maintainers = with maintainers; [ kalbasit ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9ce9286e610c..3500b1b75542 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "argocd"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-ChgWqhkzVKhbyEA+g2flWK/WMxur7UHWXJUcLzp9RTE="; + sha256 = "sha256-pWDwmsLCXoK8EzipOPXUdYu75hPm5AIExXmgoA102Dg="; }; vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8="; - # Set target as ./cmd per release-cli - # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 + # Set target as ./cmd per cli-local + # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 subPackages = [ "cmd" ]; ldflags = @@ -26,6 +26,11 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" + "-X ${package_url}.kubectlVersion=v0.23.1" + # NOTE: Update kubectlVersion when upgrading this package with + # go list -m k8s.io/client-go | head -n 1 | rev | cut -d' ' -f1 | rev + # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 + # Will need a way to automate it :P ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 202b9fd5e68d..5226c9ea3d53 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -65,6 +65,7 @@ let homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; longDescription = '' The Apache Hadoop software library is a framework that allows for diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index a3ca42dff342..2a9046d94a0b 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -64,6 +64,7 @@ let meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 21c28c7391ae..964673878080 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.jitsi.members; diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index e60a683a491d..ac7040a9aaca 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -103,6 +103,10 @@ in stdenv.mkDerivation rec { clients. ''; homepage = "https://signald.org"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ma27 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index e6332832e3ec..2a686fdd8b9e 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical network monitoring and documentation tool"; homepage = "http://www.rakudave.ch/jnetmap/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; # Upstream supports macOS and Windows too. platforms = platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index d678e3b517b3..bb7f6c96de45 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.1"; + version = "3.44.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; + sha256 = "xXPzlxA8FybyS+Tz+f0gzrvJtEW6CysOt8lI/YQVBho="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 5e9e17b47fd6..fd980893124f 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Viewer for .msg files (MS Outlook)"; homepage = "https://www.washington.edu/alpine/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index ad791f46d739..a08ea4b8bbc2 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index cd6ae563aa0b..05fb734d7bf2 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -87,6 +87,10 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index cfee9d91c930..8de78c580aae 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 6839b6be6729..f3c8301a69b6 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = "SoapUI End User License Agreement"; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 63d38b0cc3fe..54a070596dc6 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { description = "An integrated family of CLI’s for various Atlassian applications"; homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ twey ]; inherit (jre.meta) platforms; }; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index db0e3c557379..5f84c95b9d38 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -156,6 +156,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automation Controller for the Trader Work Station of Interactive Brokers"; homepage = "https://github.com/ib-controller/ib-controller"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index 403f675cb4ee..f76b38aadb34 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Trader Work Station of Interactive Brokers"; homepage = "https://www.interactivebrokers.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 04d5108dc60d..55e24d80f277 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation rec { Runtime Environment for plugins like Hibiscus (HBCI Online Banking), SynTAX (accounting) and JVerein (club management). ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli r3dl3g ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 74a4c156b830..6244b0fbc8cd 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -584,6 +584,8 @@ in meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = "https://libreoffice.org/"; + # at least one jar in dependencies + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 3364cbf6f0c2..c58b09889772 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib;{ homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ ]; mainProgram = "AstrolabeGenerator"; diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index 8ad7ef720c6b..37d20b585a08 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -44,6 +44,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "G.Projector transforms an input map image into any of about 200 global and regional map projections"; homepage = "https://www.giss.nasa.gov/tools/gprojector/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ alyaeanyx ]; license = lib.licenses.unfree; inherit (jre.meta) platforms; diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/applications/science/biology/astral/default.nix index b092edc0e602..6a9513c6b817 100644 --- a/pkgs/applications/science/biology/astral/default.nix +++ b/pkgs/applications/science/biology/astral/default.nix @@ -50,6 +50,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/smirarab/ASTRAL"; description = "Tool for estimating an unrooted species tree given a set of unrooted gene trees"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.asl20; maintainers = with maintainers; [ bzizou ]; }; diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 89ebdcee65b9..a8bb739bbed8 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = platforms.all; homepage = "https://www.openmicroscopy.org/bio-formats/"; diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix index 66f4a1671d1c..2ac09ca21ab6 100644 --- a/pkgs/applications/science/biology/macse/default.nix +++ b/pkgs/applications/science/biology/macse/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multiple alignment of coding sequences"; homepage = "https://bioweb.supagro.inra.fr/macse/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index ace2eea89305..94dc8e62cd32 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF"; license = licenses.mit; homepage = "https://broadinstitute.github.io/picard/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; mainProgram = "picard"; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 4c32516b29f6..a47a107349da 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; homepage = "http://snpeff.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 7b09f601ad68..8b9b086b77b2 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { # University School of Medicine. license = licenses.unfree; homepage = "https://github.com/dkoboldt/varscan"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index fe3e05b65627..ba93e174e405 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java 3D viewer for chemical structures"; homepage = "https://sourceforge.net/projects/jmol"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ mounium ] ++ teams.sage.members; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index ff4e3809fc2b..8530e6927fe9 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://bancika.github.io/diy-layout-creator/"; changelog = "https://github.com/bancika/diy-layout-creator/releases"; license = licenses.gpl3Plus; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f4bf424f1090..8de5cb311488 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "36"; + version = "37"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; + sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index 6196f6443702..332b28db5fb6 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An automated theorem prover for classical higher-order logic with choice"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; maintainers = [maintainers.raskin]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 67e699bc63fa..9650d97814bf 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/logisim-evolution/logisim-evolution"; description = "Digital logic designer and simulator"; maintainers = with maintainers; [ emilytrau ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 06dc024e6d23..ea8a1416a77a 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; maintainers = with maintainers; [ emilytrau ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 8b9f64a8f5b9..4572a06d6337 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; homepage = "http://lamport.azurewebsites.net/tla/tla.html"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ florentc thoughtpolice ]; diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 399fa3a3c544..574d849d955c 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 95112fa9098e..f945e909308b 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation { meta = with lib; { description = "A platform for visualizing and manipulating large graphs"; homepage = "https://gephi.org"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index d32f4312047a..db8f0a717aa1 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { many tens of thousands of students, teachers and researchers worldwide. ''; homepage = "https://ccl.northwestern.edu/netlogo/index.shtml"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index 8c33a8ae6b1a..4baa65201e0b 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "A piece of software for reasoning about monoidal theories; in particular, quantum information processing"; license = licenses.gpl3; homepage = "https://quantomatic.github.io/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index f4c323defd6f..e42aa253dbfe 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { description = "GRaphs for Object-Oriented VErification"; homepage = "http://groove.cs.utwente.nl/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/science/programming/jflap/default.nix b/pkgs/applications/science/programming/jflap/default.nix index 9a7922ba1205..4a6193f1acb7 100644 --- a/pkgs/applications/science/programming/jflap/default.nix +++ b/pkgs/applications/science/programming/jflap/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { description = "GUI tool for experimenting with formal languages topics"; homepage = "https://www.jflap.org/"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = [ maintainers.grnnja ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index ca8e87a05533..e4213fe7a8ff 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; homepage = "http://people.irisa.fr/Martin.Quinson/Teaching/PLM/"; license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index ea785bab49bf..e1e1fe17547f 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gerritcodereview.com/index.md"; license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ flokli jammerful zimbatm ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index ca47942a3f9a..a759c1e86005 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { it's faster (10-720x), simpler (dedicated to just removing things), and beautiful (can use Scala instead of bash to script customizations). ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ maintainers.changlinli ]; mainProgram = "bfg"; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index ca0849a4f968..8bf1bf7b3ba5 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://filebot.net"; changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ gleber felschr ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 7f36fd232e97..5ad81bc0a768 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = "https://mediathekview.de/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index e1b299f1e733..a0de3685d2a0 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; license = lib.licenses.epl10; }; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index bb6b65e40a46..03e92f63b751 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for making JavaScript download and run faster"; homepage = "https://developers.google.com/closure/compiler/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index 88371406387c..c9e9b34e6ee0 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { For more details, please refer to the documentation by Oracle ''; homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix index b37bffdfd3bc..8944c4b75710 100644 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { embedded code to distributed cloud and edge applications. ''; homepage = "https://github.com/lf-lang/lingua-franca"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ revol-xut ]; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index b043187e6c1e..18acd7c3d96f 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation { interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = attrNames binaries; hydraPlatforms = []; diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 71f3c884868b..34f427d4fa71 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -244,6 +244,7 @@ stdenv.mkDerivation rec { description = "Open-source electronics prototyping platform"; homepage = "https://www.arduino.cc/"; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ]; }; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index e6ead8dd3723..c90abc1391de 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { step-by-step process. ''; homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.all; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index b5ba81ebc280..03d08e0c4ef4 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -66,6 +66,7 @@ buildGraalvmNativeImage rec { ''; homepage = "https://github.com/babashka/babashka"; changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = with maintainers; [ bandresen diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 42d6d67ee15b..0e8391d5a686 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight IDE for Clojure"; homepage = "https://github.com/arthuredelstein/clooj"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 212e453b7a72..55adb7481d59 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Lisp dialect for the JVM"; homepage = "https://clojure.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; longDescription = '' Clojure is a dynamic programming language that targets the Java diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 38b599d339e7..9393c5a42046 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; homepage = "https://jython.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.psfl; platforms = jre.meta.platforms; }; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 6ba92a041eb5..fa54a421ccc1 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rascal-mpl.org/"; description = "Command-line REPL for the Rascal metaprogramming language"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index f223e205220d..b35880e013c8 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchurl }: -{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: +{ lib, stdenv, fetchurl }: +{ version +, artifactId +, groupId +, sha512 +, type ? "jar" +, suffix ? "" +, sourceProvenance ? (if type == "jar" then [ lib.sourceTypes.binaryBytecode ] else []) +}: let m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; @@ -18,4 +25,6 @@ in stdenv.mkDerivation { mkdir -p $out/m2/$m2Path cp $src $out/m2/$m2Path/$m2File ''; + + meta.sourceProvenance = sourceProvenance; } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 77851269731d..fed3a94afdb6 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 2d1144810b3a..25de793ceac8 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -72,8 +72,13 @@ stdenv.mkDerivation rec { orc libshout glib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals qt5Support (with qt5; [ + qtbase + ]) ++ lib.optionals stdenv.isLinux [ wayland-protocols + ] ++ lib.optionals qt5Support [ + qt5.qttools.dev + qt5.qtbase.dev # For moc-qt5 ]; buildInputs = [ diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 104320a8d89f..0a121d923146 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ copumpkin ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index 22a9fae358d2..f55029335e58 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Interface to scripting languages, including JSR-223"; homepage = "https://commons.apache.org/proper/commons-bsf/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index c685eb691c5f..ba17eb1532d5 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index 6a5749b9905f..7b5be45e200c 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-daemon"; description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; maintainers = with lib.maintainers; [ rsynnest ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 73b5d0d140a2..40c66909213e 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index d8b32607a9e5..7c1c9f361145 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-io"; description = "A library of utilities to assist with developing IO functionality"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 07e94148817e..b9ccfef8382c 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index f98c8bd72e0c..71832498c34a 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper around a variety of logging API implementations"; homepage = "https://commons.apache.org/proper/commons-logging"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 5543532015e0..4f928db4cf3b 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-math/"; description = "A library of lightweight, self-contained mathematics and statistics components"; maintainers = with lib.maintainers; [ copumpkin ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 8f678ce7555b..ae9df24c55ac 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://hsqldb.org"; description = "A relational, embedable database management system written in Java and a set of related tools"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 4eee98157d50..3cc046ac119b 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; homepage = "https://projectlombok.org/"; maintainers = [ lib.maintainers.CrystalGamma ]; diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 93b222357840..022f68a9d351 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index da1e6120da63..484f9017ae70 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -29,6 +29,7 @@ let meta = with lib; { inherit description license; homepage = "http://saxon.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 5c032f5469ce..fd263d91d426 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; license = lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index e65ec32e34dd..461bcbe025ed 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "36"; + version = "37"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; + sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 8947c6f42394..f5a414786ac3 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation { OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus command line SQL client. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 7cd3a086cdb8..92aee32c38d1 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = "https://www.rabbitmq.com/java-client.html"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index d8f75875b9b3..34d53337f6af 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI tool for avrdude"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix new file mode 100644 index 000000000000..bba82425cc05 --- /dev/null +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bitstruct +, diskcache +, prompt-toolkit +, pyparsing +, python +}: + +buildPythonPackage rec { + pname = "asn1tools"; + version = "0.163.0"; + + src = fetchFromGitHub { + owner = "eerimoq"; + repo = "asn1tools"; + rev = "v${version}"; + sha256 = "sha256-sbwwbwkhlZvCb2emuw1FTBj5pnv9SOtHpAcYPSQqIvM="; + }; + + propagatedBuildInputs = [ + bitstruct + diskcache + prompt-toolkit + pyparsing + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + pythonImportsCheck = [ "asn1tools" ]; + + meta = with lib; { + description = "ASN.1 parsing, encoding and decoding"; + homepage = "https://github.com/eerimoq/asn1tools"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 5fd6f1a3b8f9..10925ebac25e 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -9,7 +9,8 @@ , click , cryptography , ecdsa - # , eth-abi +, eth-abi +, eth-account , flatbuffers , jinja2 , hkdf @@ -18,14 +19,14 @@ , mock , msgpack , passlib - # , py-ecc - # , py-eth-sig-utils +, py-ecc +, py-eth-sig-utils , py-multihash , py-ubjson , pynacl , pygobject3 , pyopenssl -, pyqrcode +, qrcode , pytest-asyncio , python-snappy , pytestCheckHook @@ -47,16 +48,21 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.3.2"; + version = "22.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WKiHx6GWuwjYtmJMs2lfSTqeXJ8A/TUNjW+Cm0f/kDY="; + sha256 = "sha256-NKpVabC0QZ+MJ3eSxgDcJRjEkwkox04iee+LiNi4o+o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest>=2.8.6,<3.3.0" "pytest" + ''; + propagatedBuildInputs = [ cryptography hyperlink @@ -68,13 +74,11 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook + # FIXME: remove the following dependencies when web3 gets added + eth-account ] ++ passthru.optional-dependencies.scram - ++ passthru.optional-dependencies.serialization; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest>=2.8.6,<3.3.0" "pytest" - ''; + ++ passthru.optional-dependencies.serialization + ++ passthru.optional-dependencies.xbr; preCheck = '' # Run asyncio tests (requires twisted) @@ -93,13 +97,13 @@ buildPythonPackage rec { all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; accelerate = [ /* wsaccel */ ]; compress = [ python-snappy ]; - encryption = [ pynacl pyopenssl pyqrcode /* pytrie */ service-identity ]; + encryption = [ pynacl pyopenssl qrcode /* pytrie */ service-identity ]; nvx = [ cffi ]; scram = [ argon2-cffi cffi passlib ]; serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ]; twisted = [ attrs args.twisted zope_interface ]; ui = [ pygobject3 ]; - xbr = [ base58 cbor2 click ecdsa /* eth-abi */ jinja2 hkdf mnemonic /* py-ecc py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; + xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc py-eth-sig-utils py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index acbfb15cfca5..4e9ccaf23701 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchpatch, fetchPypi, makeWrapper, isPy3k , python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic , python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs -, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8 +, boto3, moto, mock, lz4, setuptoolsTrial , buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh , glibcLocales , nixosTests @@ -65,9 +65,6 @@ let mock lz4 setuptoolsTrial - isort - pylint - flake8 buildbot-worker buildbot-pkg buildbot-plugins.www @@ -81,6 +78,11 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + (fetchpatch{ + url = "https://github.com/buildbot/buildbot/commit/54b8f62902122b0091319a96d0f9edd4195ab4c6.patch"; + stripLen = 1; + sha256 = "sha256-OqW3ZQK0bfqPG3YlrBbrSEEKsM/XqY2NO862ZD/DgHs="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix new file mode 100644 index 000000000000..5d259f250b5f --- /dev/null +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asn1crypto +, autoconf +, automake +, cffi +, libtool +, pkg-config +, pytestCheckHook +, python +, pythonOlder +, secp256k1 +}: + +buildPythonPackage rec { + pname = "coincurve"; + version = "17.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ofek"; + repo = "coincurve"; + rev = "v${version}"; + sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'requests'" "" + + # don't try to load .dll files + rm coincurve/_windows_libsecp256k1.py + cp -r --no-preserve=mode ${secp256k1.src} libsecp256k1 + patchShebangs secp256k1/autogen.sh + ''; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + propagatedBuildInputs = [ + asn1crypto + cffi + ]; + + preCheck = '' + # https://github.com/ofek/coincurve/blob/master/tox.ini#L20-L22= + rm -rf coincurve + + # don't run benchmark tests + rm tests/test_bench.py + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "coincurve" + ]; + + meta = with lib; { + description = "Cross-platform bindings for libsecp256k1"; + homepage = "https://github.com/ofek/coincurve"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix new file mode 100644 index 000000000000..1e81450764f0 --- /dev/null +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-hash +, eth-typing +, eth-utils +, hypothesis +, parsimonious +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-abi"; + version = "3.0.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-abi"; + rev = "v${version}"; + sha256 = "sha256-qiuyGVOy+n8l3jSqwMGnBXcDrOxIiJ0lNP4lq/EQEhU="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious" + ''; + + propagatedBuildInputs = [ + eth-typing + eth-utils + parsimonious + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # boolean list representation changed + "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" + # hypothesis.errors.Flaky + "test_has_arrlist_has_expected_behavior_for_parsable_types" + "test_is_base_tuple_has_expected_behavior_for_parsable_types" + ]; + + pythonImportsCheck = [ "eth_abi" ]; + + meta = with lib; { + description = "Ethereum ABI utilities"; + homepage = "https://github.com/ethereum/eth-abi"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix new file mode 100644 index 000000000000..1a929ca9099f --- /dev/null +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bitarray +, eth-abi +, eth-keyfile +, eth-keys +, eth-rlp +, eth-utils +, hexbytes +, pythonOlder +, rlp +}: + +buildPythonPackage rec { + pname = "eth-account"; + version = "0.6.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-account"; + rev = "v${version}"; + sha256 = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3" + ''; + + propagatedBuildInputs = [ + bitarray + eth-abi + eth-keyfile + eth-keys + eth-rlp + eth-utils + hexbytes + rlp + ]; + + # require buildinga npm project + doCheck = false; + + pythonImportsCheck = [ "eth_account" ]; + + meta = with lib; { + description = "Account abstraction library for web3.py"; + homepage = "https://github.com/ethereum/eth-account"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 622dd0b37353..1c60a2d59489 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,55 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytest +, pysha3 , pycryptodome }: buildPythonPackage rec { pname = "eth-hash"; version = "0.3.2"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "3f40cecd5ead88184aa9550afc19d057f103728108c5102f592f8415949b5a76"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-hash"; + rev = "v${version}"; + sha256 = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytest + ] ++ passthru.optional-dependencies.pycryptodome + ++ passthru.optional-dependencies.pysha3; - propagatedBuildInputs = [ - pysha3 - pycrypto - pycryptodome - ]; - - pipInstallFlags = [ - # Circular dependency on eth-utils - "--no-dependencies" - ]; - - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - - # Run tests separately because we don't want to run tests on tests/backends/ - # but only on its selected subdirectories. Also, the directories under - # tests/backends/ must be run separately because they have identically named - # test files so pytest would raise errors because of that. - # - # Also, tests in tests/core/test_import.py are broken so just ignore them: - # https://github.com/ethereum/eth-hash/issues/25 - # There is a pull request to fix the tests: - # https://github.com/ethereum/eth-hash/pull/26 checkPhase = '' pytest tests/backends/pycryptodome/ pytest tests/backends/pysha3/ - # pytest tests/core/ ''; - disabled = pythonOlder "3.5"; + passthru.optional-dependencies = { + pycryptodome = [ pycryptodome ]; + pysha3 = [ pysha3 ]; + }; - meta = { + meta = with lib; { description = "The Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix new file mode 100644 index 000000000000..fd62501b81d2 --- /dev/null +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-keys +, eth-utils +, pycryptodome +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-keyfile"; + version = "0.6.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-keyfile"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'setuptools-markdown'" "" + ''; + + propagatedBuildInputs = [ + eth-keys + eth-utils + pycryptodome + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "eth_keyfile" ]; + + meta = with lib; { + description = "Tools for handling the encrypted keyfile format used to store private keys"; + homepage = "https://github.com/ethereum/eth-keyfile"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix new file mode 100644 index 000000000000..efdde22b8b90 --- /dev/null +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asn1tools +, coincurve +, eth-hash +, eth-typing +, eth-utils +, factory_boy +, hypothesis +, isPyPy +, pyasn1 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eth-keys"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-keys"; + rev = "v${version}"; + sha256 = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o="; + }; + + propagatedBuildInputs = [ + eth-typing + eth-utils + ]; + + checkInputs = [ + asn1tools + factory_boy + hypothesis + pyasn1 + pytestCheckHook + ] ++ passthru.optional-dependencies.coincurve + ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 + ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_keys" ]; + + passthru.optional-dependencies = { + coincurve = [ coincurve ]; + }; + + meta = with lib; { + description = "Common API for Ethereum key operations"; + homepage = "https://github.com/ethereum/eth-keys"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix new file mode 100644 index 000000000000..72cd3c1e8408 --- /dev/null +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-hash +, eth-utils +, hexbytes +, pytestCheckHook +, pythonOlder +, rlp +}: + +buildPythonPackage rec { + pname = "eth-rlp"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-rlp"; + rev = "v${version}"; + sha256 = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE="; + }; + + propagatedBuildInputs = [ + hexbytes + eth-utils + rlp + ]; + + checkInputs = [ + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_rlp" ]; + + meta = with lib; { + description = "RLP definitions for common Ethereum objects"; + homepage = "https://github.com/ethereum/eth-rlp"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index c98a0fc51529..a2f3103be47d 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -1,35 +1,32 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "eth-typing"; version = "3.0.0"; + disabled = pythonOlder "3.6"; - # Tests are missing from the PyPI source tarball so let's use GitHub - # https://github.com/ethereum/eth-typing/issues/8 src = fetchFromGitHub { owner = "ethereum"; - repo = pname; + repo = "eth-typing"; rev = "v${version}"; sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; }; - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; + checkInputs = [ + pytestCheckHook + ]; - disabled = pythonOlder "3.5"; - - checkInputs = [ pytest ]; - - checkPhase = '' - pytest . - ''; + pythonImportsCheck = [ "eth_typing" ]; meta = { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 9b26fb7024c0..a5b19123c1ec 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -1,12 +1,21 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, eth-hash, eth-typing, - cytoolz, hypothesis }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, eth-hash +, eth-typing +, cytoolz +, hypothesis +, isPyPy +, pytestCheckHook +, pythonOlder +, toolz +}: buildPythonPackage rec { pname = "eth-utils"; version = "2.0.0"; + disabled = pythonOlder "3.6"; - # Tests are missing from the PyPI source tarball so let's use GitHub - # https://github.com/ethereum/eth-utils/issues/130 src = fetchFromGitHub { owner = "ethereum"; repo = pname; @@ -14,8 +23,17 @@ buildPythonPackage rec { sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; - checkInputs = [ pytestCheckHook hypothesis ]; - propagatedBuildInputs = [ eth-hash eth-typing cytoolz ]; + propagatedBuildInputs = [ + eth-hash + eth-typing + ] ++ lib.optional (!isPyPy) cytoolz + ++ lib.optional isPyPy toolz; + + + checkInputs = [ + hypothesis + pytestCheckHook + ] ++ eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_utils" ]; @@ -23,6 +41,6 @@ buildPythonPackage rec { description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 0bef86501d64..7627488a071b 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.8.3"; + version = "1.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-TWXJGl0LAoQkqs49u2Z5a+sGV2QiDtbGPhQEn/qDqDQ="; + sha256 = "sha256-ZoHH96BliXDTO6+yVs+GFSAxG9wx32tHrr74zTVq1FI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix new file mode 100644 index 000000000000..79fc42ae3d02 --- /dev/null +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-utils +, hypothesis +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hexbytes"; + version = "0.2.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "hexbytes"; + rev = "v${version}"; + sha256 = "sha256-SZscM6ze9yY+iRDx/5F4XbrLXIbp6QkFnzxN7zvP9CQ="; + }; + + checkInputs = [ + eth-utils + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "hexbytes" ]; + + meta = with lib; { + description = "`bytes` subclass that decodes hex, with a readable console output"; + homepage = "https://github.com/ethereum/hexbytes"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 106520b85eae..fa003128c0d4 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.3.0"; + version = "8.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0N/IZ5fSK7xefwkROoG/udP3qTGJSQKbe+wcRiU752M="; + hash = "sha256-p7pnacr3nw/UEavzVxt0QBpSjFazdWtbm3bFj9FIH1g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index e62fa4230fff..04b22e2c5438 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,20 +1,30 @@ -{ lib, fetchPypi, buildPythonPackage, typing, pythonOlder }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, typing +, python +, pythonOlder +}: buildPythonPackage rec { pname = "mypy-extensions"; version = "0.4.3"; - # Tests not included in pip package. - doCheck = false; - - src = fetchPypi { - inherit version; - pname = "mypy_extensions"; - sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; + src = fetchFromGitHub { + owner = "python"; + repo = "mypy_extensions"; + rev = version; + sha256 = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI="; }; propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; + checkPhase = '' + ${python.interpreter} -m unittest discover tests + ''; + + pythonImportsCheck = [ "mypy_extensions" ]; + meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "http://www.mypy-lang.org"; diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix new file mode 100644 index 000000000000..8060ab45cae1 --- /dev/null +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cached-property +, eth-typing +, eth-utils +, mypy-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "py-ecc"; + version = "6.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py_ecc"; + rev = "v${version}"; + sha256 = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; + }; + + propagatedBuildInputs = [ + cached-property + eth-typing + eth-utils + mypy-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "py_ecc" ]; + + meta = with lib; { + description = "ECC pairing and bn_128 and bls12_381 curve operations"; + homepage = "https://github.com/ethereum/py_ecc"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix new file mode 100644 index 000000000000..1dfc8904fe00 --- /dev/null +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, eth-abi +, py-ecc +, pycryptodome +, python +, rlp +}: + +buildPythonPackage rec { + pname = "py-eth-sig-utils"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "rmeissner"; + repo = "py-eth-sig-utils"; + rev = "v${version}"; + sha256 = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k="; + }; + + propagatedBuildInputs = [ + eth-abi + py-ecc + pycryptodome + rlp + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + pythonImportsCheck = [ "py_eth_sig_utils" ]; + + meta = with lib; { + description = "Collection of functions to generate hashes for signing on Ethereum"; + homepage = "https://github.com/rmeissner/py-eth-sig-utils"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index ec735c057abf..e0736cdf0506 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,31 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis, eth-utils }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, eth-utils +, hypothesis +, pytestCheckHook +}: buildPythonPackage rec { pname = "rlp"; version = "3.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "pyrlp"; + rev = "v${version}"; + sha256 = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY="; }; - checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ eth-utils ]; - - # setuptools-markdown uses pypandoc which is broken at the moment - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - substituteInPlace setup.py --replace "long_description_markdown_filename='README.md'," "" + postPatch = '' + substituteInPlace setup.py \ + --replace "'setuptools-markdown'" "" ''; - checkPhase = '' - pytest . - ''; + propagatedBuildInputs = [ + eth-utils + ]; - meta = { - description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "rlp" ]; + + meta = with lib; { + description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gebner ]; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 4ec5b28bdd03..37b2fd6a76c8 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -47,6 +47,7 @@ let generic = { version, sha256 }: ''; homepage = "http://alloytools.org/"; downloadPage = "http://alloytools.org/download.html"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ notbandali ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 78537a64d50f..31f022263b22 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { Conventions, but is highly configurable. ''; homepage = "http://checkstyle.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; platforms = jre.meta.platforms; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 43970497bb48..c8db40c7b61c 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://emma.sourceforge.net/"; description = "A code coverage tool for Java"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; license = lib.licenses.cpl10; }; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index e07d98998efe..e758aa40d2f1 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl3; }; } diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 4c33ef57a47d..66258d00935f 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automatic test generation for Java"; homepage = "https://randoop.github.io/randoop/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 7b05479ea42f..e7afa7189c22 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -1,15 +1,91 @@ -{ runCommand +{ lib +, stdenv +, fetchgit +, openjdk17_headless +, gradle +, perl , makeWrapper -, jre -, build-tools }: -let - tools = builtins.head build-tools; -in -runCommand "apksigner" { - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/bin - makeWrapper "${jre}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar ${tools}/libexec/android-sdk/build-tools/${tools.version}/lib/apksigner.jar" -'' + +stdenv.mkDerivation rec { + pname = "apksigner"; + version = "33.0.1"; + + src = fetchgit { + # use pname here because the final jar uses this as the filename + name = pname; + url = "https://android.googlesource.com/platform/tools/apksig"; + rev = "platform-tools-${version}"; + hash = "sha256-CKvwB9Bb12QvkL/HBOwT6DhA1PI45+QnTNfwnvReGUQ="; + }; + + postPatch = '' + cat >> build.gradle < com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ + | sh + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashMode = "recursive"; + # Downloaded jars differ by platform + outputHash = "sha256-cs95YI0SpvzCo5x5trMXlVUGepNKIH9oZ95AfLErKIU="; + }; + + preBuild = '' + # Use the local packages from -deps + sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle + ''; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + gradle --offline --no-daemon build + + runHook postBuild + ''; + + nativeBuildInputs = [ gradle makeWrapper ]; + + installPhase = '' + install -Dm444 build/libs/apksigner.jar -t $out/lib + makeWrapper "${openjdk17_headless}/bin/java" "$out/bin/apksigner" \ + --add-flags "-jar $out/lib/apksigner.jar" + ''; + + meta = with lib; { + description = "Command line tool to sign and verify Android APKs"; + homepage = "https://developer.android.com/studio/command-line/apksigner"; + license = licenses.asl20; + maintainers = with maintainers; [ linsui ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 3dda078397ea..2538bf76afe6 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for reverse engineering Android apk files"; homepage = "https://ibotpeaches.github.io/Apktool/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 9f19dee156da..b3cbf9329b86 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 14b16b6cc82f..d4a69067705c 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { by an object that implements a particular Task interface. ''; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index e75260472140..3cf880499944 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { by an object that implements a particular Task interface. ''; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 69a61a718860..2cb085a4c01d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -164,6 +164,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.asl20; maintainers = lib.teams.bazel.members; inherit platforms; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 593a48a0fd91..56a4d5b3b5a0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -197,6 +197,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.asl20; maintainers = lib.teams.bazel.members; inherit platforms; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 296d0bb4830a..d0b71f3760c8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -156,6 +156,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.asl20; maintainers = lib.teams.bazel.members; inherit platforms; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 4a17ef1e3341..1ec162fd3403 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -86,6 +86,7 @@ rec { homepage = "https://www.gradle.org/"; changelog = "https://docs.gradle.org/${version}/release-notes.html"; downloadPage = "https://gradle.org/next-steps/?version=${version}"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix; maintainers = with maintainers; [ lorenzleutgeb liff ]; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 80919cfc377f..f2cf2694e577 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://leiningen.org/"; description = "Project automation for Clojure"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ thiagokokada ]; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 5508aeeaa11b..5ef65dde14d6 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -17,6 +17,7 @@ buildGraalvmNativeImage rec { meta = with lib; { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 9fa52f4a6588..abf7f840a454 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; mainProgram = "jenkins-cli"; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 9b13ef220d3f..9125e0eb6989 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; homepage = "https://www.liquibase.org/"; changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 264d2cc3264c..7a755d0186b3 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index e908849a3b3a..a37d8ff04e73 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Universal SQL Client"; homepage = "http://squirrel-sql.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ khumba ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index a232fe623c7b..02c6c6ae9437 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec{ This package is only the Community Edition of the Flyway command-line tool. ''; homepage = "https://flywaydb.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index df7e58bde457..d1e02f411cd3 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://galenframework.com"; description = "Automated layout testing for websites"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 97748e9e78e9..3f4f998ff97d 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. ''; homepage = "https://github.com/martinpaljak/GlobalPlatformPro"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = with licenses; [ lgpl3 ]; maintainers = with maintainers; [ ekleog ]; mainProgram = "gp"; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index ddc26be1c647..912670a432ad 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { A program that reformats Java source code to comply with Google Java Style. ''; homepage = "https://github.com/google/google-java-format"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.emptyflask ]; platforms = platforms.all; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 0676cea4a041..7dfd1a084162 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { entirely in Java 6. ''; homepage = "http://www.benf.org/other/cfr/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index c2d1a33a49d9..453455dcd118 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Measure JVM application stalls and GC pauses"; homepage = "https://www.azul.com/jhiccup/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.cc0; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/jdt-language-server/default.nix index e79d212c7d4a..7111aebf74ea 100644 --- a/pkgs/development/tools/jdt-language-server/default.nix +++ b/pkgs/development/tools/jdt-language-server/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/eclipse/eclipse.jdt.ls"; description = "Java language server"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl20; maintainers = with maintainers; [ matt-snider ]; }; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 6e140620adc9..aa5a40403c0c 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -29,6 +29,7 @@ buildGraalvmNativeImage rec { meta = with lib; { description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language"; homepage = "https://github.com/borkdude/jet"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = with maintainers; [ ericdallo ]; }; diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index 8c0d20d328d2..910ad795523d 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { texts or fonts. ''; homepage = "https://github.com/jindrapetrik/jpexs-decompiler"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; platforms = jdk8.meta.platforms; maintainers = [ ]; diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index fa98ab9da8f1..4fafaabaa3dc 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -42,6 +42,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "An IDE for programming in MIPS assembly language intended for educational-level use"; homepage = "https://courses.missouristate.edu/KenVollmar/MARS/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/development/tools/misc/bonnmotion/default.nix index 7ec9f3e1400a..cdd583bf4484 100644 --- a/pkgs/development/tools/misc/bonnmotion/default.nix +++ b/pkgs/development/tools/misc/bonnmotion/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { COOJA, MiXiM, and ONE. ''; homepage = "https://sys.cs.uos.de/bonnmotion/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependency jars + ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ oxzi ]; }; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 94e06cc87956..df5917b972d3 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -58,6 +58,7 @@ buildGraalvmNativeImage rec { meta = with lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/clojure-lsp/clojure-lsp"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; }; diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index a8330895e7c1..a48f629ad638 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool used to develop Polylith based architectures in Clojure"; homepage = "https://github.com/polyfy/polylith"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = with maintainers; [ ericdallo jlesquembre ]; platforms = jdk.meta.platforms; diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix index 4f0515eec2f5..2b14bf09ddbd 100644 --- a/pkgs/development/tools/mmixware/default.nix +++ b/pkgs/development/tools/mmixware/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace 'rm abstime.h' "" ''; + # Workaround build failure on -fno-common toolchains: + # ld: mmix-config.o:(.bss+0x600): multiple definition of `buffer'; /build/ccDuGrwH.o:(.bss+0x20): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + nativeBuildInputs = [ tetex ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 9832de15140a..22041fa545db 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; homepage = "http://www.martiansoftware.com/nailgun/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 962cd079a8e9..38493dedab10 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index cb6263aca424..132da31fee35 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ lib.maintainers.farlion ]; diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 0e69227aa786..5d35af921ec2 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -81,6 +81,7 @@ let walk parse trees. ''; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/antlr/4.9.nix b/pkgs/development/tools/parsing/antlr/4.9.nix index bdb373f243f8..3046f3e17caa 100644 --- a/pkgs/development/tools/parsing/antlr/4.9.nix +++ b/pkgs/development/tools/parsing/antlr/4.9.nix @@ -80,6 +80,7 @@ let walk parse trees. ''; homepage = "https://www.antlr.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 4e95b0b4bc1c..6a92bd2fba28 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Repository manager for binary software components"; homepage = "http://www.sonatype.org/nexus"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index a3a0dba509b3..56ddc9af95b2 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -109,6 +109,10 @@ in stdenv.mkDerivation rec { broken = stdenv.isDarwin; description = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; homepage = "https://gluonhq.com/products/scene-builder/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.bsd3; maintainers = with maintainers; [ wirew0rm ]; platforms = platforms.all; diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 3d53a117de78..63ff945790e0 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -104,6 +104,10 @@ in stdenv.mkDerivation rec { This lets you find bugs and get things pixel perfect without having to do the compile-check-compile dance. ''; homepage = "https://github.com/JonathanGiles/scenic-view/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ wirew0rm ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index be3048cca25b..ac684f081f4a 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 975a040b8bc3..d18ca0012d80 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation { description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; }; } diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 943d6b60b60d..56ff4f3ad3e5 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ coconnor offline ]; mainProgram = "selenium-server"; diff --git a/pkgs/development/tools/sourcetrail/java.nix b/pkgs/development/tools/sourcetrail/java.nix index 7056dca447f7..7e5bd75f84aa 100644 --- a/pkgs/development/tools/sourcetrail/java.nix +++ b/pkgs/development/tools/sourcetrail/java.nix @@ -1,4 +1,4 @@ -{ pkgs, javaPackages }: +{ lib, pkgs, javaPackages }: let javaIndexer = javaPackages.mavenbuild { @@ -17,6 +17,7 @@ let meta = { description = "Java indexer for Sourcetrail"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; }; in diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 5bc89e839e92..b9fd2749527d 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { a command line tool that runs “spring scripts”. ''; homepage = "https://spring.io/projects/spring-boot"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 05c1b62477b0..fdde9941bd5e 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.all; diff --git a/pkgs/games/cgoban/default.nix b/pkgs/games/cgoban/default.nix index 162de112fb55..3d202985f1b0 100644 --- a/pkgs/games/cgoban/default.nix +++ b/pkgs/games/cgoban/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client for the KGS Go Server"; homepage = "https://www.gokgs.com/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.free; maintainers = with maintainers; [ savannidgerinel ]; platforms = adoptopenjdk-jre-bin.meta.platforms; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 18153dec0fb0..8bba2d1f94e3 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -97,6 +97,10 @@ in stdenv.mkDerivation { It includes a map editor, a simple map format, multiplayer network play, single player, hotseat, 5 user interfaces and many more features. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 2a3da233b450..3484db0cc8ff 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -29,6 +29,7 @@ buildEnv { meta = with lib; { description = "A multi-platform, open source, java-based legends viewer for dwarf fortress"; maintainers = with maintainers; [ Baughn ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.all; homepage = "https://github.com/robertjanetzko/LegendsBrowser"; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 9d8d74921e54..be8bb7017863 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -70,6 +70,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; homepage = "https://gurpscharactersheet.com/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index ff77f08651a0..9edc17f0bc08 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -199,6 +199,10 @@ stdenv.mkDerivation rec { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "A sandbox tower defense game"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz petabyteboy ]; platforms = platforms.x86_64; diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index eda7da943ca5..e5f11f71f211 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Minecraft Server"; homepage = "https://minecraft.net"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfreeRedistributable; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice tomberek costrouc jyooru ]; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 7b7d66f6188c..31c9467109e9 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation { meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; diff --git a/pkgs/games/purpur/default.nix b/pkgs/games/purpur/default.nix index 4f08010b4555..e28106183e85 100644 --- a/pkgs/games/purpur/default.nix +++ b/pkgs/games/purpur/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { gameplay features, and performance built on top of Airplane. ''; homepage = "https://purpurmc.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jyooru ]; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 39ff9c137dfb..0cb72f6d23c6 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd2; maintainers = with maintainers; [ kmeakin ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index d8bf9d5f3235..81baf3b664ba 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -80,6 +80,10 @@ in stdenv.mkDerivation rec { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index efba43e92dd4..e929ef98fbf6 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-world single-player space-combat, roleplaying, exploration, and economic game"; homepage = "https://fractalsoftworks.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = with maintainers; [ bbigras ]; }; diff --git a/pkgs/games/tr-patcher/default.nix b/pkgs/games/tr-patcher/default.nix index 68e3eb608954..0336ed1ac02f 100644 --- a/pkgs/games/tr-patcher/default.nix +++ b/pkgs/games/tr-patcher/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allow to update dependancies of the Tamriel-Data mod for morrowind"; homepage = "https://gitlab.com/bmwinger/tr-patcher"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ maintainers.marius851000 ]; platforms = platforms.linux; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index e8b5d748b932..49b07f3ad654 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { description = "An open-source Android/Desktop remake of Civ V"; homepage = "https://github.com/yairm210/Unciv"; maintainers = with maintainers; [ tex ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 905d51438b68..d94a24e528c2 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open-source boardgame engine"; homepage = "https://vassalengine.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix index 7552ce700f32..cc359f78822e 100644 --- a/pkgs/games/xmage/default.nix +++ b/pkgs/games/xmage/default.nix @@ -32,6 +32,7 @@ EOS meta = with lib; { description = "Magic Another Game Engine"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; homepage = "http://xmage.de/"; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index bd3eedbe94f7..07ab96838520 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and control Android devices over USB or TCP/IP"; homepage = "https://github.com/Genymobile/scrcpy"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # server + ]; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ deltaevo lukeadams msfjarvis ]; diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix index 33c8aceeb265..de474492229c 100644 --- a/pkgs/servers/atlassian/bamboo.nix +++ b/pkgs/servers/atlassian/bamboo.nix @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Bamboo Data Center is a continuous delivery server."; homepage = "https://www.atlassian.com/software/bamboo"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ unfree ]; maintainers = with maintainers; [ techknowlogick ]; }; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 4d0ac7ef3ef1..ed8447accf86 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -43,6 +43,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Team collaboration software written in Java and mainly used in corporate environments"; homepage = "https://www.atlassian.com/software/confluence"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ]; }; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 53644d62e65b..fbbda3837b97 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://storm.apache.org/"; description = "Distributed realtime computation system"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ edwtjo vizanto ]; platforms = with platforms; unix; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index bc599ebbc2c8..fe94125c6ae5 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -28,6 +28,7 @@ let meta = with lib; { homepage = "https://github.com/softwaremill/elasticmq"; description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ peterromfeldhk ]; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 875a2fa2c1fd..fa5c4a948ce4 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; homepage = "https://github.com/soabase/exhibitor"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; mainProgram = "startExhibitor.sh"; platforms = platforms.unix; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 21f3fecb68e4..409f52ab9db0 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OSGi gateway"; homepage = "https://felix.apache.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.sander ]; }; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index ee673b53aad5..62e1e22992f6 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Java SQL database"; homepage = "http://www.h2database.com/html/main.html"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; platforms = lib.platforms.linux; maintainers = with maintainers; [ mahe ]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 564636f6db24..4ad126afa501 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.jboss.org/"; description = "Open Source J2EE application server"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; platforms = platforms.unix; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 645abba303af..035a34a374eb 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A Web server and javax.servlet container"; homepage = "https://www.eclipse.org/jetty/"; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; maintainers = with maintainers; [ emmanuelrosa ]; }; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index ab05d8cbb0ed..4bca9a37a9ce 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; }; } diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 07de22e41acf..19a82bd8b939 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Issue tracking and project management tool for developers"; maintainers = teams.serokell.members; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; }; diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 383bd524d640..121372ec2fc4 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { supported on a single jibri. ''; homepage = "https://github.com/jitsi/jibri"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = teams.jitsi.members; platforms = platforms.linux; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 95a3ade822c1..ded809c163e5 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.keycloak.org/"; description = "Identity and access management for modern applications and services"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = jre.meta.platforms; maintainers = with maintainers; [ ngerstle talyz ]; diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index b5e23d0fe22d..b388e20aa1b1 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.apsl20; maintainers = with maintainers; [ benley ]; }; diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix index 1ef06061326e..e2dca3f632e1 100644 --- a/pkgs/servers/keycloak/scim-for-keycloak/default.nix +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -30,6 +30,10 @@ javaPackages.mavenfod rec { meta = with lib; { homepage = "https://github.com/Captain-P-Goldfish/scim-for-keycloak"; description = "A third party module that extends Keycloak with SCIM functionality"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies + ]; license = licenses.bsd3; maintainers = with maintainers; [ mkg20001 ]; }; diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index 91d291c58dab..dbdb8a828e39 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation { meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.agpl3Only; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 814626fec125..a6d2d88f7a22 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 8fba050ffade..0089ee33c27d 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Personal media streamer"; homepage = "https://airsonic.github.io"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 9a311c02f335..cf180de54a70 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.offline ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index d163cecfdd24..c84bc073141c 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://riemann.io/"; description = "A network monitoring system"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; maintainers = []; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index a94de966e4d3..3ae3a990d069 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An alerting dashboard for Graphite"; homepage = "https://github.com/scobal/seyren"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.offline ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 37e43aeb3d94..97ccf1a18e2b 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Zipkin distributed tracing system"; homepage = "https://zipkin.io/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index 3be8d95b139c..102d69f82b40 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -96,6 +96,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies + ]; license = licenses.asl20; knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 78132614bba9..dc6687379580 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 36fba217e005..01c301e1a454 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/xerial/sqlite-jdbc"; description = "Library for accessing and creating SQLite database files in Java"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d6f2750875a9..72ba0046d295 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -35,6 +35,7 @@ let meta = with lib; { homepage = "http://www.ubnt.com/"; description = "Controller for Ubiquiti UniFi access points"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.unix; maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; diff --git a/pkgs/tools/backup/android-backup-extractor/default.nix b/pkgs/tools/backup/android-backup-extractor/default.nix index 8572efe6107f..5411b70c77a2 100644 --- a/pkgs/tools/backup/android-backup-extractor/default.nix +++ b/pkgs/tools/backup/android-backup-extractor/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility to extract and repack Android backups created with adb backup"; homepage = "https://github.com/nelenkov/android-backup-extractor"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index e2e16f9f69a2..3d799844ed8e 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "sha256-pbCN262gyS5BSUTN9QU+x2Nnrc8mmCSQH6Inng4OS8c="; + sha256 = "sha256-jQgUPZumcIDkZ4s7R8o5F/p/b4ilPJGMPFKvUU30WaY="; }; patches = [ @@ -42,9 +42,10 @@ buildGoModule rec { meta = with lib; { homepage = "https://restic.net"; + changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md"; description = "A backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; - maintainers = [ maintainers.mbrgm ]; + maintainers = [ maintainers.mbrgm maintainers.dotlambda ]; }; } diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix new file mode 100644 index 000000000000..7fce055ce9fc --- /dev/null +++ b/pkgs/tools/compression/bzip3/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "bzip3"; + version = "1.1.3"; + + outputs = [ "bin" "dev" "out" ]; + + src = fetchFromGitHub { + owner = "kspalaiologos"; + repo = "bzip3"; + rev = version; + hash = "sha256-puGtaL76p4BzSiTPf3qFgXN4pz90CDU9dziGIszk3to="; + }; + + postPatch = '' + echo -n "${version}" > .tarball-version + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + configureFlags = [ + "--disable-arch-native" + ]; + + meta = { + description = "A better and stronger spiritual successor to BZip2"; + homepage = "https://github.com/kspalaiologos/bzip3"; + changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + # upstream supports Darwin but I couldn't get it to work + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/games/minecraft/amidst/default.nix b/pkgs/tools/games/minecraft/amidst/default.nix index 8ec65a1dd391..5e6a79e1cba1 100644 --- a/pkgs/tools/games/minecraft/amidst/default.nix +++ b/pkgs/tools/games/minecraft/amidst/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/toolbox4minecraft/amidst"; description = "Advanced Minecraft Interface and Data/Structure Tracking"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; maintainers = [ maintainers.ivar ]; platforms = platforms.linux; diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix index 41754ce872da..4ba2dc542aaf 100644 --- a/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fabricmc.net/"; description = "A lightweight, experimental modding toolchain for Minecraft"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; diff --git a/pkgs/tools/games/minecraft/optifine/generic.nix b/pkgs/tools/games/minecraft/optifine/generic.nix index d33e7d75126d..76acd065af1d 100644 --- a/pkgs/tools/games/minecraft/optifine/generic.nix +++ b/pkgs/tools/games/minecraft/optifine/generic.nix @@ -30,6 +30,7 @@ runCommand "optifine-${mcVersion}" { It allows Minecraft to run faster and look better with full support for HD textures and many configuration options. This is for version ${mcVersion} of Minecraft. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 4a0ef0e9a73a..4fad46f295ae 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/google/agi/"; description = "Android GPU Inspector"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.ivar ]; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 07f7b63ad7d4..f95c9b527c14 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index a22f402b5d17..ab1c6ff74ec3 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; homepage = "https://github.com/stathissideris/ditaa"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 2f9c43373bbe..93677adefe72 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { raskin ]; hydraPlatforms = []; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.free; platforms = with lib.platforms; unix; }; diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index 18721390a511..175b15b22aec 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "1D and 2D code reading library"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5db9e8f00fb2..99f130b3e5df 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source log management solution"; homepage = "https://www.graylog.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ maintainers.fadenb ]; mainProgram = "graylogctl"; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 45c4441ea2d6..756484234d6e 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -19,6 +19,7 @@ let meta = a.meta // { platforms = graylog.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; }); in { diff --git a/pkgs/tools/misc/gtklp/default.nix b/pkgs/tools/misc/gtklp/default.nix index 43f67b6b7956..8eafd98e267f 100644 --- a/pkgs/tools/misc/gtklp/default.nix +++ b/pkgs/tools/misc/gtklp/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { ./patches/autoconf.patch ]; + # Workaround build failure on -fno-common toolchains: + # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar'; + # file.o:libgtklp/libgtklp.h:83: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' substituteInPlace include/defaults.h --replace "netscape" "firefox" substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \ diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 93b61ec12dd3..8e748efe7b4e 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { Checks the syntactical correctness of an INTERLIS data model. ''; homepage = "https://www.interlis.ch/downloads/ili2c"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.lgpl21Plus; maintainers = [ maintainers.das-g ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index cfdc8cba5df5..57441e645df2 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ kylesferrazza ]; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 8be9c0eecee4..bf81a4ad902a 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ truh ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 2cb6ef2f12cb..14ef1b335820 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Draw UML diagrams using a simple and human readable text description"; homepage = "http://plantuml.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor Mogria ]; diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/tools/misc/procyon/default.nix index c217f25c1e19..4d5fb120943f 100644 --- a/pkgs/tools/misc/procyon/default.nix +++ b/pkgs/tools/misc/procyon/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Procyon is a suite of Java metaprogramming tools including a Java decompiler"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; homepage = "https://github.com/mstrobel/procyon/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 4c1156a83663..d58ff3fa8ed9 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { SMC can also generate GraphViz state diagrams from the input file. ''; homepage = "http://smc.sourceforge.net/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl11; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index aca04546fd2a..41da294d19a5 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -46,6 +46,7 @@ in stdenv.mkDerivation rec { Linux. ''; homepage = "https://www.umlet.com"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index b04ddf8f597a..846c966d00c4 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = jdk11.meta.platforms; hydraPlatforms = []; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index de332843c04e..66a26ee98de1 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Applications and router for I2P, anonymity over the Internet"; homepage = "https://geti2p.net"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ joelmo ]; diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 58b35f2f53fa..39002f128159 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libpcap, guile, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31"; }; + patches = [ + # Pull upstream patch for -fno-common toolchains: + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rixed/junkie/commit/52209c5b0c9a09981739ede9701cd73e82a88ea5.patch"; + sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr"; + }) + ]; buildInputs = [ libpcap guile openssl ]; nativeBuildInputs = [ pkg-config ]; configureFlags = [ diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 5fc03c19c902..c9e58174f85e 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -4,7 +4,7 @@ let pname = "ookla-speedtest"; version = "1.1.1"; - srcs = { + srcs = rec { x86_64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; sha256 = "sha256-lwR3/f7k10HnXwiPr2SPm1HHvgQxP7iP+13gfrGjBAw="; @@ -13,6 +13,11 @@ let url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz"; sha256 = "sha256-J2pAhz/hw8okohWAwvxkqpLtNY/8bbYHGhPQOo1DH9k="; }; + x86_64-darwin = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}.84-macosx-x86_64.tgz"; + sha256 = "sha256-FT925OUCortHDH98O0uK+qUOuYuxHoYhb8sai5JnbpQ="; + }; + aarch64-darwin = x86_64-darwin; }; in diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 1ff0299a6bff..7f6923da822b 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -31,6 +31,7 @@ let this = stdenv.mkDerivation rec { meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/OpenAPITools/openapi-generator"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index c6107086fde5..f50920186dfe 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -31,6 +31,9 @@ python3Packages.buildPythonApplication rec { sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py + + # incompatible with latest autobahn + rm src/allmydata/test/web/test_logs.py ''; # Remove broken and expensive tests. @@ -95,6 +98,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://tahoe-lafs.org/"; license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 37e35e95e7f4..e8f6364de85e 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/swagger-api/swagger-codegen"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.jraygauthier ]; }; diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 9aedd77aff7f..224b71f63d95 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers._1000101 ]; }; diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index ccd5318ffb60..7e8d8ca4bf88 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -110,6 +110,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Free client-side encryption for your cloud files"; homepage = "https://cryptomator.org"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ bachp ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index bb53a1958e00..17889f3214fe 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -171,6 +171,10 @@ in stdenv.mkDerivation rec { description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission"; homepage = "https://ghidra-sre.org/"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.asl20; maintainers = [ "roblabla" ]; }; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index a359258f3227..a382eecce3fe 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission"; homepage = "https://github.com/NationalSecurityAgency/ghidra"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ ck3d govanify mic92 ]; }; diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 1d1d4797a9bb..24e8470182bf 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and friendly network scanner"; homepage = "https://angryip.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza ]; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 1358d9f3198e..654104ada73e 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -103,6 +103,10 @@ in stdenv.mkDerivation { Command line and GUI tools for produce Java source code from Android Dex and Apk files. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 4e7a62374040..bfa4132ac025 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -102,6 +102,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Fast Java Decompiler with powerful GUI"; homepage = "https://java-decompiler.github.io/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index e7e21aec7c8e..e8afdf6bf8c0 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { description = "Client side implementation of the eCard-API-Framework (BSI TR-03112) and related international standards, such as ISO/IEC 24727"; homepage = "https://www.openecard.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 692746e1f7ff..49fabf2856de 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation rec { homepage = "https://www.sleuthkit.org/"; maintainers = with maintainers; [ raskin gfrascadorio ]; platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies + ]; license = licenses.ipl10; }; } diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 6111a6f1c8bd..f79f6670625a 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { mainProgram = "crowdin"; homepage = "https://github.com/crowdin/crowdin-cli/"; description = "A command-line client for the Crowdin API"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ DamienCassou ]; }; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 45196422ff54..796aa0da8f91 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/w3c/epubcheck"; description = "Validation tool for EPUB"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 bsd3 mpl10 w3c ]; platforms = platforms.all; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index cae8fd201906..bce8fec2da48 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://languagetool.org"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Plus; maintainers = with maintainers; [ edwtjo ]; platforms = jre.meta.platforms; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 4d6d23054da1..7525dd65785e 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { modes, BaseX offers a client/server architecture. ''; homepage = "https://basex.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 683eecde46b9..c7866f8cba8a 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { # for downloads and call it the "project site". homepage = "https://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index be7f978a42aa..ed07c5588fec 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -322,6 +322,9 @@ stdenv.mkDerivation rec { the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user. ''; + sourceProvenance = with sourceTypes; [ + fromSource + ] ++ lib.optional _enableDitaaFilter binaryBytecode; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index f1bec5a240a1..68b8399fc76c 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://xmlgraphics.apache.org/fop/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 192b5424e9a6..7de3e2ada379 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -88,6 +88,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Command-line tool for working with PDFs"; homepage = "https://gitlab.com/pdftk-java/pdftk"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin averelld ]; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1e81ea80809e..7ef48d6193d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1373,7 +1373,6 @@ mapAliases ({ trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 - tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b8eb6f2688..98f94a756695 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1733,9 +1733,7 @@ with pkgs; apksigcopier = callPackage ../development/tools/apksigcopier { }; - apksigner = callPackage ../development/tools/apksigner { - inherit (androidenv.androidPkgs_9_0) build-tools; - }; + apksigner = callPackage ../development/tools/apksigner { }; apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; @@ -4524,6 +4522,10 @@ with pkgs; bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + bzip3 = callPackage ../tools/compression/bzip3 { + stdenv = clangStdenv; + }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef3de37f643f..582d1c055690 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11511,6 +11511,8 @@ let description = "A tool to read, write and edit EXIF meta information"; homepage = "https://exiftool.org/"; + mainProgram = "exiftool"; + longDescription = '' ExifTool is a platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 298afaf66954..970d86079764 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -679,6 +679,8 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + asn1tools = callPackage ../development/python-modules/asn1tools { }; + aspell-python = callPackage ../development/python-modules/aspell-python { }; aspy-refactor-imports = callPackage ../development/python-modules/aspy-refactor-imports { }; @@ -1553,6 +1555,10 @@ in { censys = callPackage ../development/python-modules/censys { }; + coincurve = callPackage ../development/python-modules/coincurve { + inherit (pkgs) secp256k1; + }; + connect-box = callPackage ../development/python-modules/connect_box { }; connection-pool = callPackage ../development/python-modules/connection-pool { }; @@ -2809,8 +2815,18 @@ in { etesync = callPackage ../development/python-modules/etesync { }; + eth-abi = callPackage ../development/python-modules/eth-abi { }; + + eth-account = callPackage ../development/python-modules/eth-account { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + eth-keyfile = callPackage ../development/python-modules/eth-keyfile { }; + + eth-keys = callPackage ../development/python-modules/eth-keys { }; + + eth-rlp = callPackage ../development/python-modules/eth-rlp { }; + eth-typing = callPackage ../development/python-modules/eth-typing { }; eth-utils = callPackage ../development/python-modules/eth-utils { }; @@ -3919,6 +3935,8 @@ in { heudiconv = callPackage ../development/python-modules/heudiconv { }; + hexbytes = callPackage ../development/python-modules/hexbytes { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; @@ -5944,6 +5962,10 @@ in { py-deprecate = callPackage ../development/python-modules/py-deprecate { }; + py-ecc = callPackage ../development/python-modules/py-ecc { }; + + py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; oasatelematics = callPackage ../development/python-modules/oasatelematics { };