From 2a9691e0c00a4d14f52bd35ec40f9d2b174534f4 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 24 Feb 2022 13:31:02 -0500 Subject: [PATCH 01/73] nixos/systemd: prepare tests for formatters - Code formatters normally strip trailing whitespace. Since this test depends on the whitespace to succeed, formatting the code would break the test - This small change make this file to be formatted while at the same time preserving the test meaning --- nixos/tests/systemd-networkd-vrf.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index 8a1580fc2ad..3839a49375d 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -159,23 +159,18 @@ in { node2.wait_for_unit("network.target") node3.wait_for_unit("network.target") - # NOTE: please keep in mind that the trailing whitespaces in the following strings - # are intentional as the output is compared against the raw `iproute2`-output. - # editorconfig-checker-disable client_ipv4_table = """ - 192.168.1.2 dev vrf1 proto static metric 100 + 192.168.1.2 dev vrf1 proto static metric 100\x20 192.168.2.3 dev vrf2 proto static metric 100 """.strip() vrf1_table = """ - broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1 - 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1 - local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1 + 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1\x20 + local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1\x20 broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1 """.strip() vrf2_table = """ - broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1 - 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1 - local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1 + 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1\x20 + local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1\x20 broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 """.strip() # editorconfig-checker-enable From c035336c8d6fd97e8db2165a5f7f5d0cd0ba3df3 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 26 May 2022 17:46:45 +0200 Subject: [PATCH 02/73] sm64ex-coop: init at 0.pre+date=2022-05-14 --- pkgs/games/sm64ex/default.nix | 104 ++++++++++++++------------------ pkgs/games/sm64ex/generic.nix | 83 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 134 insertions(+), 61 deletions(-) create mode 100644 pkgs/games/sm64ex/generic.nix diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index c6df2099d3c..a6bf7202adc 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,71 +1,55 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, python3 -, pkg-config -, audiofile -, SDL2 -, hexdump -, requireFile -, compileFlags ? [ ] -, region ? "us" -, baseRom ? requireFile { - name = "baserom.${region}.z64"; - message = '' - This nix expression requires that baserom.${region}.z64 is - already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents - and add it to the nix store with nix-store --add-fixed sha256 . - Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". - ''; - sha256 = { - "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; - "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; - "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; - }.${region}; - } +, callPackage +, autoPatchelfHook +, branch }: -stdenv.mkDerivation rec { - pname = "sm64ex"; - version = "unstable-2021-11-30"; +{ + sm64ex = callPackage ./generic.nix { + pname = "sm64ex"; + version = "0.pre+date=2021-11-30"; - src = fetchFromGitHub { - owner = "sm64pc"; - repo = "sm64ex"; - rev = "db9a6345baa5acb41f9d77c480510442cab26025"; - sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "db9a6345baa5acb41f9d77c480510442cab26025"; + sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + }; + + extraMeta = { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + }; }; - nativeBuildInputs = [ python3 pkg-config ]; - buildInputs = [ audiofile SDL2 hexdump ]; + sm64ex-coop = callPackage ./generic.nix { + pname = "sm64ex-coop"; + version = "0.pre+date=2022-05-14"; - makeFlags = [ "VERSION=${region}" ] ++ compileFlags - ++ lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + src = fetchFromGitHub { + owner = "djoslin0"; + repo = "sm64ex-coop"; + rev = "8200b175607fe2939f067d496627c202a15fe24c"; + sha256 = "sha256-c1ZmMBtvYYcaJ/WxkZBVvNGVCeSXfm8NKe/BiAIJtks="; + }; - inherit baseRom; + extraNativeBuildInputs = [ + autoPatchelfHook + ]; - preBuild = '' - patchShebangs extract_assets.py - cp $baseRom ./baserom.${region}.z64 - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/sm64pc/sm64ex"; - description = "Super Mario 64 port based off of decompilation"; - longDescription = '' - Super Mario 64 port based off of decompilation. - Note that you must supply a baserom yourself to extract assets from. - If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". - If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + postInstall = let + sharedLib = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + mkdir -p $out/lib + cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib + cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib ''; - license = licenses.unfree; - maintainers = with maintainers; [ ivar ]; - platforms = platforms.unix; + + extraMeta = { + homepage = "https://github.com/djoslin0/sm64ex-coop"; + description = "Super Mario 64 online co-op mod, forked from sm64ex"; + }; }; -} +}.${branch} diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix new file mode 100644 index 00000000000..ab75ac70b9c --- /dev/null +++ b/pkgs/games/sm64ex/generic.nix @@ -0,0 +1,83 @@ +{ pname +, version +, src +, extraNativeBuildInputs ? [ ] +, extraMeta ? {} +, compileFlags ? [ ] +, postInstall ? "" +, region ? "us" + +, lib +, stdenv +, fetchFromGitHub +, python3 +, pkg-config +, audiofile +, SDL2 +, hexdump +, requireFile +, baseRom ? requireFile { + name = "baserom.${region}.z64"; + message = '' + This nix expression requires that baserom.${region}.z64 is + already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents + and add it to the nix store with nix-store --add-fixed sha256 . + Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + ''; + sha256 = { + "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; + "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; + "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; + }.${region}; + } +}: + +stdenv.mkDerivation rec { + inherit pname version src postInstall; + + nativeBuildInputs = [ + python3 + pkg-config + hexdump + ] ++ extraNativeBuildInputs; + + buildInputs = [ + audiofile + SDL2 + ]; + + enableParallelBuilding = true; + + makeFlags = [ + "VERSION=${region}" + ] ++ lib.optionals stdenv.isDarwin [ + "OSX_BUILD=1" + ] ++ compileFlags; + + preBuild = '' + patchShebangs extract_assets.py + ln -s ${baseRom} ./baserom.${region}.z64 + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex + + runHook postInstall + ''; + + meta = with lib; { + longDescription = + extraMeta.description or "Super Mario 64 port based off of decompilation" + "\n" + '' + Note that you must supply a baserom yourself to extract assets from. + If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + ''; + mainProgram = "sm64ex"; + license = licenses.unfree; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + } // extraMeta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdb1dc71df2..149635fc708 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31411,7 +31411,13 @@ with pkgs; runescape = callPackage ../games/runescape-launcher { }; - sm64ex = callPackage ../games/sm64ex { }; + sm64ex = callPackage ../games/sm64ex { + branch = "sm64ex"; + }; + + sm64ex-coop = callPackage ../games/sm64ex { + branch = "sm64ex-coop"; + }; snipes = callPackage ../games/snipes { }; From 8b501a1089c346ea6efcddd6de18015512467493 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 5 Jun 2022 22:12:24 +0300 Subject: [PATCH 03/73] rss-glx: fix build --- pkgs/misc/screensavers/rss-glx/cstddef.patch | 12 ++++++++++++ pkgs/misc/screensavers/rss-glx/default.nix | 20 ++++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/screensavers/rss-glx/cstddef.patch diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/misc/screensavers/rss-glx/cstddef.patch new file mode 100644 index 00000000000..8bec510b040 --- /dev/null +++ b/pkgs/misc/screensavers/rss-glx/cstddef.patch @@ -0,0 +1,12 @@ +diff --git i/src/Implicit/impSurface.h w/src/Implicit/impSurface.h +index 41fab81..027587f 100644 +--- i/src/Implicit/impSurface.h ++++ w/src/Implicit/impSurface.h +@@ -25,6 +25,7 @@ + #ifdef WIN32 + #include + #endif ++#include + #include + #include + diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 981db782c7c..a90b5d65653 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,16 @@ -{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}: +{ lib +, stdenv +, fetchurl +, autoconf +, pkg-config +, xlibsWrapper +, libXext +, libGLU +, libGL +, imagemagick6 +, libtiff +, bzip2 +}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,9 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; + patches = [ + ./cstddef.patch + ]; + NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c3b14d281..ba3ec0cdbd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34562,7 +34562,7 @@ with pkgs; stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; From 5bd650e06216d13e6db91c4b5dda5b94632dfb39 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 5 Jun 2022 23:08:44 +0300 Subject: [PATCH 04/73] dapper: use buildGoModule --- pkgs/development/tools/dapper/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 45e4614b448..8e3160b4cdd 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -1,30 +1,29 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dapper"; version = "0.5.8"; - goPackagePath = "github.com/rancher/dapper"; - src = fetchFromGitHub { owner = "rancher"; repo = "dapper"; rev = "v${version}"; sha256 = "sha256-t1w8bhwCjZHmvgBG6Tv8kgqTbC7v5P5QOvJGuTJUC04="; }; - patchPhase = '' - substituteInPlace main.go --replace 0.0.0 ${version} - ''; + vendorSha256 = null; + + patchPhase = '' + substituteInPlace main.go --replace 0.0.0 ${version} + ''; meta = with lib; { - description = "Docker Build Wrapper"; + description = "Docker build wrapper"; homepage = "https://github.com/rancher/dapper"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ kuznero ]; }; } - From 0045581c231ae96ccc1b14c62c465c8aafe6eb8d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 10 Jun 2022 22:14:59 +0200 Subject: [PATCH 05/73] boinc: 7.18.1 -> 7.20.0 https://github.com/BOINC/boinc/releases/tag/client_release%2F7.20%2F7.20.0 --- pkgs/applications/science/misc/boinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d0955a4d70c..702dd3242e6 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let - majorVersion = "7.18"; - minorVersion = "1"; + majorVersion = "7.20"; + minorVersion = "0"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ="; + sha256 = "sha256-W8+ALVO2OHxxBi80ZFgc8RxXneGINCHYNeMXimp9TIw="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; From 08f841f03d45c9858789940ec9267cfc1df5f828 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:26:59 +0300 Subject: [PATCH 06/73] asmfmt: use buildGoModule --- pkgs/development/tools/asmfmt/default.nix | 21 ++++++++++++++------- pkgs/development/tools/asmfmt/deps.nix | 20 -------------------- 2 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/tools/asmfmt/deps.nix diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 81f7aa764f2..953a5469ec5 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -1,14 +1,12 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "asmfmt"; version = "1.3.2"; - goPackagePath = "github.com/klauspost/asmfmt"; - src = fetchFromGitHub { owner = "klauspost"; repo = "asmfmt"; @@ -16,17 +14,26 @@ buildGoPackage rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. subPackages = [ "cmd/asmfmt" ]; + ldflags = [ "-s" "-w" ]; + + # There are no tests. + doCheck = false; + meta = with lib; { - description = "Go Assembler Formatter"; + description = "Go assembler formatter"; + longDescription = '' + This will format your assembler code in a similar way that gofmt formats + your Go code. + ''; homepage = "https://github.com/klauspost/asmfmt"; + changelog = "https://github.com/klauspost/asmfmt/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/asmfmt/deps.nix b/pkgs/development/tools/asmfmt/deps.nix deleted file mode 100644 index 0288fc206d4..00000000000 --- a/pkgs/development/tools/asmfmt/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; - sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; - }; - } - { - goPackagePath = "sourcegraph.com/sqs/goreturns"; - fetch = { - type = "git"; - url = "https://github.com/sqs/goreturns"; - rev = "538ac601451833c7c4449f8431d65d53c1c60e41"; - sha256 = "0gcplch8zmcgwl6xvcffxg50g3xnf60n7dlqxgn51179qcjr354p"; - }; - } -] From e90ede62f2fce749887f980fd2a99cff6e7e6ce7 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:30:28 +0300 Subject: [PATCH 07/73] go-check: 2018-09-12 -> unstable-2018-12-24 --- pkgs/development/tools/check/default.nix | 22 +++++++++------------- pkgs/development/tools/check/deps.nix | 11 ----------- 2 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/check/deps.nix diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index a28124828f9..f74578e25a0 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -1,30 +1,26 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitLab }: -buildGoPackage rec { - pname = "check-unstable"; - version = "2018-09-12"; - rev = "88db195993f8e991ad402754accd0635490769f9"; - - goPackagePath = "gitlab.com/opennota/check"; +buildGoModule rec { + pname = "check"; + version = "unstable-2018-12-24"; + rev = "ccaba434e62accd51209476ad093810bd27ec150"; src = fetchFromGitLab { - inherit rev; - owner = "opennota"; repo = "check"; - sha256 = "1983xmdkgpqda4qz8ashc6xv1zg5jl4zly3w566grxc5sfxpgf0i"; + inherit rev; + sha256 = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-DyysiVYFpncmyCzlHIOEtWlCMpm90AC3gdItI9WinSo="; meta = with lib; { description = "A set of utilities for checking Go sources"; homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/check/deps.nix b/pkgs/development/tools/check/deps.nix deleted file mode 100644 index b9c50d95d11..00000000000 --- a/pkgs/development/tools/check/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "677d2ff680c1"; - sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5"; - }; - } -] From 7f0406a183c11e0c9ecf529627b13d3abb47893d Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:46:39 +0300 Subject: [PATCH 08/73] ineffassign: 2018-09-09 -> unstable-2021-09-04 --- .../development/tools/ineffassign/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 111048b562f..16e392b6bbc 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -1,28 +1,31 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub +, go }: -buildGoPackage rec { - pname = "ineffassign-unstable"; - version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; - - goPackagePath = "github.com/gordonklaus/ineffassign"; +buildGoModule rec { + pname = "ineffassign"; + version = "unstable-2021-09-04"; + rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c"; src = fetchFromGitHub { - inherit rev; - owner = "gordonklaus"; repo = "ineffassign"; - sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd"; + inherit rev; + sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ="; }; + vendorSha256 = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM="; + + allowGoReference = true; + + checkInputs = [ go ]; + meta = with lib; { description = "Detect ineffectual assignments in Go code"; homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } From 9a373323142ad35737ab74fa7b29d4fa6ccf0542 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:51:34 +0300 Subject: [PATCH 09/73] maligned: 2018-07-07 -> unstable-2022-02-04 --- pkgs/development/tools/maligned/default.nix | 27 +++++++++++---------- pkgs/development/tools/maligned/deps.nix | 20 --------------- 2 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/maligned/deps.nix diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 06cd23e40f4..f39b83489f9 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -1,30 +1,31 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub +, go }: -buildGoPackage rec { - pname = "maligned-unstable"; - version = "2018-07-07"; - rev = "6e39bd26a8c8b58c5a22129593044655a9e25959"; - - goPackagePath = "github.com/mdempsky/maligned"; +buildGoModule rec { + pname = "maligned"; + version = "unstable-2022-02-04"; + rev = "d7cd9a96ae47d02b08234503b54709ad4ae82105"; src = fetchFromGitHub { - inherit rev; - owner = "mdempsky"; repo = "maligned"; - sha256 = "08inr5xjqv9flrlyhqd8ck1q26y5xb6iilz0xkb6bqa4dl5ialhi"; + inherit rev; + sha256 = "sha256-exljmDNtVhjJkvh0EomcbBXSsmQx4I59MHDfMWSQyKk="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-q/0lxZWk3a7brMsbLvZUSZ8XUHfWfx79qxjir1Vygx4="; + + allowGoReference = true; + + checkInputs = [ go ]; meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted"; homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/maligned/deps.nix b/pkgs/development/tools/maligned/deps.nix deleted file mode 100644 index afe5e50e47b..00000000000 --- a/pkgs/development/tools/maligned/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; - }; - } -] From 04bd3063744f9921ac65a2056f5e02913050c5f4 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 14:18:20 +0300 Subject: [PATCH 10/73] cayley: 0.7.5 -> 0.7.7 --- pkgs/servers/cayley/default.nix | 40 ++- pkgs/servers/cayley/deps.nix | 471 -------------------------------- 2 files changed, 25 insertions(+), 486 deletions(-) delete mode 100644 pkgs/servers/cayley/deps.nix diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 97aac4272ce..ec94b19ae49 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,29 +1,39 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "cayley"; - version = "0.7.5"; - - goPackagePath = "github.com/cayleygraph/cayley"; + version = "0.7.7"; + rev = "dcf764fef381f19ee49fad186b4e00024709f148"; src = fetchFromGitHub { owner = "cayleygraph"; repo = "cayley"; rev = "v${version}"; - sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd"; + sha256 = "sha256-jIX0v6ujiQvEAb/mKkrpNgsY0YLkJYHy2sUfQnooE48="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-SSjHGJoW3I7r8emh3IwmiZQIVzdilAsA2ULdAqld2fA="; - ldflags = [ - "-X=main.Version=${version}" + subPackages = [ "cmd/cayley" ]; + + ldflags = let basename = "github.com/cayleygraph/cayley/version"; in [ + "-s" + "-w" + "-X ${basename}.Version=${src.rev}" + "-X ${basename}.GitHash=${rev}" ]; - meta = { - homepage = "https://github.com/cayleygraph/cayley"; - description = "A graph database inspired by Freebase and Knowledge Graph"; - maintainers = with lib.maintainers; [ sigma ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; + meta = with lib; { + description = "Graph database designed for ease of use and storing complex data"; + longDescription = '' + Cayley is an open-source database for Linked Data. It is inspired by the + graph database behind Google's Knowledge Graph (formerly Freebase). + ''; + homepage = "https://cayley.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ sigma ]; }; } diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix deleted file mode 100644 index d4ec2670365..00000000000 --- a/pkgs/servers/cayley/deps.nix +++ /dev/null @@ -1,471 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/badgerodon/peg"; - fetch = { - type = "git"; - url = "https://github.com/badgerodon/peg"; - rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; - sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd"; - sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99"; - }; - } - { - goPackagePath = "github.com/cznic/mathutil"; - fetch = { - type = "git"; - url = "https://github.com/cznic/mathutil"; - rev = "1447ad269d64ca91aa8d7079baa40b6fc8b965e7"; - sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dennwc/graphql"; - fetch = { - type = "git"; - url = "https://github.com/dennwc/graphql"; - rev = "12cfed44bc5de083875506a36d30f9798f9bca47"; - sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a"; - }; - } - { - goPackagePath = "github.com/dlclark/regexp2"; - fetch = { - type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd"; - sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15"; - }; - } - { - goPackagePath = "github.com/dop251/goja"; - fetch = { - type = "git"; - url = "https://github.com/dop251/goja"; - rev = "ef8c030e3c96c5054c2f10ef925e7041e0583c07"; - sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; - sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; - }; - } - { - goPackagePath = "github.com/go-kivik/couchdb"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/couchdb"; - rev = "74d231fe43245e77840213724894264f0f61ffd3"; - sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i"; - }; - } - { - goPackagePath = "github.com/go-kivik/kivik"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/kivik"; - rev = "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece"; - sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij"; - }; - } - { - goPackagePath = "github.com/go-kivik/pouchdb"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/pouchdb"; - rev = "bbd1ab79be17c809842e193b1f84e924b6b599ba"; - sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf"; - }; - } - { - goPackagePath = "github.com/go-sourcemap/sourcemap"; - fetch = { - type = "git"; - url = "https://github.com/go-sourcemap/sourcemap"; - rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44"; - sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "147bd02c2c516cf9a8878cb75898ee8a9eea0228"; - sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "30433562cfbf487fe1df7cd26c7bab168d2f14d0"; - sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8"; - sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "558a9132744c22476178edf3126fd35a9754f565"; - sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi"; - }; - } - { - goPackagePath = "github.com/gopherjs/jsbuiltin"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/jsbuiltin"; - rev = "67703bfb044e3192fbcab025c3aeaeedafad1f2f"; - sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "7fa7fff964d035e8a162cce3a164b3ad02ad651b"; - sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "0d4b488675fdec1dde48751b05ab530cf0b630e1"; - sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "606697ffdfe6603013560dbc171656de57b4f542"; - sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "6f3f3919c8781ce5c0509c83fffc887a7830c938"; - sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "2704adc878c21e1329f46f6e56a1c387d788ff94"; - sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110"; - }; - } - { - goPackagePath = "github.com/linkeddata/gojsonld"; - fetch = { - type = "git"; - url = "https://github.com/linkeddata/gojsonld"; - rev = "4f5db6791326b8962ede4edbba693edcf20fd1ad"; - sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; - sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; - sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "1b00554d822231195d1babd97ff4a781231955c9"; - sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3"; - sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "88609521dc4b6c858fd4c98b628147da928ce4ac"; - sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc"; - sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c"; - sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "79c90efaf01eddc01945af5bc1797859189b830b"; - sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; - sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7b1b6e8dc027253d45fc029bc269d1c019f83a34"; - sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; - sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb"; - sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; - sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "87b1dfb5b2fa649f52695dd9eae19abe404a4308"; - sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "b89cc31ef7977104127d34c1bd31ebd1a9db2199"; - sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p"; - }; - } - { - goPackagePath = "github.com/tylertreat/BoomFilters"; - fetch = { - type = "git"; - url = "https://github.com/tylertreat/BoomFilters"; - rev = "37e169ae37ed529d93ecacb509c0dc80078478fc"; - sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; - sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9ccfe848b9db8435a24c424abbc07a921adf1df5"; - sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4"; - sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "170382fa85b10b94728989dfcf6cc818b335c952"; - sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-mgo/mgo"; - rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; - sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://github.com/olivere/elastic"; - rev = "79ff368708b3a2a9da641dc831d95fd0782bf4ef"; - sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } -] From e9a86f48915f2ea7e2709210c82946b47544a808 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 15:09:56 +0300 Subject: [PATCH 11/73] boulder: release-2019-10-13 -> release-2022-05-31 --- pkgs/tools/admin/boulder/default.nix | 53 +++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 706ac84afb3..6de6ae6c020 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -1,30 +1,51 @@ -{ buildGoPackage -, libtool +{ lib +, buildGoModule , fetchFromGitHub -, lib }: -buildGoPackage rec{ - +buildGoModule rec { pname = "boulder"; - version = "release-2019-10-13"; - - goPackagePath = "github.com/letsencrypt/boulder"; - - buildInputs = [ libtool ]; + version = "release-2022-05-31"; + rev = "99dcb9a5b31be576a55e33184581c942421bc172"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; rev = version; - sha256 = "0kis23dnjja6jp192rjpv2m9m2zmzfwhs93440nxg354k6fp8jdg"; + sha256 = "sha256-x1Vf8agwVTgSkDVEdAnG3div+MzRsMi96jKJRc2s8Ks="; }; - meta = { + vendorSha256 = null; + + subPackages = [ "cmd/boulder" ]; + + ldflags = with lib; + mapAttrsToList (n: v: ''"-X github.com/letsencrypt/boulder/core.Build${n}=${v}"'') { + ID = substring 0 8 rev; + Host = "nixbld@localhost"; + Time = "Thu 1 Jan 00:00:00 UTC 1970"; + }; + + postInstall = '' + for i in $($out/bin/boulder --list); do + ln -s $out/bin/boulder $out/bin/$i + done + ''; + + # There are no tests for cmd/boulder. + doCheck = false; + + meta = with lib; { homepage = "https://github.com/letsencrypt/boulder"; - description = "An ACME-based CA, written in Go"; - license = [ lib.licenses.mpl20 ]; - maintainers = [ ]; + description = "An ACME-based certificate authority, written in Go"; + longDescription = '' + This is an implementation of an ACME-based CA. The ACME protocol allows + the CA to automatically verify that an applicant for a certificate + actually controls an identifier, and allows domain holders to issue and + revoke certificates for their domains. Boulder is the software that runs + Let's Encrypt. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ azahi ]; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57099552868..051f10120f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2047,7 +2047,9 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; + boulder = callPackage ../tools/admin/boulder { + buildGoModule = buildGo118Module; + }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; From 34a898a06a0323726c885860897adc424c61f611 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:34:28 +0300 Subject: [PATCH 12/73] vegeta: use buildGoModule --- pkgs/tools/networking/vegeta/default.nix | 37 +++- pkgs/tools/networking/vegeta/deps.nix | 255 ----------------------- 2 files changed, 26 insertions(+), 266 deletions(-) delete mode 100644 pkgs/tools/networking/vegeta/deps.nix diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index 16abe8c6033..6e7bbaa8366 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -1,25 +1,40 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +}: -buildGoPackage rec { +buildGoModule rec { pname = "vegeta"; version = "12.8.4"; + rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea"; src = fetchFromGitHub { - owner = "tsenart"; - repo = pname; - rev = "v${version}"; - sha256 = "0sw10k4g370c544dgw2c1sqdnxryld8lf6c1wnyknrm3zsfzn1hl"; + owner = "tsenart"; + repo = "vegeta"; + rev = "v${version}"; + sha256 = "sha256-FAb7nf6jZju95YEZR1GjPnfbsA5M8NcIKQyc8cgEgWs="; }; - goPackagePath = "github.com/tsenart/${pname}"; + vendorSha256 = "sha256-v9Hu9eQJSmm4Glt49F7EN40rKjrg4acyll9Bfgey+Mw="; - goDeps = ./deps.nix; + subPackages = [ "." ]; + + ldflags = (lib.mapAttrsToList (n: v: "-X main.${n}=${v}") { + Version = version; + Commit = rev; + Date = "1970-01-01T00:00:00Z"; + }) ++ [ "-s" "-w" "-extldflags '-static'" ]; meta = with lib; { description = "Versatile HTTP load testing tool"; - license = licenses.mit; + longDescription = '' + Vegeta is a versatile HTTP load testing tool built out of a need to drill + HTTP services with a constant request rate. It can be used both as a + command line utility and a library. + ''; homepage = "https://github.com/tsenart/vegeta/"; - maintainers = [ maintainers.mmahut ]; + changelog = "https://github.com/tsenart/vegeta/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; }; } - diff --git a/pkgs/tools/networking/vegeta/deps.nix b/pkgs/tools/networking/vegeta/deps.nix deleted file mode 100644 index 1a06ad178ec..00000000000 --- a/pkgs/tools/networking/vegeta/deps.nix +++ /dev/null @@ -1,255 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/jsonschema"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/jsonschema"; - rev = "f2c93856175a"; - sha256 = "145w6zg453mbspfyixs71xfjwi3djq20lij1rcgrdcn5gmwj2cal"; - }; - } - { - goPackagePath = "github.com/bmizerany/perks"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/perks"; - rev = "d9a9656a3a4b"; - sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n"; - }; - } - { - goPackagePath = "github.com/c2h5oh/datasize"; - fetch = { - type = "git"; - url = "https://github.com/c2h5oh/datasize"; - rev = "4eba002a5eae"; - sha256 = "02sxd659q7m7axfywiqfxk5rh6djh2m5240bin1makldj1nj16j3"; - }; - } - { - goPackagePath = "github.com/dgryski/go-gk"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-gk"; - rev = "201884a44051"; - sha256 = "17csmdlqibg5g2pjybh4522dis6nklyhjvly55pawy0vprd17agz"; - }; - } - { - goPackagePath = "github.com/dgryski/go-lttb"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-lttb"; - rev = "318fcdf10a77"; - sha256 = "0cs2rr2j6fbbpgmfxkq39pir4bibfzkfwxvd2cvw30q97cmfpiz3"; - }; - } - { - goPackagePath = "github.com/gonum/blas"; - fetch = { - type = "git"; - url = "https://github.com/gonum/blas"; - rev = "f22b278b28ac"; - sha256 = "0dh73akv4gazyhva9xbm9xbq786vij8iisivp3p65p6ahf502fs6"; - }; - } - { - goPackagePath = "github.com/gonum/diff"; - fetch = { - type = "git"; - url = "https://github.com/gonum/diff"; - rev = "500114f11e71"; - sha256 = "1bg4k3bxqb44nz1nmyigr5bx55859n55vvi45w2rq4y5djvpral8"; - }; - } - { - goPackagePath = "github.com/gonum/floats"; - fetch = { - type = "git"; - url = "https://github.com/gonum/floats"; - rev = "c233463c7e82"; - sha256 = "12m7pa64mk3am2i10agg6c1aqdfgx9i3f4bgf3w7wra8bnnjncp6"; - }; - } - { - goPackagePath = "github.com/gonum/integrate"; - fetch = { - type = "git"; - url = "https://github.com/gonum/integrate"; - rev = "a422b5c0fdf2"; - sha256 = "01wfav882h3bcp137cd2bsr91hkmmi4d6qwhdm0xv1p2z2qzs7iq"; - }; - } - { - goPackagePath = "github.com/gonum/internal"; - fetch = { - type = "git"; - url = "https://github.com/gonum/internal"; - rev = "f884aa714029"; - sha256 = "038w8pc82vxq773qg0mw472f3p8h5vkh3ggcdn09qd3s6myp2zq7"; - }; - } - { - goPackagePath = "github.com/gonum/lapack"; - fetch = { - type = "git"; - url = "https://github.com/gonum/lapack"; - rev = "e4cdc5a0bff9"; - sha256 = "046fffskysg0bmha16s5582bimpis0m6qd7c7k1n65a0qhrslli1"; - }; - } - { - goPackagePath = "github.com/gonum/mathext"; - fetch = { - type = "git"; - url = "https://github.com/gonum/mathext"; - rev = "8a4bf007ea55"; - sha256 = "044xy32mgcjc5948na6f6fgqqq17canw3z6sppidmj52s17p0k7i"; - }; - } - { - goPackagePath = "github.com/gonum/matrix"; - fetch = { - type = "git"; - url = "https://github.com/gonum/matrix"; - rev = "c518dec07be9"; - sha256 = "0i6pyxxhcy2s9as77g90dsj9xya48775dl5fxgvqal665cxc4l4i"; - }; - } - { - goPackagePath = "github.com/gonum/stat"; - fetch = { - type = "git"; - url = "https://github.com/gonum/stat"; - rev = "41a0da705a5b"; - sha256 = "0r9mqiy3ma0c15p57bz4xq2vf105s9g1lqysb7ff0nip4050cpvn"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/influxdata/tdigest"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tdigest"; - rev = "a7d76c6f093a"; - sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "v0.7.0"; - sha256 = "13zv5fvjp3nr65lhqhiw6i6mlmqvyls882rlmcas0ab35alsxni8"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.17"; - sha256 = "0x0375n7n1qmgyn7yvpr65z4ll4l39q2xagyfafw09h3kkrkpka8"; - }; - } - { - goPackagePath = "github.com/streadway/quantile"; - fetch = { - type = "git"; - url = "https://github.com/streadway/quantile"; - rev = "b0c588724d25"; - sha256 = "1y27nrg7wkyrvw07a5s7wl4lpwxshwyvhzc6i0rzn20dajah2vkh"; - }; - } - { - goPackagePath = "github.com/tsenart/go-tsz"; - fetch = { - type = "git"; - url = "https://github.com/tsenart/go-tsz"; - rev = "cdeb9e1e981e"; - sha256 = "1lgnllx810ly0203jn9vkimcwqv3302mnh9d7mip1yyq4cmvlj3b"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc2472"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ba9fcec4b297"; - sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "749cb33beabd"; - sha256 = "0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2ca718005c18"; - sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "pgregory.net/rapid"; - fetch = { - type = "git"; - url = "https://github.com/flyingmutant/rapid"; - rev = "v0.3.3"; - sha256 = "04w4dmx753b2xp5z5br5wxalgkkgag8qpbxics2gdcksqgi85vg3"; - }; - } -] From 3518e3309f24bb2454c8b09f9d9e80c2626f36f1 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:44:34 +0300 Subject: [PATCH 13/73] waitron: unstable-2020-01-24 -> unstable-2020-08-04 --- pkgs/tools/networking/waitron/default.nix | 33 ++++++++----- pkgs/tools/networking/waitron/deps.nix | 57 ----------------------- 2 files changed, 21 insertions(+), 69 deletions(-) delete mode 100644 pkgs/tools/networking/waitron/deps.nix diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 4f2f634d494..7ef984147a3 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,29 +1,38 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "waitron"; - version = "unstable-2020-01-24"; - - goPackagePath = "github.com/ns1/waitron"; + version = "unstable-2020-08-04"; + rev = "2315857d94e3d1a1e79ac48f8f6a68d59d0ce300"; src = fetchFromGitHub { owner = "ns1"; repo = "waitron"; - rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; + inherit rev; sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; + vendorSha256 = "sha256-grQFLo0BIIa/kNKF4vPw/V1WN9sxOucz6+wET2PBU1I="; + + subPackages = [ "." ]; + patches = [ ./staticfiles-directory.patch ]; - goDeps = ./deps.nix; - - meta = { + meta = with lib; { description = "A tool to manage network booting of machines"; + longDescription = '' + Waitron is used to build machines (primarily bare-metal, but anything that + understands PXE booting will work) based on definitions from any number of + specified inventory sources. + ''; homepage = "https://github.com/ns1/waitron"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ guibert ]; - platforms = lib.platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ guibert ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/waitron/deps.nix b/pkgs/tools/networking/waitron/deps.nix deleted file mode 100644 index 46369c78318..00000000000 --- a/pkgs/tools/networking/waitron/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4"; - sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e"; - sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40"; - sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; - sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "53403b58ad1b561927d19068c655246f2db79d48"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] From 7181e7bfa90331969c12448698b4a26bdcb13190 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:59:56 +0300 Subject: [PATCH 14/73] certstrap: use buildGoModule --- pkgs/tools/security/certstrap/default.nix | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index ff6522f1d35..9edd8b3884f 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,21 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "certstrap"; version = "1.2.0"; - goPackagePath = "github.com/square/certstrap"; - src = fetchFromGitHub { owner = "square"; repo = "certstrap"; rev = "v${version}"; - sha256 = "1ymchnn7c9g3pq7rw4lrwsd6z3wfjx90g7qgrw6r5hssl77mnscj"; + sha256 = "sha256-kmlbz6Faw5INzw+fB1KXjo9vmuaZEp4PvuMldqyFrPo="; }; + vendorSha256 = null; + + subPackages = [ "." ]; + + ldflags = [ "-X main.release=${version}" ]; + meta = with lib; { - inherit (src.meta) homepage; description = "Tools to bootstrap CAs, certificate requests, and signed certificates"; + longDescription = '' + A simple certificate manager written in Go, to bootstrap your own + certificate authority and public key infrastructure. Adapted from etcd-ca. + ''; + homepage = "https://github.com/square/certstrap"; + changelog = "https://github.com/square/certstrap/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ volth ]; }; From 82497b0e9f6ba961166bb8ccd970e43831549362 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 14 Jun 2022 01:50:58 +0300 Subject: [PATCH 15/73] trickster: 0.1.10 -> 1.1.5 --- .../modules/services/networking/trickster.nix | 20 +- pkgs/servers/trickster/trickster.nix | 53 +++- pkgs/servers/trickster/trickster_deps.nix | 237 ------------------ 3 files changed, 56 insertions(+), 254 deletions(-) delete mode 100644 pkgs/servers/trickster/trickster_deps.nix diff --git a/nixos/modules/services/networking/trickster.nix b/nixos/modules/services/networking/trickster.nix index e48bba8fa58..ac260a14d9a 100644 --- a/nixos/modules/services/networking/trickster.nix +++ b/nixos/modules/services/networking/trickster.nix @@ -6,6 +6,9 @@ let cfg = config.services.trickster; in { + imports = [ + (mkRenamedOptionModule [ "services" "trickster" "origin" ] [ "services" "trickster" "origin-url" ]) + ]; options = { services.trickster = { @@ -58,11 +61,19 @@ in ''; }; - origin = mkOption { + origin-type = mkOption { + type = types.enum [ "prometheus" "influxdb" ]; + default = "prometheus"; + description = '' + Type of origin (prometheus, influxdb) + ''; + }; + + origin-url = mkOption { type = types.str; default = "http://prometheus:9090"; description = '' - URL to the Prometheus Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090). + URL to the Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090). ''; }; @@ -87,7 +98,7 @@ in config = mkIf cfg.enable { systemd.services.trickster = { - description = "Dashboard Accelerator for Prometheus"; + description = "Reverse proxy cache and time series dashboard accelerator"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -96,7 +107,8 @@ in ${cfg.package}/bin/trickster \ -log-level ${cfg.log-level} \ -metrics-port ${toString cfg.metrics-port} \ - -origin ${cfg.origin} \ + -origin-type ${cfg.origin-type} \ + -origin-url ${cfg.origin-url} \ -proxy-port ${toString cfg.proxy-port} \ ${optionalString (cfg.configFile != null) "-config ${cfg.configFile}"} \ ${optionalString (cfg.profiler-port != null) "-profiler-port ${cfg.profiler-port}"} \ diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index 5cf08ee6c3c..a798e0ceff0 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,26 +1,53 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "trickster"; - version = "0.1.10"; - - goPackagePath = "github.com/Comcast/trickster"; - - goDeps = ./trickster_deps.nix; + version = "1.1.5"; + rev = "4595bd6a1ae1165ef497251ad85c646dadc8a925"; src = fetchFromGitHub { - owner = "Comcast"; - repo = pname; + owner = "trickstercache"; + repo = "trickster"; rev = "v${version}"; - sha256 = "12z71rf03g2x8r7cgns0n4n46r0gjsfyig6z9r5xrn9kfghabfi8"; + sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM="; }; - doCheck = true; + vendorSha256 = null; + + subPackages = [ "cmd/trickster" ]; + + preBuild = + let + ldflags = with lib; + concatStringsSep " " ( + [ "-extldflags '-static'" "-s" "-w" ] ++ + (mapAttrsToList (n: v: "-X main.application${n}=${v}") { + BuildTime = "1970-01-01T00:00:00+0000"; + GitCommitID = rev; + GoVersion = "$(go env GOVERSION)"; + GoArch = "$(go env GOARCH)"; + }) + ); + in + '' + buildFlagsArray+=("-ldflags=${ldflags}") + ''; + + # Tests are broken. + doCheck = false; meta = with lib; { - description = "Reverse proxy cache for the Prometheus HTTP APIv1"; - homepage = "https://github.com/Comcast/trickster"; + description = "Reverse proxy cache and time series dashboard accelerator"; + longDescription = '' + Trickster is a fully-featured HTTP Reverse Proxy Cache for HTTP + applications like static file servers and web APIs. + ''; + homepage = "https://trickstercache.org/"; license = licenses.asl20; maintainers = with maintainers; [ _1000101 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/trickster/trickster_deps.nix b/pkgs/servers/trickster/trickster_deps.nix deleted file mode 100644 index ab100bed760..00000000000 --- a/pkgs/servers/trickster/trickster_deps.nix +++ /dev/null @@ -1,237 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/alicebob/gopher-json"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/gopher-json"; - rev = "5a6b3ba71ee6"; - sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; - }; - } - { - goPackagePath = "github.com/alicebob/miniredis"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/miniredis"; - rev = "cfad8aca71cc"; - sha256 = "0x2401nxyhdz037lj98c0sa77d8k49jfcq7is3ddiyim3csg5a0w"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.0"; - sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "v6.14.2"; - sha256 = "0s1if96r8xnadan7pz1j8hvzk9g4fm3phwmwzadwpq21pgni66d7"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255db"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v2.0.0"; - sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "v1.4.0"; - sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.1"; - sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "a0dfe84f6227"; - sha256 = "13k2dphx4zv6fwgqsydsc0g0b0pf7qx3yb6i7hai6nnkh0db91nn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "a96e63847dc3"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } -] From e7b692ce87447cadec0097a117e6c1407b88b95f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 Jun 2022 11:09:00 +0300 Subject: [PATCH 16/73] mlmmj: fix cross-compilation --- pkgs/servers/mail/mlmmj/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 89e142b04f9..aba0664b8f4 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: getlistdelim.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: multiple definition of From dbeaa166363a10d7edac93d91f8ed9fa6172566e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jun 2022 05:04:15 +0000 Subject: [PATCH 17/73] libvgm: unstable-2022-06-17 -> unstable-2022-06-18 --- pkgs/development/libraries/libvgm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 3db5c95ff98..43b145be62b 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2022-06-17"; + version = "unstable-2022-06-18"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "577ff77185aa19943e5c7a858eb2485ec75c7539"; - sha256 = "0R7qqrFs6Ap8FM5uBHX/iE+S5cQzuwWn65xxfp4/CdQ="; + rev = "001ca758538ca3f82403dff654d82342730b215d"; + sha256 = "O3jvEEW1M0cwZoG6j2ndmuQW4jP0dvt6gGp2BS4VD5s="; }; outputs = [ From db09d70d33dc9ceca01288d9ceef10befd2851e2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Jun 2022 08:14:34 +0100 Subject: [PATCH 18/73] config.configurePlatformsByDefault: init option Useful to enable tree-wide occasionally to have incremental progress towards https://github.com/NixOS/nixpkgs/pull/87909 resolution. --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- pkgs/top-level/config.nix | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5f1a22cee06..5f5ac44c979 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -111,9 +111,9 @@ let , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # - # TODO(@Ericson2314): Make [ "build" "host" ] always the default. + # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909 configurePlatforms ? lib.optionals - (stdenv.hostPlatform != stdenv.buildPlatform) + (stdenv.hostPlatform != stdenv.buildPlatform || config.configurePlatformsByDefault) [ "build" "host" ] # TODO(@Ericson2314): Make unconditional / resolve #33599 diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index e9cb8681f65..0ab29d85163 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -50,6 +50,10 @@ let feature = "set enableParallelBuilding to true by default"; }; + configurePlatformsByDefault = mkMassRebuild { + feature = "set configurePlatforms to [\"build\" \"host\"] by default"; + }; + contentAddressedByDefault = mkMassRebuild { feature = "set __contentAddressed to true by default"; }; From 696606bdd40662ef777e029111e1547146d789d6 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 22 Jun 2022 01:04:38 +0300 Subject: [PATCH 19/73] werf: 1.2.114 -> 1.2.117 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index bcd43d71fc8..d677b2d96df 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.114"; + version = "1.2.117"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-+QCKVXuROd7QB6P5tSSINWtdw5OvVnmE1+ttoBnCO1g="; + sha256 = "sha256-bh+4Z4+BU1exOv113ScIw9VsGM+jRireyb9lArg/Zg4="; }; - vendorSha256 = "sha256-VuburDiYqePFvS7/aTM+krkK2UhTHhfbvGOLY3I3DN8="; + vendorSha256 = "sha256-cW9sjMRLslEhgyI5Z7ypUtGgzCDASQ4m9yr6DoQKoz8="; proxyVendor = true; From 1ea0b578d0b78fbb375766186f2df6712255c9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jun 2022 20:14:00 +0200 Subject: [PATCH 20/73] gitea: remove with lib over entire file, remove unused patchShebangs --- .../version-management/gitea/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fbf0138ce5a..2cddeea8162 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -12,8 +12,6 @@ , nixosTests }: -with lib; - buildGoPackage rec { pname = "gitea"; version = "1.16.8"; @@ -36,19 +34,18 @@ buildGoPackage rec { ]; postPatch = '' - patchShebangs . substituteInPlace modules/setting/setting.go --subst-var data ''; nativeBuildInputs = [ makeWrapper ]; - buildInputs = optional pamSupport pam; + buildInputs = lib.optional pamSupport pam; preBuild = let - tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = concatStringsSep " " tags; + tags = lib.optional pamSupport "pam" + ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; + tagsString = lib.concatStringsSep " " tags; in '' export buildFlagsArray=( @@ -66,14 +63,14 @@ buildGoPackage rec { cp -R ./go/src/${goPackagePath}/options/locale $out/locale wrapProgram $out/bin/gitea \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; goPackagePath = "code.gitea.io/gitea"; passthru.tests.gitea = nixosTests.gitea; - meta = { + meta = with lib; { description = "Git with a cup of tea"; homepage = "https://gitea.io"; license = licenses.mit; From dd9c01a9af18c8a6efbf281cfb18bfafca34c26c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Jun 2022 00:05:16 +0200 Subject: [PATCH 21/73] ungoogled-chromium: 102.0.5005.115 -> 103.0.5060.53 --- .../networking/browsers/chromium/common.nix | 4 -- ...2-fix-dawn_version_generator-failure.patch | 43 ------------------- .../browsers/chromium/upstream-info.json | 16 +++---- 3 files changed, 8 insertions(+), 55 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cfd6b122d6c..1cfc90dd4f1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,10 +160,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ optionals (versionRange "102" "103") [ - # https://dawn-review.googlesource.com/c/dawn/+/88582 - # Wrap get_gitHash in try-catch to prevent failures in tarball builds. - ./patches/m102-fix-dawn_version_generator-failure.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch deleted file mode 100644 index e9391541e43..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 -From: Loko Kung -Date: Tue, 3 May 2022 00:28:53 +0000 -Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball - builds. - -Bug: chromium:1321370 -Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d -Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 -Commit-Queue: Loko Kung -Reviewed-by: Austin Eng -Kokoro: Kokoro -(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) ---- - third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py -index 1907e88da..3c1927bee 100644 ---- a/third_party/dawn/generator/dawn_version_generator.py -+++ b/third_party/dawn/generator/dawn_version_generator.py -@@ -23,11 +23,14 @@ def get_git(): - - - def get_gitHash(dawnDir): -- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], -- stdout=subprocess.PIPE, -- cwd=dawnDir) -- if result.returncode == 0: -- return result.stdout.decode('utf-8').strip() -+ try: -+ result = subprocess.run([get_git(), "rev-parse", "HEAD"], -+ stdout=subprocess.PIPE, -+ cwd=dawnDir) -+ if result.returncode == 0: -+ return result.stdout.decode("utf-8").strip() -+ except Exception: -+ return "" - # No hash was available (possibly) because the directory was not a git checkout. Dawn should - # explicitly handle its absenece and disable features relying on the hash, i.e. caching. - return '' --- -2.36.0 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0516b1d65bd..f661e64bac7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "102.0.5005.115", - "sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h", - "sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y", + "version": "103.0.5060.53", + "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", + "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", "deps": { "gn": { - "version": "2022-04-14", + "version": "2022-05-11", "url": "https://gn.googlesource.com/gn", - "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", - "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" + "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", + "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "102.0.5005.115-1", - "sha256": "1z2xkxxviggyyksga74cqa4v73gynlgzi22ckg8yv84qxrklik6p" + "rev": "103.0.5060.53-1", + "sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s" } } } From c038329fe2f2543dfaf0207c6b68b61561a7187f Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 22 Jun 2022 19:31:00 -0700 Subject: [PATCH 22/73] python3Packages.flake8-bugbear: 22.4.25 -> 22.6.22 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index a2fb820c1e5..7d6df07885b 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.4.25"; + version = "22.6.22"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y/hpBlIQ3aJj3Y1snpArOCIv2w1ncQNMSYJ+G0CeM84="; + hash = "sha256-U5f7NZ1rkcYcluLsw2hTuPxme7QrmAMJrpKncFsYzNs="; }; propagatedBuildInputs = [ From 9056391c924545bdb040cbddad29ef1c42aaba63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:03:22 +0200 Subject: [PATCH 23/73] python310Packages.archinfo: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 348a022d2cc..f87c7863c26 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM="; + hash = "sha256-sl5qCH/biH3QBrnfZAQMWd55yKM0PGE/Rx2MscKn4Nk="; }; checkInputs = [ From d5b4f6e8c3384b17fb56cd06c393f3711816661c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:03:28 +0200 Subject: [PATCH 24/73] python310Packages.ailment: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 01617f7980e..0b6ba901df5 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M="; + hash = "sha256-zQz8tbxo1Trfeg7zeW/htm+zD4n++guYXUdCHp3cikw="; }; propagatedBuildInputs = [ From c5ed7e73035b072283de8557720e962a5bc67bc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:03:50 +0200 Subject: [PATCH 25/73] python310Packages.pyvex: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b7bff273b23..8710fea109f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I="; + hash = "sha256-vSVkredOekqUAre38jDCE8f8OXd0cNmZ2SmpEQ7+I28="; }; propagatedBuildInputs = [ From 7d40edbc812e6a471809107ad82ede4ebaf233c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:03:58 +0200 Subject: [PATCH 26/73] python310Packages.claripy: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7dccab0b762..efceffd786d 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM="; + hash = "sha256-4t1PbxcHxiv8W/M9McaBu7CTLc74gCZ7om3K4fgpFFI="; }; propagatedBuildInputs = [ From 78c38c816ab893d9c7334b0cb767a9ffc3714b53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:05:50 +0200 Subject: [PATCH 27/73] python310Packages.lxmf: 0.1.6 -> 0.1.7 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 8ae981cc1f1..4142b0b505a 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-n7ZEXz+jFokjqQJf8feDE6wuN2kI3xB0z+guUhGse3o="; + hash = "sha256-SRDUFDtXJ1ZkX8A4ekF+YSOnxj/vsFsvr3W/LOIuerg="; }; propagatedBuildInputs = [ From 6fc07488be672f1a7b395afb741953469a37ade6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:05:57 +0200 Subject: [PATCH 28/73] python310Packages.nomadnet: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index ef7083980af..554df087859 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = version; - hash = "sha256-gqUCE35RPt7k0RAoZGJS1srB5K4v6gJkbTKQs8Lajm8="; + hash = "sha256-GZsARzqnLyZZU900ONv1/sejsEGMTFNIhOS+SESFBqg="; }; propagatedBuildInputs = [ From 2ac9821a99067dfab298adf2e9454621f8b8414f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:04:12 +0200 Subject: [PATCH 29/73] python310Packages.angr: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a6a5aa49953..72481814f9d 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc="; + hash = "sha256-77RLoSZnzggt8ZWQwRcvMhCYGupF2Kp+u2LFZ9ozXlw="; }; propagatedBuildInputs = [ From 7c6be1d37bf6f3e73a736a361eef9ce0703d1301 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:18:05 +0200 Subject: [PATCH 30/73] python310Packages.slack-sdk: 3.17.1 -> 3.17.2 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 80193394838..a4bef1ab8e1 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.17.1"; + version = "3.17.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FWjhfvBx8FXAMFKxWB4Vvjg5PPw9v7ciKU+oIEGD36s="; + sha256 = "sha256-Rzs2ugG6Xm8IVWt20+1oLB0FxhBHyIfDGNL2jzgDnwc="; }; propagatedBuildInputs = [ From f34181307008eff17f75a427f64b48362a329309 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:22:53 +0200 Subject: [PATCH 31/73] python310Packages.strenum: 0.4.7 -> 0.4.8 --- pkgs/development/python-modules/strenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index f287b2623a6..d73b60906cc 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.7"; + version = "0.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irgeek"; repo = "StrEnum"; rev = "v${version}"; - hash = "sha256-ktsPROIv/BbPinZfrBknI4c/WwRYGhWgmw209Hfg8EQ="; + hash = "sha256-S64YfF+cbefXRWoeJK99ZPTiO9DUcDaT77hVQd7pKDk="; }; postPatch = '' From a5aa9785e34d41bc0134e3556c4395e5d9db3447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:23:14 +0200 Subject: [PATCH 32/73] python310Packages.cle: 9.2.6 -> 9.2.7 --- pkgs/development/python-modules/cle/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 25765fc11d3..db926aad32b 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,14 +15,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.6"; + version = "9.2.7"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "v${version}"; - sha256 = "1qlrxfj1n34xvwkac6mbcc7zmixxbp34fj7lkf0fvp7zcz1rpla1"; + hash = "sha256-LpYi5Ty6OBcW0zokCliMDhujJ7tPPl1XdPs5ad1tv5s="; }; in @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0="; + hash = "sha256-IQLtkS4LNyyEOwInd9A3pHGtj80yXARXcQKA3FonPUE="; }; propagatedBuildInputs = [ @@ -66,7 +66,6 @@ buildPythonPackage rec { "test_ppc_rel24_relocation" "test_ppc_addr16_ha_relocation" "test_ppc_addr16_lo_relocation" - # Binary not found, seems to be missing in the current binaries release "test_plt_full_relro" # Test fails "test_tls_pe_incorrect_tls_data_start" From 6b91a513d7c809a8b969f10bbccfd2b4bb1a1bb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:30:16 +0200 Subject: [PATCH 33/73] python310Packages.pypoolstation: 0.4.5 -> 0.4.8 --- pkgs/development/python-modules/pypoolstation/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index 6ac92aeb6e9..5607bc0926a 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, backoff , buildPythonPackage , fetchPypi , poetry-core @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.4.5"; + version = "0.4.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPoolstation"; inherit version; - sha256 = "sha256-cf2KUdvsuC7fplg7O9Jqqb86rOjNicV+vGVBwWvvs90="; + sha256 = "sha256-6Fdam/LS3Nicrhe5jHHvaKCpE0HigfOVszjb5c1VM3Y="; }; nativeBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff ]; # Project has no tests From 906f86a2fd28e7461ace4ae3445d1787523aa879 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:32:34 +0200 Subject: [PATCH 34/73] python310Packages.pymazda: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 5ee3234b70d..228323f9484 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jvDjitS8r0oyANxUGbYksX7O7dbEqZeWEpYc9gABb78="; + sha256 = "sha256-Xq+DXrZp1NrsCgUnjaMWUoM+SDfnXK+YDX2Gcr7FKvQ="; }; propagatedBuildInputs = [ From 93c256b94d0052fc1257fbac9ed1935cd9b04140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:39:10 +0200 Subject: [PATCH 35/73] python310Packages.angrop: relax angr constraint --- pkgs/development/python-modules/angrop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 63dce4bdbed..cfd27ae4cbf 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , progressbar , pythonOlder +, pythonRelaxDepsHook , tqdm }: @@ -21,12 +22,20 @@ buildPythonPackage rec { hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ angr progressbar tqdm ]; + pythonRelaxDeps = [ + "angr" + ]; + # Tests have additional requirements, e.g., angr binaries # cle is executing the tests with the angr binaries already and is a requirement of angr doCheck = false; From 8cec1c55cb8aa0f3388bf0aee37e9245b932f585 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:47:17 +0200 Subject: [PATCH 36/73] python310Packages.losant-rest: 1.16.2 -> 1.16.3 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index a160095513e..f27897a7e1e 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.2"; + version = "1.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-OR5SegUfui5g11QZZJzAq8nhp7bFjS4Ip2gMjfx7tpA="; + sha256 = "sha256-s9WPr5sFSyPIDRgRYcD55iRLhaVIvkiDGg/m//6acFY="; }; propagatedBuildInputs = [ From 9258aa77a96fd2867e31915fcd99bbd9165b2694 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 11:48:16 +0200 Subject: [PATCH 37/73] python310Packages.gehomesdk: 0.4.25 -> 0.4.27 --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 43609f33292..35cd4ea7c4d 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.4.25"; + version = "0.4.27"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TGitDdRvNKaZzbPrYvWx1bdbXAJW3OSnzbPBF2LpJW4="; + sha256 = "sha256-jhggGncxguG/hZutZ3gfg9dwl0Ex5wpcHFKZegAaM9Q="; }; propagatedBuildInputs = [ From 3979c0205c4a14556403118e40b7e10df7a9ab31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 13:32:35 +0200 Subject: [PATCH 38/73] python310Packages.md-toc: 8.1.3 -> 8.1.4 --- pkgs/development/python-modules/md-toc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 5d3cde1d038..0510aed835a 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , fetchFromGitHub , fpyutils +, pyfakefs , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "md-toc"; - version = "8.1.3"; + version = "8.1.4"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-/Hi2CW3aqbvCr7xGHD9lAe9U84waSjVfTfWq76NXNT4="; + hash = "sha256-7bXd+kTB1NF5KfcDVsvemCfIbZxv6nAw851bNo375Xs="; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pyfakefs pytestCheckHook ]; From 95ccd01c840c517170ff04c3eb14893f4ff981cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 13:34:49 +0200 Subject: [PATCH 39/73] python310Packages.crownstone-uart: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/crownstone-uart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index e24235203eb..163f6a6cec2 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-NGy63o56oWhHcQ9QKo05k/z8ABp3p3T3+uY2O1YyzBk="; + sha256 = "sha256-WcEwAqHy3tuRlx1nyc+BKAb+PLD2B55fGSgb8dsbXbM="; }; propagatedBuildInputs = [ From 4347b463275ab989dc153a0c3863bb96e2755baf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 13:38:57 +0200 Subject: [PATCH 40/73] python310Packages.dremel3dpy: 0.3.4 -> 1.0.1 --- pkgs/development/python-modules/dremel3dpy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index 06de83a778a..52f07215802 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -2,28 +2,34 @@ , async-timeout , buildPythonPackage , fetchPypi +, imageio +, imutils , pythonOlder , requests , urllib3 +, tqdm , validators , yarl }: buildPythonPackage rec { pname = "dremel3dpy"; - version = "0.3.4"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zKbHKdgMx76cYGPvPVSm39si0LfyDA4L1CcKaQzEpCw="; + hash = "sha256-wqfCzS9dhRN/zerrC6g/O8tn0k1IC0wBdZMfWumtBds="; }; propagatedBuildInputs = [ async-timeout + imageio + imutils requests + tqdm urllib3 validators yarl From aeb84f48affa8f5052fe742c9624dd71e3de77ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 13:53:20 +0200 Subject: [PATCH 41/73] python310Packages.pyswitchbot: 0.13.3 -> 0.14.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 38e7e2733ea..702f179b6da 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,5 +1,5 @@ { lib -, bluepy +, bleak , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.13.3"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +16,11 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; + hash = "sha256-6u7PqYv7Q5rVzsUnoQi495svX8puBz0Oj3SGgcpJrcQ="; }; propagatedBuildInputs = [ - bluepy + bleak ]; # Project has no tests From 2e8b10ef5112e678e00e50586d1a06ef11779f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 23 Jun 2022 09:53:09 -0300 Subject: [PATCH 42/73] nordic: unstable-2022-02-26 -> unstable-2022-06-21 --- pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index d250de15ca9..c29bb69bf7b 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -7,70 +7,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2022-02-26"; + version = "unstable-2022-06-21"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "0da58e462e8ba6c71245d13fbddac950b72018ae"; - sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU="; + rev = "bb5e31ec1488b1fd5641aa10f65f36d8714b5dba"; + sha256 = "sha256-wTWHdao/1RLqUmqh/9gEyhERGymFWHqiC97JD28LSgk="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519"; - sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg="; + rev = "e1fb044a14b5c7fe1f6c2de42bfb5fdfb1448415"; + sha256 = "sha256-oWwc+bzeAf0NoYfA2r2oGpeciVUWFC7yJzlUAYfpdTY="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb"; - sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE="; + rev = "4c7c9f2d670a6f0c9cff1ec31fab67c826fdcc0f"; + sha256 = "sha256-txKClsygX2IUGF8oOG6gDY6Y3v28kJthjdPrPEOZarQ="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "4e69cf6e1798938ab7c5795940c663d866ce8201"; - sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw="; + rev = "8abe28ff07c190b8c343aacb6a0ce58e62abbd74"; + sha256 = "sha256-tk9VZtwpIuBcWu1ERJLnlhM71pkrNEUzu8PDb+IEnpw="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "866629583187b914725f05683125fde7f6c280f1"; - sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As="; + rev = "9764e0f1af100731f77bf7f15792639d0032e5ed"; + sha256 = "sha256-3vxrbxUhPj6PKWpjyCruhFxYz9nPfo1DHferYUD7enU="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b"; - sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI="; + rev = "407316a3fd5e07d183474aea4cae28bb958afa6c"; + sha256 = "sha256-SvLTqDXjy8c4rZo0cZ83kfuiGd2+hyGvwILxVCz65jQ="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5"; - sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao="; + rev = "1ffa167c4807e4b22e0934aee41403721877bc56"; + sha256 = "sha256-Xat5YWnxTBnvnUfs1o5EhdmDezmOXtqry97Yc8O+WYM="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "72cbd567212b21ea20769fe244c148f799435536"; - sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc="; + rev = "9bc68223edf7ad9dc83032d7d51ccc53f9440337"; + sha256 = "sha256-XjGjijBky/iPcoUGDRrwwoZ5f2gbLchmQizkQN+Opjg="; name = "Nordic-Polar-standard-buttons"; }) ]; From b6446504e248f1ec48249aa56e1af8ad69f564a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 15:20:50 +0200 Subject: [PATCH 43/73] python310Packages.connexion: 2.13.1 -> 2.14.0 --- pkgs/development/python-modules/connexion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 2e36a1c4554..3bac60d0e7d 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.13.1"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nWhrb2oyBue/Q/dAdSgk3K/JXdgLg1xAEbOtCTRYs/M="; + hash = "sha256-5+OZvJG68jZZsfOuOqsCUSPLV6vvjk9msJzjsCwo0jw="; }; propagatedBuildInputs = [ From cd155511c27186f59a043d96f477d3e215f8030f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 16:04:06 +0200 Subject: [PATCH 44/73] python310Packages.types-tabulate: 0.8.9 -> 0.8.10 --- pkgs/development/python-modules/types-tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index c8f49386543..13f7453a8fc 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.9"; + version = "0.8.10"; src = fetchPypi { inherit pname version; - hash = "sha256-L8P6T+GFOsmHz1Do1FmeP+RG3VMGT+hqRqQHqY6fwE8="; + hash = "sha256-BmdTn8ZjMKJdqmtOUtSUt4Niip/tVKP/MVB23NFaHs0="; }; # Module doesn't have tests From f9cc96e97d920369a4ff652c325841794de9130d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 16:02:48 +0200 Subject: [PATCH 45/73] python310Packages.soco: 0.27.1 -> 0.28.0 --- pkgs/development/python-modules/soco/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 50a134df2d2..894bdb9d0ba 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -5,6 +5,7 @@ , appdirs , ifaddr , pythonOlder +, lxml , mock , nix-update-script , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.27.1"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,12 +25,13 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - hash = "sha256-8U7wfxqen+hgK8j9ooPHCAKvd9kSZicToTyP7XzQFrg="; + hash = "sha256-rH6EfPK4EEQDO63VEIM7jJO5OM4tyYfZ5yYUskPf8dE="; }; propagatedBuildInputs = [ appdirs ifaddr + lxml requests xmltodict ]; From 8cdaff89f2aeee7c6a2d64ec7d9196c784a42359 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 16:08:07 +0200 Subject: [PATCH 46/73] python310Packages.types-redis: 4.3.0 -> 4.3.2 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index b98628c095c..4e2d5950efa 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.0"; + version = "4.3.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9L2b5qt0Hx2pEFzwpORiiG3B1drkbW0/a3/X6B/+uig="; + sha256 = "sha256-oZNQj6poxT3sRcwwUV6rlMMxMlr4oMPIAJX2Dyq22qY="; }; # Module doesn't have tests From 8fa3f5ca4958fbf7167e4556fdf64ddb2ce5178c Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Thu, 23 Jun 2022 17:16:58 +0200 Subject: [PATCH 47/73] python3Packages.expiringdict: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/expiringdict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 23ca9c1c3f2..942feff4513 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "expiringdict"; - version = "1.2.1"; + version = "1.2.2"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "mailgun"; repo = pname; rev = "v${version}"; - sha256 = "07g1vxznmim78bankfl9brr01s31sksdcpwynq1yryh6xw9ri5xs"; + sha256 = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; checkInputs = [ From 466c2e342a6887507fb5e58d8d29350a0c4b7488 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 Jun 2022 23:19:25 +0100 Subject: [PATCH 48/73] treewide/applications: add `sourceType` `binaryNativeCode` for many packages --- pkgs/applications/audio/baudline/default.nix | 1 + pkgs/applications/audio/hqplayer-desktop/default.nix | 1 + pkgs/applications/audio/losslessaudiochecker/default.nix | 1 + pkgs/applications/audio/midas/generic.nix | 1 + pkgs/applications/audio/ocenaudio/default.nix | 1 + pkgs/applications/audio/pocket-casts/default.nix | 1 + pkgs/applications/audio/reaper/default.nix | 1 + pkgs/applications/audio/redux/default.nix | 1 + pkgs/applications/audio/renoise/default.nix | 1 + pkgs/applications/audio/rymcast/default.nix | 1 + pkgs/applications/audio/soundwireserver/default.nix | 1 + pkgs/applications/audio/spotify/default.nix | 1 + pkgs/applications/audio/sunvox/default.nix | 1 + pkgs/applications/audio/tonelib-gfx/default.nix | 1 + pkgs/applications/audio/tonelib-jam/default.nix | 1 + pkgs/applications/audio/tonelib-metal/default.nix | 1 + pkgs/applications/audio/tonelib-zoom/default.nix | 1 + pkgs/applications/audio/transcribe/default.nix | 1 + pkgs/applications/audio/virtual-ans/default.nix | 1 + pkgs/applications/blockchains/exodus/default.nix | 1 + pkgs/applications/blockchains/sparrow/default.nix | 4 ++++ pkgs/applications/blockchains/wasabibackend/default.nix | 1 + pkgs/applications/blockchains/wasabiwallet/default.nix | 1 + pkgs/applications/editors/atom/default.nix | 1 + pkgs/applications/editors/eclipse/build-eclipse.nix | 1 + pkgs/applications/editors/pinegrow/default.nix | 1 + pkgs/applications/editors/quartus-prime/quartus.nix | 1 + pkgs/applications/editors/sublime/2/default.nix | 1 + pkgs/applications/editors/sublime/3/common.nix | 1 + pkgs/applications/editors/sublime/4/common.nix | 1 + pkgs/applications/emulators/kega-fusion/default.nix | 1 + pkgs/applications/emulators/wine/base.nix | 4 ++++ pkgs/applications/finance/cryptowatch/default.nix | 1 + pkgs/applications/gis/udig/default.nix | 1 + pkgs/applications/graphics/avocode/default.nix | 1 + pkgs/applications/graphics/drawio/default.nix | 1 + pkgs/applications/graphics/fiji/default.nix | 5 ++++- pkgs/applications/graphics/kodelife/default.nix | 1 + pkgs/applications/graphics/lightburn/default.nix | 1 + pkgs/applications/graphics/odafileconverter/default.nix | 1 + pkgs/applications/graphics/pencil/default.nix | 1 + pkgs/applications/graphics/pixeluvo/default.nix | 1 + pkgs/applications/graphics/pixinsight/default.nix | 1 + .../applications/graphics/sane/backends/brscan4/default.nix | 1 + .../applications/graphics/sane/backends/brscan5/default.nix | 1 + .../graphics/sane/backends/dsseries/default.nix | 1 + pkgs/applications/graphics/unigine-heaven/default.nix | 1 + pkgs/applications/graphics/unigine-sanctuary/default.nix | 1 + .../applications/graphics/unigine-superposition/default.nix | 1 + pkgs/applications/graphics/unigine-tropics/default.nix | 1 + pkgs/applications/graphics/unigine-valley/default.nix | 1 + pkgs/applications/graphics/write_stylus/default.nix | 1 + pkgs/applications/misc/1password-gui/beta.nix | 1 + pkgs/applications/misc/1password-gui/default.nix | 1 + pkgs/applications/misc/1password/default.nix | 1 + pkgs/applications/misc/adobe-reader/default.nix | 1 + pkgs/applications/misc/authy/default.nix | 1 + pkgs/applications/misc/azuredatastudio/default.nix | 1 + pkgs/applications/misc/binance/default.nix | 1 + pkgs/applications/misc/foxitreader/default.nix | 1 + pkgs/applications/misc/gometer/default.nix | 1 + pkgs/applications/misc/googleearth-pro/default.nix | 1 + pkgs/applications/misc/hubstaff/default.nix | 1 + pkgs/applications/misc/icesl/default.nix | 1 + pkgs/applications/misc/ideamaker/default.nix | 1 + pkgs/applications/misc/ipmicfg/default.nix | 1 + pkgs/applications/misc/ipmiview/default.nix | 5 ++++- pkgs/applications/misc/join-desktop/default.nix | 1 + pkgs/applications/misc/jotta-cli/default.nix | 1 + pkgs/applications/misc/kdbplus/default.nix | 1 + pkgs/applications/misc/koreader/default.nix | 1 + pkgs/applications/misc/masterpdfeditor/default.nix | 1 + pkgs/applications/misc/masterpdfeditor4/default.nix | 1 + pkgs/applications/misc/mystem/default.nix | 1 + pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++++ pkgs/applications/misc/pdfstudio/common.nix | 4 ++++ pkgs/applications/misc/playonlinux/default.nix | 1 + pkgs/applications/misc/polar-bookshelf/default.nix | 1 + pkgs/applications/misc/premid/default.nix | 1 + pkgs/applications/misc/rescuetime/default.nix | 1 + pkgs/applications/misc/robo3t/default.nix | 1 + pkgs/applications/misc/sidequest/default.nix | 1 + pkgs/applications/misc/signumone-ks/default.nix | 4 ++++ pkgs/applications/misc/simplenote/default.nix | 1 + pkgs/applications/misc/snapmaker-luban/default.nix | 1 + pkgs/applications/misc/snowsql/default.nix | 1 + pkgs/applications/misc/thedesk/default.nix | 1 + pkgs/applications/misc/upwork/default.nix | 1 + pkgs/applications/misc/whalebird/default.nix | 1 + pkgs/applications/misc/xmind/default.nix | 5 ++++- pkgs/applications/networking/aether/default.nix | 1 + .../networking/apache-directory-studio/default.nix | 4 ++++ pkgs/applications/networking/appgate-sdp/default.nix | 1 + pkgs/applications/networking/browsers/brave/default.nix | 1 + .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 1 + pkgs/applications/networking/browsers/vivaldi/widevine.nix | 1 + pkgs/applications/networking/cisco-packet-tracer/7.nix | 1 + pkgs/applications/networking/cisco-packet-tracer/8.nix | 1 + pkgs/applications/networking/cluster/octant/default.nix | 1 + .../cluster/ssm-session-manager-plugin/default.nix | 1 + .../networking/feedreaders/indigenous-desktop/default.nix | 1 + pkgs/applications/networking/hpmyroom/default.nix | 1 + .../networking/instant-messengers/alfaview/default.nix | 1 + .../networking/instant-messengers/bluejeans/default.nix | 1 + .../networking/instant-messengers/discord/default.nix | 1 + .../networking/instant-messengers/ferdi/default.nix | 1 + .../networking/instant-messengers/franz/default.nix | 1 + .../networking/instant-messengers/gitter/default.nix | 1 + .../networking/instant-messengers/hipchat/default.nix | 1 + .../networking/instant-messengers/jitsi/default.nix | 5 ++++- .../instant-messengers/mattermost-desktop/default.nix | 1 + .../networking/instant-messengers/ripcord/darwin.nix | 1 + .../networking/instant-messengers/ripcord/default.nix | 1 + .../instant-messengers/rocketchat-desktop/default.nix | 1 + .../networking/instant-messengers/sky/default.nix | 1 + .../networking/instant-messengers/skypeforlinux/default.nix | 1 + .../networking/instant-messengers/slack/default.nix | 1 + .../networking/instant-messengers/teams/default.nix | 1 + .../networking/instant-messengers/teamspeak/client.nix | 1 + .../networking/instant-messengers/teamspeak/server.nix | 1 + .../instant-messengers/threema-desktop/default.nix | 1 + .../networking/instant-messengers/viber/default.nix | 1 + .../networking/instant-messengers/vk-cli/default.nix | 1 + .../networking/instant-messengers/vk-messenger/default.nix | 1 + .../networking/instant-messengers/wire-desktop/default.nix | 1 + .../networking/instant-messengers/zoom-us/default.nix | 1 + pkgs/applications/networking/insync/default.nix | 1 + pkgs/applications/networking/insync/v3.nix | 1 + .../networking/mailreaders/mailspring/default.nix | 1 + .../networking/mailreaders/thunderbird-bin/default.nix | 1 + pkgs/applications/networking/mullvad-vpn/default.nix | 1 + .../applications/networking/p2p/frostwire/frostwire-bin.nix | 5 ++++- pkgs/applications/networking/p2p/soulseekqt/default.nix | 1 + pkgs/applications/networking/p2p/tixati/default.nix | 1 + pkgs/applications/networking/pcloud/default.nix | 1 + pkgs/applications/networking/remote/anydesk/default.nix | 1 + .../networking/remote/aws-workspaces/default.nix | 1 + .../networking/remote/citrix-workspace/generic.nix | 1 + .../networking/remote/nice-dcv-client/default.nix | 1 + pkgs/applications/networking/remote/teamviewer/default.nix | 1 + pkgs/applications/networking/resilio-sync/default.nix | 1 + pkgs/applications/networking/scaleft/default.nix | 1 + pkgs/applications/networking/spideroak/default.nix | 1 + .../networking/synology-drive-client/default.nix | 1 + pkgs/applications/networking/termius/default.nix | 1 + pkgs/applications/networking/tetrd/default.nix | 1 + pkgs/applications/office/appflowy/default.nix | 1 + pkgs/applications/office/jabref/default.nix | 1 + pkgs/applications/office/mendeley/default.nix | 1 + pkgs/applications/office/moneyplex/default.nix | 1 + pkgs/applications/office/morgen/default.nix | 1 + pkgs/applications/office/onlyoffice-bin/default.nix | 1 + pkgs/applications/office/portfolio/default.nix | 1 + pkgs/applications/office/softmaker/generic.nix | 1 + pkgs/applications/office/wpsoffice/default.nix | 1 + pkgs/applications/office/zotero/default.nix | 1 + pkgs/applications/radio/sdrplay/default.nix | 1 + pkgs/applications/science/biology/flywheel-cli/default.nix | 1 + pkgs/applications/science/biology/quast/default.nix | 4 ++++ pkgs/applications/science/electronics/bitscope/common.nix | 1 + pkgs/applications/science/electronics/eagle/eagle.nix | 1 + pkgs/applications/science/electronics/picoscope/default.nix | 2 ++ pkgs/applications/science/logic/isabelle/default.nix | 4 ++++ pkgs/applications/science/logic/nuXmv/default.nix | 1 + pkgs/applications/science/logic/saw-tools/default.nix | 1 + pkgs/applications/science/logic/tlaplus/toolbox.nix | 1 + pkgs/applications/science/logic/tptp/default.nix | 1 + pkgs/applications/science/logic/verifast/default.nix | 1 + .../science/machine-learning/sc2-headless/default.nix | 1 + pkgs/applications/science/math/cplex/default.nix | 1 + pkgs/applications/science/math/geogebra/default.nix | 4 ++++ pkgs/applications/science/math/geogebra/geogebra6.nix | 6 +++++- pkgs/applications/science/math/gurobi/default.nix | 5 ++++- pkgs/applications/science/math/hmetis/default.nix | 1 + pkgs/applications/science/math/scilab-bin/default.nix | 1 + pkgs/applications/science/math/wolfram-engine/default.nix | 1 + pkgs/applications/science/medicine/aliza/default.nix | 1 + pkgs/applications/science/misc/foldingathome/client.nix | 1 + pkgs/applications/science/misc/foldingathome/viewer.nix | 1 + pkgs/applications/science/programming/fdr/default.nix | 1 + .../science/robotics/betaflight-configurator/default.nix | 1 + .../science/robotics/emuflight-configurator/default.nix | 1 + .../science/robotics/inav-configurator/default.nix | 1 + pkgs/applications/terminal-emulators/hyper/default.nix | 1 + pkgs/applications/version-management/bcompare/default.nix | 1 + .../version-management/github-desktop/default.nix | 1 + pkgs/applications/version-management/gitkraken/default.nix | 1 + pkgs/applications/version-management/p4/default.nix | 1 + pkgs/applications/version-management/p4v/default.nix | 1 + .../version-management/sublime-merge/common.nix | 1 + pkgs/applications/video/filebot/default.nix | 5 ++++- pkgs/applications/video/flirc/default.nix | 1 + pkgs/applications/video/lightworks/default.nix | 1 + pkgs/applications/video/makemkv/default.nix | 1 + pkgs/applications/video/streamlink-twitch-gui/bin.nix | 1 + .../driver/win-signed-gplpv-drivers/default.nix | 1 + .../virtualization/driver/win-spice/default.nix | 1 + pkgs/applications/virtualization/virtualbox/default.nix | 4 ++++ .../virtualization/virtualbox/guest-additions/default.nix | 1 + .../virtualization/vmware-workstation/default.nix | 1 + 200 files changed, 256 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index b2a74e23dc5..6e5c53091d7 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { # See http://www.baudline.com/faq.html#licensing_terms. # (Do NOT (re)distribute on hydra.) license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 5cfd9c7cbe8..17c8f936efd 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -86,6 +86,7 @@ mkDerivation rec { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 9fecf7b9ba9..b7150d6b677 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { meta = { description = "Utility to check whether audio is truly lossless or not"; homepage = "https://losslessaudiochecker.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ p-h ]; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index b58bd0b2757..8c34318191b 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "Editor for the ${brand} ${type} digital mixer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 8fe6beebc4b..1bbbe3583f9 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform, easy to use, fast and functional audio editor"; homepage = "https://www.ocenaudio.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 46625253d0f..7b7bf50a2f8 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 820475be0c6..d186755ecce 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ]; diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index 45ee78917ac..41254cc9e50 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample-based instrument, with a powerful phrase sequencer"; homepage = "https://www.renoise.com/products/redux"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mihnea-s ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index acd1d80c86d..1be3f53dce5 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 92d3151c835..06e711941a6 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Player for Mega Drive/Genesis VGM files"; homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index db8d28989b2..b296ebdad60 100755 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix @@ -35,6 +35,7 @@ qt5.mkDerivation { homepage = "https://georgielabs.net/"; maintainers = with maintainers; [ mkg20001 ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 14caa6db9c4..ecbdaec7f28 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 503079b9ed4..1bde46cdc94 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index a0b3cf2879e..682627c0e82 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass."; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 orivej ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 17b3b1197f4..9229cba4839 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index 9acb6982c6a..29c5cb6a3f2 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 41539503e02..74fe8645acf 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index d10a0d87941..06f0d47d8a2 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { conventional music players. ''; homepage = "https://www.seventhstring.com/xscribe/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index c1e41e41284..07f006aa0cc 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. ''; homepage = "https://warmplace.ru/soft/ans/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index d13278b7dee..654da25261d 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.exodus.io/"; description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ mmahut rople380 ]; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index bf43bac9695..e3b54a74656 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -225,6 +225,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; homepage = "https://sparrowwallet.com"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; maintainers = with maintainers; [ emmanuelrosa _1000101 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index df30302bc6c..e4e97cae21a 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -43,6 +43,7 @@ buildDotnetModule rec { meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index e3cea78629f..71ee3832823 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Privacy focused Bitcoin wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 325dfdd85d3..29c4bb6c884 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -86,6 +86,7 @@ let meta = with lib; { description = "A hackable text editor for the 21st Century"; homepage = "https://atom.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ offline ysndr ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 39b94664f04..19a2e378f30 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.eclipse.org/"; inherit description; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 65604926b8f..1149117e67b 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://pinegrow.com"; description = "UI Web Editor"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ unfreeRedistributable ]; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 9475f441703..4b566986023 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -89,6 +89,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "FPGA design and simulation software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 074584e3360..6c9a43779f7 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index a5cf2d560c0..e1d5b3d4d36 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 81eaa442425..de9bf276aa5 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index e8feb1ea7ed..1b95dec89fa 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; }; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 7788b13b4ec..e3875e130a1 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -191,6 +191,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { inherit version; homepage = "https://www.winehq.org/"; license = with lib.licenses; [ lgpl21Plus ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # mono, gecko + ]; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/applications/finance/cryptowatch/default.nix index 09531e4650e..4bf7a1a0b4f 100644 --- a/pkgs/applications/finance/cryptowatch/default.nix +++ b/pkgs/applications/finance/cryptowatch/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://cryptowat.ch"; description = "Application for visualising real-time cryptocurrency market data"; platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ livnev ]; }; diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index b939cf05e75..808b70ed5ec 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -18,6 +18,7 @@ let meta = with lib; { description = "User-friendly Desktop Internet GIS"; homepage = "http://udig.refractions.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ epl10 bsd3 ]; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 4d2db993b8d..a6a3563743b 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://avocode.com/"; description = "The bridge between designers and developers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ megheaiulian ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 08cd0aad815..85d201f32dc 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 270132eca94..039eb45a296 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -66,7 +66,10 @@ 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 ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; maintainers = with maintainers; [ zane ]; }; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 1c4609ac55b..6286e64e3ef 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hexler.net/products/kodelife"; description = "Real-time GPU shader editor"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 05a99527e5f..50b1cb37ffa 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index b9990295457..3a089febc3d 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -46,6 +46,7 @@ in mkDerivation { meta = with lib; { description = "For converting between different versions of .dwg and .dxf"; homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ nagisa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 5c5557d6d60..ffd31bf7325 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -99,6 +99,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "GUI prototyping/mockup tool"; homepage = "https://pencil.evolus.vn/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; # Commercial license is also available maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index 0c90b786bac..f3b40b51518 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; homepage = "http://www.pixeluvo.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 6a59af40cc1..f54aef75ac1 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scientific image processing program for astrophotography"; homepage = "https://pixinsight.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index ea70224a932..ec8efcc27c2 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 4d276bd57bc..59daa9eb09a 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { description = "Brother brscan5 sane backend driver"; homepage = "https://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ mattchrist ]; }; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 8a01f70c6b0..93e179d867d 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Brother DSSeries SANE backend driver"; homepage = "http://www.brother.com"; platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ callahad ]; }; diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/applications/graphics/unigine-heaven/default.nix index 2ce05a52812..1677e4d65ee 100644 --- a/pkgs/applications/graphics/unigine-heaven/default.nix +++ b/pkgs/applications/graphics/unigine-heaven/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/heaven"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix index 25d10d61667..4b3f3ab547c 100644 --- a/pkgs/applications/graphics/unigine-sanctuary/default.nix +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec{ meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/sanctuary"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index 768089d1a0c..b1261bb52f2 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -139,6 +139,7 @@ buildFHSUserEnv { meta = { description = "The Unigine Superposition GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/superposition"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix index 1057c2fa6ca..f0d5101b4be 100644 --- a/pkgs/applications/graphics/unigine-tropics/default.nix +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation { meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/tropics"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 9b51373178e..ee1c9e6c15f 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "https://unigine.com/products/benchmarks/valley/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ lib.maintainers.kierdavis ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index ca8cebb2ec0..be20635c500 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { meta = with lib; { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 306a914dc19..9f0d9d62e05 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7ffc4a5fc7f..e39450e5bef 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 6231e62bc2d..afc8d114f00 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation { homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; }; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 2bce30365f0..1a164f578a0 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index c448b86d0c4..ca243f44370 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.authy.com"; description = "Twilio Authy two factor authentication desktop application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index aa7150bb6b0..0261f983ac7 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index d5d6f6b5358..9aa6e9bb9dd 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Binance Cryptoexchange Official Desktop Client"; homepage = "https://www.binance.com/en/desktop-download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index b206d14323b..c6ed7bc1ad3 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -73,6 +73,7 @@ mkDerivation rec { meta = with lib; { description = "A viewer for PDF documents"; homepage = "https://www.foxitsoftware.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ p-h rhoriguchi ]; diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix index 9b335b1aeda..8c68f8672c3 100644 --- a/pkgs/applications/misc/gometer/default.nix +++ b/pkgs/applications/misc/gometer/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analytic-Tracking tool for GoLance"; homepage = "https://golance.com/download-gometer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 950cb236ecb..dd6964318e7 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -115,6 +115,7 @@ mkDerivation rec { meta = with lib; { description = "A world sphere viewer"; homepage = "https://www.google.com/earth/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 44169f6a539..390f756beb1 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index ae049699121..1a079ab8274 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "https://icesl.loria.fr/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1e20a0d6faf..619a821a32c 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.raise3d.com/ideamaker/"; description = "Raise3D's 3D slicer software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 120affb988c..ecad4bd9821 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Supermicro IPMI configuration tool"; homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 579890c78ba..fbc436c882c 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -72,7 +72,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix index 0b09911ddb2..369aae03863 100644 --- a/pkgs/applications/misc/join-desktop/default.nix +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/joaomgcd/JoinDesktop/"; description = "Desktop app for Join"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license license = licenses.free; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b50bc7e5611..64044693203 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.jottacloud.com/"; downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 8ee8337bea2..05d1c98e56a 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "i686-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index e2480dd18bd..b428690b7a4 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 68453252ba5..de131b7ce63 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b4b9a4d6244..befb11a0a48 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 62c1834d26a..198d170bd89 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Morphological analysis of Russian text"; homepage = "https://yandex.ru/dev/mystem/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 745796098e8..e4626ef3c94 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 8c034d6636b..047d9e4190f 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -88,6 +88,10 @@ buildFHSUserEnv { homepage = "https://www.qoppa.com/${pname}/"; description = "An easy to use, full-featured PDF editing software"; longDescription = longDescription; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; mainProgram = pname; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 58d45d19bee..669f25e1509 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.pasqui23 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8fcd9e1a04f..1c286d611e6 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.noneucat ]; diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index d2b8663d245..3fe8c64f20b 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { description = "A simple, configurable utility to show your web activity as playing status on Discord"; homepage = "https://premid.app"; downloadPage = "https://premid.app/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ natto1784 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 69f0b26b9ec..273b2d6046e 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -53,6 +53,7 @@ in mkDerivation rec { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; maintainers = with maintainers; [ cstrahan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 81219fc7526..ae32aac267e 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ eperuffo ]; }; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index e26a40667da..23684142a09 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -48,6 +48,7 @@ description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/SideQuestVR/SideQuest"; downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index eb0af95d58d..f183fbed3d2 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index f723ba27beb..35f15339351 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -27,6 +27,7 @@ let description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ kiwi ]; diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index b5bcbabf867..6a9c8843c09 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; homepage = "https://github.com/Snapmaker/Luban"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.simonkampe ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 85f4ffec5f1..90aab7987b3 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line client for the Snowflake database"; homepage = "https://www.snowflake.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ andehen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 42f4d36eea5..c9d845574ff 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mastodon/Misskey Client for PC"; homepage = "https://thedesk.top"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 34cc9702398..0b1bed67857 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zakkor wolfangaukang ]; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index f49b14e8fc4..3972d7a1723 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; homepage = "https://whalebird.social"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang colinsane ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index a395ffd521f..17134dcd389 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -85,7 +85,10 @@ stdenv.mkDerivation rec { and save to Evernote. ''; homepage = "https://www.xmind.net/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index 5f78b244ca4..62dbae082d9 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { description = "Peer-to-peer ephemeral public communities"; homepage = "https://getaether.net/"; downloadPage = "https://getaether.net/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ maxhille ]; # other platforms could be supported by building from source diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 8b20c1aac6b..4a9c0da726f 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Eclipse-based LDAP browser and directory client"; homepage = "https://directory.apache.org/studio/"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; # Upstream supports macOS and Windows too. platforms = platforms.linux; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 7e4c5cfac88..d6f21aa0423 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -151,6 +151,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; homepage = "https://www.appgate.com/support/software-defined-perimeter-support"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7833722c4d9..2d131b4279a 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -200,6 +200,7 @@ stdenv.mkDerivation rec { chew up your bandwidth, and invade your privacy. Brave lets you contribute to your favorite creators automatically. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 962113a2ace..26b408ffdec 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 740e325fca4..65c58775874 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Widevine support for Vivaldi"; homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index f7e73171312..422ccd05cff 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -83,6 +83,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 9bc89001745..0dd31aea061 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -125,6 +125,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 70c25579079..733e4c04a9c 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { introspective tooling, cluster navigation, and object management along with a plugin system to further extend its capabilities. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index a3c8bc70661..7350a8bd460 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix index 9bb34ffbbd7..22bd33b8771 100644 --- a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; homepage = "https://indigenous.realize.be/indigenous-desktop"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 64a237480c6..5417cc6fda1 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -50,6 +50,7 @@ mkDerivation rec { meta = { description = "Client for HPE's MyRoom web conferencing solution"; maintainers = with lib.maintainers; [ johnazoidberg ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; homepage = "https://myroom.hpe.com"; # TODO: A Darwin binary is available upstream diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 51279394df5..ff97cb55a55 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index c902a7e67c5..ddecac07352 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ab471ef47fb..326d02fd706 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -55,6 +55,7 @@ let description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 90ab331426a..edd05a83ad6 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -26,6 +26,7 @@ mkFranzDerivation' rec { meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index b3d9194c6fe..a910105fde8 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -11,6 +11,7 @@ mkFranzDerivation rec { meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = "https://meetfranz.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 8ed85cba854..04d8909f3d8 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -94,6 +94,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Where developers come to talk"; downloadPage = "https://gitter.im/apps"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.imalison ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6a677c9e0d6..8debefa0c11 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Desktop client for HipChat services"; homepage = "http://www.hipchat.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 96467387808..0ef6b2e74d7 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.jitsi.members; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index ba806409e05..bb900654d1e 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mattermost Desktop client"; homepage = "https://about.mattermost.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix index ef9dad66b5d..39403ba774f 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mikroskeem ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 7379d769288..7fd0bd9bb1d 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -60,6 +60,7 @@ mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 71379039de6..d854414a36b 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official Desktop client for Rocket.Chat"; homepage = "https://github.com/RocketChat/Rocket.Chat.Electron"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ gbtb ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index 464d4d77f94..e949625875e 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -59,6 +59,7 @@ mkDerivation rec { meta = { description = "Lync & Skype for Business on Linux"; homepage = "https://tel.red/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 024ac9a1431..515290ab915 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -120,6 +120,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Linux client for skype"; homepage = "https://www.skype.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 86ed37e54dc..953d5134377 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -80,6 +80,7 @@ let meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 07462b4cc26..d7831d3fd53 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -28,6 +28,7 @@ let description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 80d04eabc82..e3273b8ddc5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "Teamspeak client license"; url = "https://www.teamspeak.com/en/privacy-and-terms/"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e027ed656e0..577589f6a40 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 0951f1d3d8e..128107aa055 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop client for Threema, a privacy-focused end-to-end encrypted mobile messenger"; homepage = "https://threema.ch"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index f8e048edc4b..be19ec25742 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jagajaga ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix index bb34fd7534c..a22437bf8da 100644 --- a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A console (ncurses) client for vk.com written in D"; homepage = "https://github.com/vk-cli/vk"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5fb0f14f36a..1d249794d44 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -24,6 +24,7 @@ let meta = with lib; { description = "Simple and Convenient Messaging App for VK"; homepage = "https://vk.com/messenger"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d7a2218e7d..304d1bf4255 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -47,6 +47,7 @@ let ''; homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 06f9a2d3e8e..37f3c992510 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -183,6 +183,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ danbst tadfisher doronbehar ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 380aad6c329..5992453975d 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 49a5b892111..5efffab51c6 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 4bc80b84b84..539e69069f3 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e4e5332e07f..ba4edfd916f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -206,6 +206,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with lib.maintainers; [ lovesegfault ]; platforms = builtins.attrNames mozillaPlatforms; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cf22d880406..97dc48f6e0d 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 8de78c580aa..50e18ac9dca 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 0d2fc0fd833..c281756bed3 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -52,6 +52,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; homepage = "https://www.slsknet.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 9a0cc70c199..bafbb443458 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Torrent client"; homepage = "http://www.tixati.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 50a26ef50f6..4cb3a43640c 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -104,6 +104,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ patryk27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 54d7c5c6813..e13e2331323 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index 48b44656ff0..4eea552810b 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; homepage = "https://clients.amazonworkspaces.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; # TODO Mac support maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 1ecf805944e..5051d2308f0 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -206,6 +206,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; description = "Citrix Workspace"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = with maintainers; [ pmenke michaeladler ]; inherit homepage; diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 20b85032887..23b2727d695 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rmcgibbo ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index ba6d3d3c0f8..5aa6d622095 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -96,6 +96,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.teamviewer.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index bbce0e1d350..35b4fa3aef4 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automatically sync files via secure, distributed technology"; homepage = "https://www.resilio.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 6dca196948d..1f340a70361 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; homepage = "https://www.scaleft.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jloyet ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 8c0fdfa3b9a..0bfc62ccfbb 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -53,6 +53,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ amorsillo ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 3184c192b12..69468c0a4df 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -7,6 +7,7 @@ let meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 0d4824fb558..6a8960367be 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix index 937992a63d7..a9ccf1d2774 100644 --- a/pkgs/applications/networking/tetrd/default.nix +++ b/pkgs/applications/networking/tetrd/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share your internet connection from your device to your PC and vice versa through a USB cable"; homepage = "https://tetrd.app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 821447fdfa2..82ae850065d 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source alternative to Notion"; homepage = "https://www.appflowy.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 4ebfd796595..8d1f639622d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 3b9963d8dbc..e204e04008c 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -139,6 +139,7 @@ mkDerivation { meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4038f5fd435..742e4dc9e29 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Moneyplex online banking software"; maintainers = with maintainers; [ tstrobel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.unfree; downloadPage = "http://matrica.de/download/download.html"; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index e3390e54ee3..0e5332b953e 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "All-in-one Calendars, Tasks and Scheduler"; homepage = "https://morgen.so/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 214b8376d8d..8e1b7eb7902 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -171,6 +171,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Plus; maintainers = with maintainers; [ nh2 gtrunsec ]; }; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 12d7dc0dcbf..fc38ac2e8c2 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 3c139e1eead..6162aa23260 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -122,6 +122,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 46f2569b13a..d909b26526a 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://www.wps.com/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mlatus th0rgal ]; }; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b39fe00f2e0..b5c1467f691 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 441ff1cf0f3..699389dd2d3 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf ''; homepage = "https://www.sdrplay.com/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.pmenke ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix index 7db8b006626..7d74b51f606 100644 --- a/pkgs/applications/science/biology/flywheel-cli/default.nix +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and command line interface for interacting with a Flywheel site"; homepage = "https://gitlab.com/flywheel-io/public/python-cli"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rbreslow ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index ed3fc116dda..0a33c976731 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -49,6 +49,10 @@ pythonPackages.buildPythonApplication rec { meta = with lib ; { description = "Evaluates genome assemblies by computing various metrics"; homepage = "https://github.com/ablab/quast"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.all; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 49415ea0484..2018878773e 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -24,6 +24,7 @@ let meta = with lib; { homepage = "http://bitscope.com/software/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 5b4c8eb790f..6302c2dbfa3 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -73,6 +73,7 @@ let meta = with lib; { description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; homepage = "https://www.autodesk.com/products/eagle/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ ]; diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7db5cceebba..596f220242b 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -41,6 +41,7 @@ let ''; meta = with lib; shared_meta lib // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "library for picotech oscilloscope software"; }; }) { }; @@ -132,6 +133,7 @@ in stdenv.mkDerivation rec { PicoScope for Linux, PicoScope for macOS and PicoScope for Windows users, or exported in text, CSV and MathWorks MATLAB 4 formats. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9e5d40be2c6..a9f131dfa48 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -178,6 +178,10 @@ in stdenv.mkDerivation rec { formulas in a logical calculus. ''; homepage = "https://isabelle.in.tum.de/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index 710cfdad39a..ad40902e928 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Symbolic model checker for analysis of finite and infinite state systems"; homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ siraben ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index df99d067f08..b6291bfae36 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 3c53e66c8bd..86c3db9942a 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation rec { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 9c91eaddfc4..5df511ebaa8 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { # Also, it is unclear what is covered by "verbatim" - we will edit configs hydraPlatforms = []; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; }; } diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index c610256ccae..a1f5ec65a3b 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 9438cd972f9..97cad175ac1 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation rec { meta = { platforms = lib.platforms.linux; description = "Starcraft II headless linux client for machine learning research"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index a570e7e9c6d..ddc950b3066 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ bfortz ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index b7eb8b11ecd..43d1a3e2068 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -29,6 +29,10 @@ let homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ sikmir imsofi ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode # some jars include native binaries + ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; }; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 76d178b7e49..e1b5bbaedc2 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -48,7 +48,7 @@ let }; darwinPkg = stdenv.mkDerivation { - inherit pname version meta; + inherit pname version; src = fetchurl { urls = [ @@ -66,6 +66,10 @@ let install -dm755 $out/Applications unzip $src -d $out/Applications ''; + + meta = meta // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in if stdenv.isDarwin diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 574d849d955..536d520058a 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index 762216a97a4..1c0152b7bfc 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 65d8c145bef..327472e88c7 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # see http://www.scilab.org/legal_notice license = "Scilab"; }; diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index cf9364ffac1..acb92766910 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wolfram Engine computational software system"; homepage = "https://www.wolfram.com/engine/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ fbeffa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 0eb89b63e47..b08acc77c64 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; homepage = "https://www.aliza-dicom-viewer.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index cc3d5445b59..6ebc72cc7da 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -52,6 +52,7 @@ buildFHSUserEnv { meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 75e900a0a72..7f28c8d1b14 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home viewer"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index bc67c30aa61..f7b12342a66 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { homepage = "https://cocotec.io/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = with maintainers; [ nickhu ]; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 50657239952..9417be6e1df 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ca486006fec..112049d7c01 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { The application allows you to configure the Emuflight software running on any supported Emuflight target. ''; homepage = "https://github.com/emuflight/EmuConfigurator"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ beezow ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index ec605a3a97e..a0b694f2954 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/iNavFlight/inav/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ tilcreator wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 2266e884454..031d49d2458 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A terminal built on web technologies"; homepage = "https://hyper.is/"; maintainers = with maintainers; [ puffnfresh fabiangd ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 57adae69db0..bed85a37f54 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -86,6 +86,7 @@ let You can then merge the changes, synchronize your files, and generate reports for your records. ''; homepage = "https://www.scootersoftware.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ktor arkivm ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 6017d105fed..7c07dc17c2e 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for managing Git and GitHub."; homepage = "https://desktop.github.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index a0bc7477c61..c8ca224a952 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -36,6 +36,7 @@ let meta = { homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ xnwdd evanjs arkivm ]; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 7091f0fbc6f..4f61be6669a 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Command-Line Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ corngood ]; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 2e0e01e5c98..9c804a7459b 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -76,6 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ nathyong nioncode ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 28c7350ae39..17f36ab4161 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -121,6 +121,7 @@ in stdenv.mkDerivation (rec { description = "Git client from the makers of Sublime Text"; homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 8bf1bf7b3ba..45f7d099056 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://filebot.net"; changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ gleber felschr ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix index 6285094c461..58de5ceab09 100644 --- a/pkgs/applications/video/flirc/default.nix +++ b/pkgs/applications/video/flirc/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { homepage = "https://flirc.tv/more/flirc-usb"; description = "Use any Remote with your Media Center"; maintainers = with maintainers; [ aanderse ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 6bec6e25533..b01af67cd68 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -85,6 +85,7 @@ in buildFHSUserEnv { meta = { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ antonxy vojta001 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 2c15513d4d6..c3d75826891 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -79,6 +79,7 @@ in mkDerivation { can always download the latest version from makemkv.com that will reset the expiration date. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 395da881ea9..7459d08d595 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index ef8ec062e4d..8ba02d94021 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation { ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 2c2cd90f1c2..0cf8e06c311 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 642c4b1390f..4e07d92d661 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -230,6 +230,10 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9c012750bf1..da9f32b9c68 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -155,6 +155,7 @@ in stdenv.mkDerivation rec { This add-on provides support for dynamic resizing of the X Display, shared host/guest clipboard support and guest OpenGL support. ''; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 58cd4092a95..247fb3bd6ea 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -334,6 +334,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Industry standard desktop hypervisor for x86-64 architecture"; homepage = "https://www.vmware.com/products/workstation-pro.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ deinferno ]; From 070028a96044acab02dd080503321d3120eb02a4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 7 Jun 2022 20:36:21 +0100 Subject: [PATCH 49/73] fahcontrol: remove autoPatchelfHook argument this is confusing as it is not used - the package .deb only contains python (and bash) --- pkgs/applications/science/misc/foldingathome/control.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e5cc02edcfb..a64c973914c 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,5 +1,4 @@ { lib, stdenv -, autoPatchelfHook , dpkg , fahviewer , fetchurl From 16bca8d4c893e2d8ef3151ea77635079d88361b3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 12 Jun 2022 19:08:09 +0100 Subject: [PATCH 50/73] dbeaver: add sourceProvenance binaryBytecode --- pkgs/applications/misc/dbeaver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3f54826fc52..abde33b730c 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -127,6 +127,10 @@ PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, Teradata, Firebird, Derby, etc. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies from maven + ]; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; From 7a0549387ba08400f77de54417c41a6d45ad1056 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Sun, 5 Jun 2022 21:04:07 +0200 Subject: [PATCH 51/73] nixos-rebuild: Accept only one argument Multiple arguments make no sense but they are accepted, the last one winning. Found editing a previous run from shell history and adding a command rather than replacing it; observe in verbose mode: ``` $ nixos-rebuild dry-run -v building the system configuration... Building in legacy (non-flake) mode. No --build-host given, running nix-build locally $ nix-build -A system -k -I nixpkgs=/home/kn/src/nixpkgs -v --dry-run ... ``` ``` $ nixos-rebuild dry-run build -v building Nix... $ nix-instantiate --add-root /tmp/nixos-rebuild.jgEYqZ/nix.drv --indirect -A config.nix.package.out -I nixpkgs=/home/kn/src/nixpkgs -v ... ``` nixos-rebuild(8) already bails out on zero arguments, so do the same when passing a second one. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 795bedb99d4..95004f44794 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -49,6 +49,8 @@ while [ "$#" -gt 0 ]; do ;; switch|boot|test|build|edit|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader) if [ "$i" = dry-run ]; then i=dry-build; fi + # exactly one action mandatory, bail out if multiple are given + if [ -n "$action" ]; then showSyntax; fi action="$i" ;; --install-grub) From 6db6fe4d1c143aaa3281870df2a9eea931836a83 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 02:43:10 +0200 Subject: [PATCH 52/73] xkblayout-state: drop unneeded qt4 dep --- pkgs/applications/misc/xkblayout-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 70543b5fa18..539a0f7d1a1 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qt4 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; - buildInputs = [ qt4 ]; + buildInputs = [ libX11 ]; installPhase = '' mkdir -p $out/bin From 1ecc8fa5ca16b4ccf8f99ae2d6861a78a78affcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:01:52 +0200 Subject: [PATCH 53/73] rehex: drop me from maintainers --- pkgs/applications/editors/rehex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 3b169bf4e53..52134d15da8 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 SuperSandro2000 ]; + maintainers = with maintainers; [ markus1189 ]; platforms = platforms.all; }; } From 7db8c5cc07e761c600943e842e9d1f0f7e960e64 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 02:13:25 +0200 Subject: [PATCH 54/73] confclerk: 0.6.4 -> 0.7.1 qt4 -> qt5 --- pkgs/applications/misc/confclerk/default.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index fb89d2a7e37..84095c41654 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, mkDerivation, fetchurl, qtbase, qmake }: -let version = "0.6.4"; in -stdenv.mkDerivation { +mkDerivation rec { pname = "confclerk"; - inherit version; + version = "0.7.1"; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; + sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' + postInstall = '' mkdir -p $out/bin - cp src/bin/confclerk $out/bin + mv $out/confclerk $out/bin/ ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b92ae0b6d4..6a81af51823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25830,7 +25830,7 @@ with pkgs; complete-alias = callPackage ../tools/misc/complete-alias { }; - confclerk = callPackage ../applications/misc/confclerk { }; + confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = libsForQt5.callPackage ../applications/misc/copyq { }; From 55fc0010c4c851f14ea51c5f9b480c5bbce6e706 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Sun, 5 Jun 2022 01:50:58 +0200 Subject: [PATCH 55/73] bcc: Split manuals into own output This should avoid manual cache/database rebuilds whenever tools alone change. Our bpftrace does the same already. --- pkgs/os-specific/linux/bcc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index d6e4b059088..ab3e2232852 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -77,6 +77,8 @@ python.pkgs.buildPythonApplication rec { wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath" ''; + outputs = [ "out" "man" ]; + passthru.tests = { bpf = nixosTests.bpf; }; From 5fec5ebf378850c794ddc1406c8aa6bae39a9838 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 23 Jun 2022 15:17:57 +0200 Subject: [PATCH 56/73] offlineimap: remove optional insecure kerberos dependency was marked insecure in c8dbbe5c3236dbc5445b31c69e5bf8251f172c0d because of https://github.com/apple/ccs-pykerberos/issues/31 --- pkgs/tools/networking/offlineimap/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 98aabadf6da..aa9c588e253 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -32,7 +32,6 @@ python3.pkgs.buildPythonApplication rec { certifi distro imaplib2 - kerberos pysocks rfc6555 urllib3 From 694494c455f5cc21537bbec056c8163b053d5d4e Mon Sep 17 00:00:00 2001 From: polynomialspace Date: Thu, 23 Jun 2022 11:54:13 -0700 Subject: [PATCH 57/73] update git sha after upstream v2.1.2 retag see: https://github.com/containers/conmon/commit/2bc95ee697e87d5f7b77063cf83fc32739addafe --- pkgs/applications/virtualization/conmon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 1236775ac67..2a9f1a27c3d 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxRMY43Z9OytY1kc91VVmqLn5cl0UC/0Zj8x3vpsaBQ="; + sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM="; }; nativeBuildInputs = [ pkg-config ]; From a9bbbc8238e27384db4d5ac56aa786e4c8e40882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:09:44 +0200 Subject: [PATCH 58/73] python310Packages.drf-spectacular-sidecar: 2022.5.1 -> 2022.6.1 --- .../python-modules/drf-spectacular-sidecar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index e9128b79ec7..e2413df85d4 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; - version = "2022.5.1"; + version = "2022.6.1"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; rev = version; - sha256 = "sha256-UBuHU+F4b+plhGbvqho8/bgmq6yDUXSTnfxyD1xlDY4="; + sha256 = "sha256-SKMAA8tcvWUF7EARq9vN8C0DWcQFRX5j/tfgHF5TUWs="; }; propagatedBuildInputs = [ From 30c698becbe4b985886e625416831d0cbfbb4bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:10:24 +0200 Subject: [PATCH 59/73] python310Packages.django-allauth: 0.50.0 -> 0.51.0 --- pkgs/development/python-modules/django-allauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 16d3e88b211..6db3cbefedb 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.50.0"; + version = "0.51.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pennersr"; repo = pname; rev = version; - hash = "sha256-O6KEDt+Z1MJUvKXQJILqLRgNj+ZrCZjlb3CJHpRL1Kk="; + hash = "sha256-o8EoayMMwxoJTrUA3Jo1Dfu1XFgC+Mcpa8yMwXlKAKY="; }; postPatch = '' From ef61c5e069409777e5d8226568401df09a94a018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:05:03 +0200 Subject: [PATCH 60/73] python310Packages.python-magic: 0.4.26 -> 0.4.27 --- pkgs/development/python-modules/python-magic/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 852b66b44e5..3338fb6fa7d 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, python , buildPythonPackage , fetchFromGitHub , substituteAll @@ -10,13 +9,13 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.26"; + version = "0.4.27"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "sha256-RcKldMwSRroNZNEl0jwuJG9C+3OIPBzk+CjqkxKK/eY="; + sha256 = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; }; patches = [ From 2c4be24dcf483eaef14709dd3e212c18a237ba0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 19:10:47 +0000 Subject: [PATCH 61/73] python310Packages.gsd: 2.5.1 -> 2.5.3 --- pkgs/development/python-modules/gsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index f4f3a7eb13f..0714352ed5e 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,15 +4,15 @@ }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.5.3"; pname = "gsd"; disabled = isPy27; src = fetchFromGitHub { owner = "glotzerlab"; repo = pname; - rev = "v${version}"; - sha256 = "00cy4lw7xnl2skfx7fg7cs1c8lrbaxvkym9j6zfi1dbvsdd0r103"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3CJKpvgJuFC/2qQdy0H/kvLbtmfF22gBAQustK99uEE="; }; nativeBuildInputs = [ cython ]; From 0137050ca6ea14f7007e97eec4563ec14df2f9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:09:17 +0200 Subject: [PATCH 62/73] python310Packages.eth-typing: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index a2f3103be47..6c8bc6cb570 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "3.0.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; rev = "v${version}"; - sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; + sha256 = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; }; checkInputs = [ From 2e16cc76042815c6eac344f872eb349ee439660a Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Tue, 21 Jun 2022 13:50:27 -0600 Subject: [PATCH 63/73] vscode-extensions.grapecity.gc-excelviewer: init at 4.2.55 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae65dc33d61..170f981ae53 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1041,6 +1041,22 @@ let }; }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gc-excelviewer"; + publisher = "grapecity"; + version = "4.2.55"; + sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; + }; + meta = with lib; { + description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; + homepage = "https://github.com/jjuback/gc-excelviewer"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + humao.rest-client = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "humao"; From 2cb3b82e14a0d001e0260816e0724ebcf4276b6e Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 23 Jun 2022 12:06:29 -0600 Subject: [PATCH 64/73] vscode-extensions.mattn.lisp: init at 0.1.12 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 170f981ae53..d4a542bb99e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1511,6 +1511,23 @@ let }; }; + mattn.lisp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lisp"; + publisher = "mattn"; + version = "0.1.12"; + sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; + }; + meta = with lib; { + description = "Lisp syntax for vscode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp"; + homepage = "https://github.com/mattn/vscode-lisp"; + changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; From 14b4830da921820b4ef389bf337b1e14473871c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 20:17:13 +0000 Subject: [PATCH 65/73] python310Packages.pulumi-aws: 5.9.0 -> 5.9.1 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index b62f9b7eaaf..838422a31a2 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.9.0"; + version = "5.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-QEOVI6PvFJ8gf02Hlh42grMt2cObTJsOSmrgmjEZ8Rw="; + hash = "sha256-LYWxdqortazhev73JSTItrEyZZYFmeXkAko/2aFKaSw="; }; sourceRoot = "${src.name}/sdk/python"; From 057c7b5938f2687269513af1c774414d44744c88 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Jun 2022 00:05:21 +0100 Subject: [PATCH 66/73] gpm: pull patch pending upstream inclusion to fix parallel install Without the change when install parallelism is enabled it fails as: install -c gpm ../gpm-unstable-2020-06-17/sbin/gpm install: cannot create regular file '../gpm-unstable-2020-06-17/sbin/gpm': No such file or directory --- pkgs/servers/gpm/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index f132f98344a..66c6607e647 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { url = "https://github.com/kaction/gpm/commit/217b4fe4c9b62298a4e9a54c1f07e3b52b013a09.patch"; sha256 = "1f74h12iph4z1dldbxk9imcq11805c3ai2xhbsqvx8jpjrcfp19q"; }) + + # Pull fix pending upstream inclusion to fix parallel installation: + # https://github.com/telmich/gpm/pull/43 + (fetchpatch { + name = "parallel-install.patch"; + url = "https://github.com/telmich/gpm/commit/a88fb82a7afe96e872bb31c554e9ad5888f5a451.patch"; + sha256 = "0g1jhz9bjw7vqjv922xkhs8xkjxdqh11nj38jj3c8nv5lcil76nx"; + }) ]; preConfigure = '' ./autogen.sh @@ -38,6 +46,8 @@ stdenv.mkDerivation rec { (if ncurses == null then "--without-curses" else "--with-curses") ]; + enableParallelBuilding = true; + # Provide libgpm.so for compatability postInstall = '' ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so From 8e530526dc5980f2f15fd96d61b8dee1055e5533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 19:16:47 +0000 Subject: [PATCH 67/73] python310Packages.wandb: 0.12.18 -> 0.12.19 --- pkgs/development/python-modules/wandb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 83040329302..747f60bc21f 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.18"; + version = "0.12.19"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -47,8 +47,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "client"; - rev = "v${version}"; - hash = "sha256-9++CFoC8p3cACPyjRbb6i8MdJp8iD9GUh0uHpTiufdg="; + rev = "refs/tags/v${version}"; + hash = "sha256-eH65vk3Pnm6d4vDiaWbs1tXD0lCRkfOB2hqD9MGxuXY="; }; patches = [ From 57777e6d56235fe64620ac1605fc3a2009842ffa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 May 2022 14:10:41 +0200 Subject: [PATCH 68/73] ocamlPackages.parmap: disable tests --- pkgs/development/ocaml-modules/parmap/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 521c1c40671..18e1975b698 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -10,13 +10,12 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.03"; - useDune2 = true; buildInputs = [ dune-configurator ]; - doCheck = true; + doCheck = false; # prevent running slow benchmarks meta = with lib; { description = "Library for multicore parallel programming"; From 7d634c9f977e324ec228dc74da58df6464a9a20a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Jun 2022 14:39:37 +0200 Subject: [PATCH 69/73] ocamlPackages.fmt: do not propagate `cmdliner` --- pkgs/development/ocaml-modules/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 4816cab57cf..bd562981652 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + buildInputs = [ cmdliner topkg ]; + propagatedBuildInputs = [ seq stdlib-shims ]; strictDeps = true; From 8681aa0d6528b65dee31c6b8d42c97aaaee984de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Jun 2022 09:24:59 +0200 Subject: [PATCH 70/73] ocamlPackages.ocaml-r: mark as broken --- pkgs/development/ocaml-modules/ocaml-r/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index fcee63de3b5..ed22177bfaa 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -37,6 +37,8 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = { + # This has been broken by the update to R 4.2.0 (#171597) + broken = true; description = "OCaml bindings for the R interpreter"; inherit (src.meta) homepage; license = lib.licenses.gpl3; From 9741b60e02497c507fa44f0a88e41de3170effa6 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:23:06 +0300 Subject: [PATCH 71/73] serfdom: 0.8.1 -> 0.9.8 --- pkgs/servers/serf/default.nix | 42 ++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 8964796862c..da1bf0770fd 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,23 +1,43 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "serf"; - version = "0.8.1"; - rev = "v${version}"; - - goPackagePath = "github.com/hashicorp/serf"; + version = "0.9.8"; + rev = "a2bba5676d6e37953715ea10e583843793a0c507"; src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; - inherit rev; - sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; + rev = "v${version}"; + sha256 = "sha256-UWCxzwV2bcT8Sfl296HpBThe+qYX19M7sNcEJHs/sXc="; }; + vendorSha256 = "sha256-DaPcCuj0KGpuOC6XynltMBE9wO7w5qKrTChC401249o="; + + subPackages = [ "cmd/serf" ]; + + # These values are expected by version/version.go + # https://github.com/hashicorp/serf/blob/7faa1b06262f70780c3c35ac25a4c96d754f06f3/version/version.go#L8-L22 + ldflags = lib.mapAttrsToList + (n: v: "-X github.com/hashicorp/serf/version.${n}=${v}") { + GitCommit = rev; + Version = version; + VersionPrerelease = ""; + }; + + # There are no tests for cmd/serf. + doCheck = false; + meta = with lib; { - description = "Tool for service orchestration and management"; - homepage = "https://www.serf.io/"; - platforms = platforms.linux ++ platforms.darwin; + description = "Service orchestration and management tool"; + longDescription = '' + Serf is a decentralized solution for service discovery and orchestration + that is lightweight, highly available, and fault tolerant. + ''; + homepage = "https://www.serf.io"; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; }; From 4ea3d5e65d0b9e1e3a3e87d415cc935ee4848756 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:31:15 +0300 Subject: [PATCH 72/73] interlock: 2016.04.13 -> 2020.03.05 --- pkgs/servers/interlock/default.nix | 48 ++++++++++++++-------- pkgs/servers/interlock/deps.nix | 65 ------------------------------ 2 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 pkgs/servers/interlock/deps.nix diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index e151c9ec45e..1fbe7444491 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,27 +1,28 @@ -{ sudo, coreutils, systemd, cryptsetup -, mount, umount -, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, coreutils +, cryptsetup +, mount +, systemd +, umount +}: -buildGoPackage rec { +buildGoModule rec { pname = "interlock"; - version = "2016.04.13"; - rev = "v${version}"; - - goPackagePath = "github.com/inversepath/interlock"; - - subPackages = [ "./cmd/interlock" ]; + version = "2020.03.05"; src = fetchFromGitHub { - inherit rev; - owner = "inversepath"; + owner = "usbarmory"; repo = "interlock"; - sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; + rev = "v${version}"; + sha256 = "sha256-YXa4vErt3YnomTKAXCv8yUVhcc0ST47n9waW5E8QZzY="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-OL6I95IpyTIc8wCwD9nWxVUTrmZH6COhsd/YwNTyvN0="; + + ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ sudo ]; - tags = [ "textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ -e 's|/bin/mount|${mount}/bin/mount|' \ @@ -34,4 +35,19 @@ buildGoPackage rec { -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|' \ -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|' ''; + + postInstall = '' + mkdir -p $out/share + cp -R $src/static $out/share + ''; + + # Tests are broken due to an error during key generation. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/usbarmory/interlock"; + description = "File encryption tool and an HSM frontend"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; } diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix deleted file mode 100644 index be5c0529573..00000000000 --- a/pkgs/servers/interlock/deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "be52937128b38f1d99787bb476c789e2af1147f1"; - sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; - sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/janimo/textsecure"; - fetch = { - type = "git"; - url = "https://github.com/janimo/textsecure"; - rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; - sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } -] From 6ec6afde81a1e521183bf2de9db14c21023b5a16 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 4 Apr 2022 17:32:07 -0500 Subject: [PATCH 73/73] nixel: init at 4.1.0 --- pkgs/tools/nix/nixel/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/nix/nixel/default.nix diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/tools/nix/nixel/default.nix new file mode 100644 index 00000000000..5ce14a8d312 --- /dev/null +++ b/pkgs/tools/nix/nixel/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, testers +, nixel +}: + +rustPlatform.buildRustPackage rec { + pname = "nixel"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "kamadorueda"; + repo = pname; + rev = version; + sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; + }; + + cargoSha256 = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + + # Package requires a non reproducible submodule + # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7 + doCheck = false; + # + # Let's test it runs + passthru.tests = { + version = testers.testVersion { package = nixel; }; + }; + + meta = with lib; { + description = "Lexer, Parser, Abstract Syntax Tree and Concrete Syntax Tree for the Nix Expressions Language"; + homepage = "https://github.com/kamadorueda/nixel"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ kamadorueda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349..9050a4cb7c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4095,6 +4095,8 @@ with pkgs; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixel = callPackage ../tools/nix/nixel { }; + nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; nix-template = callPackage ../tools/package-management/nix-template {