From 2902f99c5734c0eebf265b4009dfccb5703aa9e1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 20 Nov 2023 23:27:31 +0200 Subject: [PATCH 01/32] llvmPackages: Dedupe `llvm_meta` --- .../development/compilers/llvm/10/default.nix | 16 +------------- .../development/compilers/llvm/11/default.nix | 16 +------------- .../development/compilers/llvm/12/default.nix | 16 +------------- .../development/compilers/llvm/13/default.nix | 16 +------------- .../development/compilers/llvm/14/default.nix | 17 +-------------- .../development/compilers/llvm/15/default.nix | 17 +-------------- .../development/compilers/llvm/16/default.nix | 17 +-------------- pkgs/development/compilers/llvm/6/default.nix | 15 +------------ pkgs/development/compilers/llvm/7/default.nix | 16 +------------- pkgs/development/compilers/llvm/8/default.nix | 16 +------------- pkgs/development/compilers/llvm/9/default.nix | 16 +------------- .../compilers/llvm/common/common-let.nix | 21 +++++++++++++++++++ .../compilers/llvm/git/default.nix | 17 +-------------- 13 files changed, 33 insertions(+), 183 deletions(-) create mode 100644 pkgs/development/compilers/llvm/common/common-let.nix diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 37c32e425c63..eca009a1c8c1 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -29,21 +29,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 6ce7d86c835e..d0916e89519b 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -31,21 +31,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index b976dd2ee67a..c720e53eeb0f 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -32,21 +32,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 3cf7cd711ebe..0469b77fe425 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -34,21 +34,7 @@ let sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; }; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index b9a74e0f070a..442b0f731579 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -34,22 +34,7 @@ let sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; }; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.m68k ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 6a3b8cbabab7..1fbef0bb6c15 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -83,22 +83,7 @@ in let inherit (releaseInfo) release_version version; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.m68k ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 541db8c400de..94888d4ef53d 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -83,22 +83,7 @@ in let inherit (releaseInfo) release_version version; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.m68k ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 3dcc75023f4f..b5eebe76a3f5 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -17,20 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 0607b5ebf42c..e24656527067 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -29,21 +29,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 5beb8afb2ee9..5cb26ea5217f 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -29,21 +29,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 9f79dc5cce7f..3234eb2e17c0 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -29,21 +29,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix new file mode 100644 index 000000000000..ca5a2f8b805c --- /dev/null +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -0,0 +1,21 @@ +{ lib, release_version }: + +{ + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = lib.teams.llvm.members; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86 ++ + lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++ + lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k; + }; + +} diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 930b716881e8..e6e2f7113dab 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -82,22 +82,7 @@ in let inherit (releaseInfo) release_version version; - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.m68k ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.riscv ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); From 5ac86a99e7e1c3374c8a5bd28599026e5450ae06 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 21 Nov 2023 01:14:37 +0200 Subject: [PATCH 02/32] llvmPackages: Dedupe releaseInfo --- .../development/compilers/llvm/15/default.nix | 18 +++------------- .../development/compilers/llvm/16/default.nix | 18 +++------------- .../compilers/llvm/common/common-let.nix | 21 ++++++++++++++++++- .../compilers/llvm/git/default.nix | 19 ++++------------- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 1fbef0bb6c15..0082ae8505e7 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -54,19 +54,6 @@ in let monorepoSrc' = monorepoSrc; in let - releaseInfo = if gitRelease != null then rec { - original = gitRelease; - release_version = original.version; - version = gitRelease.rev-version; - } else rec { - original = officialRelease; - release_version = original.version; - version = if original ? candidate then - "${release_version}-${original.candidate}" - else - release_version; - }; - monorepoSrc = if monorepoSrc' != null then monorepoSrc' else let @@ -81,9 +68,10 @@ in let inherit rev sha256; }; + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; inherit (releaseInfo) release_version version; - - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; + inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 94888d4ef53d..5213ebc37b47 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -54,19 +54,6 @@ in let monorepoSrc' = monorepoSrc; in let - releaseInfo = if gitRelease != null then rec { - original = gitRelease; - release_version = original.version; - version = gitRelease.rev-version; - } else rec { - original = officialRelease; - release_version = original.version; - version = if original ? candidate then - "${release_version}-${original.candidate}" - else - release_version; - }; - monorepoSrc = if monorepoSrc' != null then monorepoSrc' else let @@ -81,9 +68,10 @@ in let inherit rev sha256; }; + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; inherit (releaseInfo) release_version version; - - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; + inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index ca5a2f8b805c..d56063f1bc43 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -1,4 +1,8 @@ -{ lib, release_version }: +{ lib +, release_version ? null +, gitRelease ? null +, officialRelease ? null +}: { llvm_meta = { @@ -18,4 +22,19 @@ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k; }; + releaseInfo = + if gitRelease != null then rec { + original = gitRelease; + release_version = original.version; + version = gitRelease.rev-version; + } else rec { + original = officialRelease; + release_version = original.version; + version = + if original ? candidate then + "${release_version}-${original.candidate}" + else + release_version; + }; + } diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index e6e2f7113dab..dc5ea642995c 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -53,19 +53,6 @@ in let monorepoSrc' = monorepoSrc; in let - releaseInfo = if gitRelease != null then rec { - original = gitRelease; - release_version = original.version; - version = gitRelease.rev-version; - } else rec { - original = officialRelease; - release_version = original.version; - version = if original ? candidate then - "${release_version}-${original.candidate}" - else - release_version; - }; - monorepoSrc = if monorepoSrc' != null then monorepoSrc' else let @@ -80,9 +67,11 @@ in let inherit rev sha256; }; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); From e6751897e0209add93b7ee9725e7479dea25c873 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 21 Nov 2023 01:28:25 +0200 Subject: [PATCH 03/32] llvmPackages: Dedupe monorepoSrc --- .../development/compilers/llvm/15/default.nix | 16 +------------- .../development/compilers/llvm/16/default.nix | 16 +------------- .../compilers/llvm/common/common-let.nix | 22 ++++++++++++++++++- .../compilers/llvm/git/default.nix | 17 +------------- 4 files changed, 24 insertions(+), 47 deletions(-) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 0082ae8505e7..96c4c6e8aa4c 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -54,24 +54,10 @@ in let monorepoSrc' = monorepoSrc; in let - monorepoSrc = if monorepoSrc' != null then - monorepoSrc' - else let - sha256 = releaseInfo.original.sha256; - rev = if gitRelease != null then - gitRelease.rev - else - "llvmorg-${releaseInfo.version}"; - in fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - inherit rev sha256; - }; - # Import releaseInfo separately to avoid infinite recursion inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5213ebc37b47..d75e1a121a99 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -54,24 +54,10 @@ in let monorepoSrc' = monorepoSrc; in let - monorepoSrc = if monorepoSrc' != null then - monorepoSrc' - else let - sha256 = releaseInfo.original.sha256; - rev = if gitRelease != null then - gitRelease.rev - else - "llvmorg-${releaseInfo.version}"; - in fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - inherit rev sha256; - }; - # Import releaseInfo separately to avoid infinite recursion inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index d56063f1bc43..31360f5b98b9 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -1,10 +1,12 @@ { lib +, fetchFromGitHub ? null , release_version ? null , gitRelease ? null , officialRelease ? null +, monorepoSrc' ? null }: -{ +rec { llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; @@ -37,4 +39,22 @@ release_version; }; + monorepoSrc = + if monorepoSrc' != null then + monorepoSrc' + else + let + sha256 = releaseInfo.original.sha256; + rev = + if gitRelease != null then + gitRelease.rev + else + "llvmorg-${releaseInfo.version}"; + in + fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + inherit rev sha256; + }; + } diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index dc5ea642995c..2506d177a174 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -53,25 +53,10 @@ in let monorepoSrc' = monorepoSrc; in let - monorepoSrc = if monorepoSrc' != null then - monorepoSrc' - else let - sha256 = releaseInfo.original.sha256; - rev = if gitRelease != null then - gitRelease.rev - else - "llvmorg-${releaseInfo.version}"; - in fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - inherit rev sha256; - }; - - # Import releaseInfo separately to avoid infinite recursion inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); From c1e1a583a02f1a7ee34b822a09ee2a5bae184396 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 21 Nov 2023 01:44:34 +0200 Subject: [PATCH 04/32] llvmPackages_{13,14}: Use releaseInfo and monorepoSrc Doing the same thing as was done in the initial adding of `monorepoSrc` to `llvmPackages_15` d231d18e4aa5e1d00f86b4f484f9e4344538e3ea --- .../development/compilers/llvm/13/default.nix | 56 ++++++++++++++----- .../development/compilers/llvm/14/default.nix | 55 ++++++++++++------ 2 files changed, 80 insertions(+), 31 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 0469b77fe425..0a1b90fc9fd4 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -16,25 +16,51 @@ then null else pkgs.bintools , darwin +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "13.0.1"; sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null + }: +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); let - release_version = "13.0.1"; - candidate = ""; # empty or "rcN" - dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = ""; # When using a Git commit - rev-version = ""; # When using a Git commit - version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; - targetConfig = stdenv.targetPlatform.config; + monorepoSrc' = monorepoSrc; +in let + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; - }; - - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; + src = monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 442b0f731579..da37ce0ef1e2 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -16,25 +16,48 @@ then null else pkgs.bintools , darwin +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "14.0.6"; sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null }: +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); let - release_version = "14.0.6"; - candidate = ""; # empty or "rcN" - dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = ""; # When using a Git commit - rev-version = ""; # When using a Git commit - version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; - targetConfig = stdenv.targetPlatform.config; - - monorepoSrc = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; - }; - - inherit (import ../common/common-let.nix { inherit lib; }) llvm_meta; + monorepoSrc' = monorepoSrc; +in let + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); From b59fd202d70faa17d0150bae3dd81d3461545a10 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 21 Nov 2023 02:05:15 +0200 Subject: [PATCH 05/32] llvmPackages: Remove dead code for hygiene Run `deadnix . --edit` `gccForLibs` is an argument used by multi.nix but it's an argument to cc-wrapper, not to llvmPackages. `@args` in `llvm/default.nix` was accidentally added in 4badff49fda90fba01684d2f19c31442688252b4 There are no uses of `@` therefore these changes are safe. --- pkgs/development/compilers/llvm/10/default.nix | 3 +-- pkgs/development/compilers/llvm/10/libunwind/default.nix | 3 +-- pkgs/development/compilers/llvm/11/clang/default.nix | 2 +- pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 2 +- pkgs/development/compilers/llvm/11/default.nix | 3 +-- pkgs/development/compilers/llvm/11/libunwind/default.nix | 3 +-- pkgs/development/compilers/llvm/12/default.nix | 3 +-- pkgs/development/compilers/llvm/13/default.nix | 2 +- pkgs/development/compilers/llvm/14/default.nix | 2 +- pkgs/development/compilers/llvm/14/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 2 +- pkgs/development/compilers/llvm/15/default.nix | 4 ++-- pkgs/development/compilers/llvm/15/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/16/clang/default.nix | 2 +- pkgs/development/compilers/llvm/16/compiler-rt/default.nix | 2 +- pkgs/development/compilers/llvm/16/default.nix | 4 ++-- pkgs/development/compilers/llvm/16/llvm/default.nix | 3 +-- pkgs/development/compilers/llvm/6/default.nix | 4 +--- pkgs/development/compilers/llvm/7/default.nix | 3 +-- pkgs/development/compilers/llvm/8/default.nix | 3 +-- pkgs/development/compilers/llvm/9/default.nix | 3 +-- pkgs/development/compilers/llvm/9/libunwind/default.nix | 3 +-- pkgs/development/compilers/llvm/git/default.nix | 2 +- pkgs/development/compilers/llvm/git/llvm/default.nix | 2 +- 24 files changed, 26 insertions(+), 38 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index eca009a1c8c1..bc72be0ce7a1 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -20,7 +20,6 @@ let release_version = "10.0.1"; version = release_version; # differentiating these (variables) is important for RCs - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/10/libunwind/default.nix b/pkgs/development/compilers/llvm/10/libunwind/default.nix index 8124cf0821e0..2941dca35bf6 100644 --- a/pkgs/development/compilers/llvm/10/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/10/libunwind/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch -, enableShared ? !stdenv.hostPlatform.isStatic +{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index f0d41a3ab734..a4fe7199e080 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index 38dc7a0fbdc8..a41aa7ac4074 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index d0916e89519b..2d9790fe61ac 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -22,7 +22,6 @@ let candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/11/libunwind/default.nix b/pkgs/development/compilers/llvm/11/libunwind/default.nix index 462d63283baf..4cd39e379601 100644 --- a/pkgs/development/compilers/llvm/11/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/11/libunwind/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch -, enableShared ? !stdenv.hostPlatform.isStatic +{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index c720e53eeb0f..4de048827071 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -23,7 +23,6 @@ let candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 0a1b90fc9fd4..c46ebee1d0db 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index da37ce0ef1e2..d6d3c2d088b0 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 081c84c04e06..6eec4c563f9c 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -25,7 +25,7 @@ # broken for the armv7l builder , enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePolly ? true -} @args: +}: let inherit (lib) optional optionals optionalString; diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 4ac51c1dd31e..bfdeeff6db5b 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -9,7 +9,7 @@ let useLLVM = stdenv.hostPlatform.useLLVM or false; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; - inherit (stdenv.hostPlatform) isMusl isGnu; + inherit (stdenv.hostPlatform) isMusl; baseName = "compiler-rt"; diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 96c4c6e8aa4c..095da445a990 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja -, gccForLibs, preLibcCrossHeaders +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 8a1c0547890b..0b9e83259b2c 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -30,7 +30,7 @@ # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? true -} @args: +}: let inherit (lib) optional optionals optionalString; diff --git a/pkgs/development/compilers/llvm/16/clang/default.nix b/pkgs/development/compilers/llvm/16/clang/default.nix index 2a2656df5fe1..b801bdda5292 100644 --- a/pkgs/development/compilers/llvm/16/clang/default.nix +++ b/pkgs/development/compilers/llvm/16/clang/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand -, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 +, cmake, ninja, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index 9b6ab0a77c2a..7add8fab0f91 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -10,7 +10,7 @@ let bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic; - inherit (stdenv.hostPlatform) isMusl isGnu; + inherit (stdenv.hostPlatform) isMusl; baseName = "compiler-rt"; diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index d75e1a121a99..5ecb89a3a264 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -1,5 +1,5 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja -, gccForLibs, preLibcCrossHeaders +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 9475b5c99485..9994076bbdab 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -2,7 +2,6 @@ , pkgsBuildBuild , monorepoSrc , runCommand -, fetchpatch , cmake , darwin , ninja @@ -31,7 +30,7 @@ # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? true -} @args: +}: let inherit (lib) optional optionals optionalString; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index b5eebe76a3f5..3e78f5461e3f 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,5 +1,4 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -8,7 +7,6 @@ let release_version = "6.0.1"; version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index e24656527067..972d52ac6e1a 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -20,7 +20,6 @@ let release_version = "7.1.0"; version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 5cb26ea5217f..0483916a620b 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -20,7 +20,6 @@ let release_version = "8.0.1"; version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 3234eb2e17c0..fbd2e57805be 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -20,7 +20,6 @@ let release_version = "9.0.1"; version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/9/libunwind/default.nix b/pkgs/development/compilers/llvm/9/libunwind/default.nix index 65b89c6bb18f..9a78025d71d4 100644 --- a/pkgs/development/compilers/llvm/9/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/9/libunwind/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch -, enableShared ? !stdenv.hostPlatform.isStatic +{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 2506d177a174..0748b97dd598 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja -, gccForLibs, preLibcCrossHeaders +, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 66b0a7438cef..119b2272beda 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -29,7 +29,7 @@ # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? true -} @args: +}: let inherit (lib) optional optionals optionalString; From f6749cddad78531de21e0779c0251f66976e8098 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 21 Nov 2023 17:45:58 +0200 Subject: [PATCH 06/32] llvmPackages_11.compiler-rt: restore `libcxxabi` argument Removing this caused `error: anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-2/pkgs/development/compilers/llvm/11/compiler-rt/default.nix:1:1 called with unexpected argument 'libcxxabi'` https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20%2Fcompiler-rt.override%2F&type=code The argument became unused in https://github.com/nixos/nixpkgs/commit/56fcbcd1543188fcc855df7e79fee0a8df259681#diff-b1bb77941db4393b7d2cf7a370cee294318418f2507b7a78e22353d1afbb6d21L18 but it was not removed from `buildInputs` in later `llvmPackages` because `llvmPackages_12` had been created before this change was done. Removing `libcxxabi` from `buildInputs` may have to be applied to the other `llvmPackages` too. --- pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index a41aa7ac4074..38dc7a0fbdc8 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libxcrypt +{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: From 408323d697677c4abed0e010e7dd769f8597db9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Nov 2023 16:48:27 +0000 Subject: [PATCH 07/32] asap: 6.0.0 -> 6.0.1 --- pkgs/tools/audio/asap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/asap/default.nix b/pkgs/tools/audio/asap/default.nix index c4a9b03039c5..ccdb5ed93039 100644 --- a/pkgs/tools/audio/asap/default.nix +++ b/pkgs/tools/audio/asap/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "asap"; - version = "6.0.0"; + version = "6.0.1"; src = fetchzip { url = "mirror://sourceforge/project/asap/asap/${version}/asap-${version}.tar.gz"; - sha256 = "sha256-j7vznFI/Yg1yuRvYDmRSyHDfDN7iFV+b6MK2jdnaz6Q="; + sha256 = "sha256-nTnnRDYOkTmXfXPS1XIHaC2LHFfZz+gVInQ3satuyDM="; }; outputs = [ "out" "dev" ]; From 8b68c650d882f0935f1c7e184f0a2a7e339d4a6d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 22 Nov 2023 21:50:36 +0200 Subject: [PATCH 08/32] llvmPackages_16.libclc: fix cross eval libclc was moved in to the set in 223afab31f02a156627ce5918a083e0a8ef3b8be --- pkgs/development/compilers/llvm/16/libclc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/16/libclc/default.nix b/pkgs/development/compilers/llvm/16/libclc/default.nix index 6fa0751f906b..2ceca9aaf7fd 100644 --- a/pkgs/development/compilers/llvm/16/libclc/default.nix +++ b/pkgs/development/compilers/llvm/16/libclc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' 'COMMAND ${buildPackages.libclc.dev}/bin/prepare_builtins' + --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' ''; nativeBuildInputs = [ cmake ninja python3 ]; From 39505338e1fc5b02d08d93b379d630b0bc7daedd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 22:31:08 +0100 Subject: [PATCH 09/32] teleport: migrate to prefetch-yarn-deps --- pkgs/servers/teleport/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index f98e01de5152..d8b630d1a5f3 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -14,7 +14,7 @@ , stdenv , xdg-utils , yarn -, yarn2nix-moretea +, prefetch-yarn-deps , nixosTests , withRdpClient ? true @@ -72,7 +72,7 @@ let nativeBuildInputs = [ nodejs yarn - yarn2nix-moretea.fixup_yarn_lock + prefetch-yarn-deps ]; configurePhase = '' @@ -81,7 +81,7 @@ let buildPhase = '' yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline \ --frozen-lockfile \ From 123143a848ecc9b7886f649d951fc773d7a7a277 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 23:27:13 +0100 Subject: [PATCH 10/32] tandoor-recipes: migrate to prefetch-yarn-deps --- pkgs/applications/misc/tandoor-recipes/frontend.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index dd6380449d95..d63c0874171e 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }: let common = callPackage ./common.nix { }; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps nodejs nodejs.pkgs.yarn ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock command -v yarn yarn install --frozen-lockfile --offline --no-progress --non-interactive patchShebangs node_modules/ From b9a67f73176d44ff1b293a7ac9b241e919065b07 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Nov 2023 04:20:00 +0000 Subject: [PATCH 11/32] lean4: fix build on darwin --- pkgs/applications/science/logic/lean4/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index ecc929cb5f0e..7cbedeef29a7 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { "-DUSE_GITHASH=OFF" ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + meta = with lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; From ca7ec92f3d24432580a7964d1a0f5da57e08ba76 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 Nov 2023 08:37:07 +0100 Subject: [PATCH 12/32] php81: 8.1.25 -> 8.1.26 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 51651c5d405b..5f5be6b3d1d8 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.25"; - hash = "sha256-qGqIwYQMG8gyvP0vvsO4oZQsgxTaXf9T8J+cmNDBLoo="; + version = "8.1.26"; + hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA="; }); in From 4b8b0fb9e6e2fa1e983812083d8189de913faa2b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 Nov 2023 08:39:11 +0100 Subject: [PATCH 13/32] php82: 8.2.12 -> 8.2.13 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 072012657588..20aa6aaa0bc0 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.12"; - hash = "sha256-cEMl9WsbTBf5+VHh/+9cZOFIiWBT804mJhUsuqLwWJM="; + version = "8.2.13"; + hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o="; }); in From 169a3091446d6b3ee60f54a8bf1c1a2753c79c5e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 Nov 2023 08:39:26 +0100 Subject: [PATCH 14/32] php83: 8.3.0RC6 -> 8.3.0 --- pkgs/development/interpreters/php/8.3.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 23b9c2ee8e82..6327e23504a8 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -1,13 +1,10 @@ { callPackage, fetchurl, ... }@_args: let - base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC6"; - phpSrc = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0RC6.tar.xz"; - hash = "sha256-Hntdz+vEkh7EQgnB4IrnG2sQ5bG2uJW7T3a0RIbHBe0="; - }; - })); + base = callPackage ./generic.nix (_args // { + version = "8.3.0"; + hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY="; + }); in base.withExtensions ({ all, ... }: with all; ([ bcmath From aa7c4d71483f2080bea910e8231035bf9c02de1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Nov 2023 07:41:07 +0000 Subject: [PATCH 15/32] python311Packages.mdformat-mkdocs: 1.0.6 -> 1.1.0 --- pkgs/development/python-modules/mdformat-mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 8b5db005eddf..09f9ca41f552 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.0.6"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l4B/DR0pKZG62+sBG+fiux/XeF3ewxb2TYa+Zs1O3kU="; + hash = "sha256-5MCsXCkYnoLEZZoj9WrO/Z3VzTKagoOrMCuTpA4dGAQ="; }; nativeBuildInputs = [ From c7879bcd0d70563a4b52503cdfc83b60d6b73e1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Nov 2023 11:18:39 +0100 Subject: [PATCH 16/32] gvm-libs: 22.7.2 -> 22.7.3 Diff: https://github.com/greenbone/gvm-libs/compare/refs/tags/v22.7.2...v22.7.3 Changelog: https://github.com/greenbone/gvm-libs/releases/tag/v22.7.3 --- pkgs/development/libraries/gvm-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 6c6818b455d9..96a6f99925de 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.2"; + version = "22.7.3"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA="; + hash = "sha256-Vo+lFUGLeGPKq3aUCiiBcBYu6BZ4KQI5vCtnQyRUUiU="; }; nativeBuildInputs = [ From 295a5ac532e7a18f2aedf7aaa620761551cceaba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Nov 2023 11:19:33 +0100 Subject: [PATCH 17/32] ospd-openvas: 22.6.1 -> 22.6.2 Diff: https://github.com/greenbone/ospd-openvas/compare/refs/tags/v22.6.1...v22.6.2 Changelog: https://github.com/greenbone/ospd-openvas/releases/tag/v22.6.2 --- pkgs/tools/security/ospd-openvas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix index 68c6a7dba953..0e4b4b16e752 100644 --- a/pkgs/tools/security/ospd-openvas/default.nix +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.6.1"; + version = "22.6.2"; format = "pyproject"; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; rev = "refs/tags/v${version}"; - hash = "sha256-Qm6TTS9yLqQHXsz19yJR3Ccyc+syxkrTJ7upSTXdXSE="; + hash = "sha256-SO2+PpxjyP+Yba0X81EgNCOAu7ntlG7zOeWA+7XdRIA="; }; pythonRelaxDeps = [ From 512a00af9f403a462bc554e9a84e3ea24cdc955b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Nov 2023 11:24:48 +0100 Subject: [PATCH 18/32] python311Packages.can: 4.2.2 -> 4.3.0 Diff: https://github.com/hardbyte/python-can/compare/refs/tags/v4.2.2...v4.3.0 Changelog: https://github.com/hardbyte/python-can/releases/tag/v4.3.0 --- pkgs/development/python-modules/can/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 2ed28098a63e..4688c6507495 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , future @@ -11,7 +12,6 @@ , pytestCheckHook , pythonOlder , setuptools -, stdenv , typing-extensions , wrapt , uptime @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "can"; - version = "4.2.2"; - format = "setuptools"; + version = "4.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hardbyte"; repo = "python-can"; rev = "refs/tags/v${version}"; - hash = "sha256-MyVGjAy13Ne0PkVufB0JDNEZHhVBzeUYWWlH72ib/pI="; + hash = "sha256-JsYAh5Z6RIX6aWpSuW+VIzJRPf5MfNbBGg36v3CQiLU="; }; postPatch = '' @@ -36,10 +36,13 @@ buildPythonPackage rec { --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ msgpack packaging - setuptools typing-extensions wrapt ]; From 471655e878b33f1482c8136db7fedb7ff60b92f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Nov 2023 11:33:55 +0100 Subject: [PATCH 19/32] python311Packages.mdformat-mkdocs: enable tests --- .../python-modules/mdformat-mkdocs/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 09f9ca41f552..9052c67be207 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -6,18 +6,19 @@ , mdformat-gfm , mdit-py-plugins , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "mdformat-mkdocs"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "KyleKing"; - repo = pname; + repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; hash = "sha256-5MCsXCkYnoLEZZoj9WrO/Z3VzTKagoOrMCuTpA4dGAQ="; }; @@ -32,6 +33,10 @@ buildPythonPackage rec { mdit-py-plugins ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "mdformat_mkdocs" ]; @@ -39,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; -changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; + changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; From 3cf18074db2e7d967d908efbcda49ada694573c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Nov 2023 18:41:27 +0000 Subject: [PATCH 20/32] kodiPackages.radioparadise: 1.0.5 -> 2.0.0 --- pkgs/applications/video/kodi/addons/radioparadise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index 3100325ddd20..bb556e9ec822 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "radioparadise"; namespace = "script.radioparadise"; - version = "1.0.5"; + version = "2.0.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; - sha256 = "sha256-/X/8Q741piNHue5i/kgV+UYpBECyGzkFuN+PUzdeQnA="; + sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; }; propagatedBuildInputs = [ From 61c87b12fe053b514ba6d4998ef2e40b245f7576 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Nov 2023 17:30:30 +0000 Subject: [PATCH 21/32] mimir: 2.10.3 -> 2.10.4 --- pkgs/servers/monitoring/mimir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index b54888cad96b..b52ca5a2f1c2 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-tVJcvxKcxhSeYyqBsBeG+OrWoD+hTDAoPuIXB72MMkY="; + hash = "sha256-0OFuMWoYgo8qCxWk93wOy45diLb2JIBsoxptLKTeOC4="; }; vendorHash = null; From d8daf1cb1bf8321aa0882673e29b2d895ccf4241 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 23 Nov 2023 01:03:32 -0600 Subject: [PATCH 22/32] signal-desktop: 6.39.0 -> 6.39.1, 6.40.0-beta.1 -> 6.40.0-beta.2 --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0e66707349db..683b1d7550cb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.39.0"; - hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8="; + version = "6.39.1"; + hash = "sha256-dDbUpxXpQg1SoVyYO33Nczqf+WmWDPNE6cmw792wjGY="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.40.0-beta.1"; - hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns="; + version = "6.40.0-beta.2"; + hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; }; } From a6779efbbc4fb77355b59c31555b61ba413f09de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Nov 2023 06:28:37 +0000 Subject: [PATCH 23/32] javacc: 7.0.12 -> 7.0.13 --- pkgs/development/tools/parsing/javacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix index 0279ef8f89df..9af0b7374598 100644 --- a/pkgs/development/tools/parsing/javacc/default.nix +++ b/pkgs/development/tools/parsing/javacc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "javacc"; - version = "7.0.12"; + version = "7.0.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-tDtstF3ivKjG01vOZ8Ga1zTjIZFSTWt5QPY1VQvyFMU="; + sha256 = "sha256-nDJvKIbJc23Tvfn7Zqvt5tDDffNf4KQ0juGQQCZ+i1c="; }; nativeBuildInputs = [ ant jdk makeWrapper ]; From 2f10bac416370bc4977c5cb135c9f76a5645cd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Nov 2023 19:36:09 +0000 Subject: [PATCH 24/32] chkrootkit: 0.55 -> 0.58b --- pkgs/tools/security/chkrootkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 7c3af075a552..ad14c1cd3997 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chkrootkit"; - version = "0.55"; + version = "0.58b"; src = fetchurl { url = "ftp://ftp.chkrootkit.org/pub/seg/pac/${pname}-${version}.tar.gz"; - sha256 = "sha256-qBwChuxEkxP5U3ASAqAOgbIE/Cz0PieFhaEcEqXgJYs="; + sha256 = "sha256-de0qzoHw+j6cP7ZNqw6IV+1ZJH6nVfWJhBb+ssZoB7k="; }; # TODO: a lazy work-around for linux build failure ... From e7ca2d56238bf6b31bbd7c4428a3efe82d5a5e33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Nov 2023 20:47:25 +0000 Subject: [PATCH 25/32] riemann: 0.3.9 -> 0.3.10 --- pkgs/servers/monitoring/riemann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 1b3a206dd6dc..0736228645dd 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.9"; + version = "0.3.10"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ="; + sha256 = "sha256-dkIdx+9Rq3paDGHKuwO6RsrQ1u2mvRnncEyOIHqOBRM="; }; nativeBuildInputs = [ makeWrapper ]; From 9940847ce7f9eea460f46e97b74f370d4ea69c72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Nov 2023 19:20:25 +0000 Subject: [PATCH 26/32] chezmoi: 2.40.4 -> 2.41.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 88812357a9c0..5e2bd00dd30a 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.40.4"; + version = "2.41.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-PtIT2PS88jkX/ERHYKRwhvCnCnlAP0lM0FDv74zi32M="; + hash = "sha256-N1KzSpNKwh8OyxtgPdRvhEwO/q9/o9yS6mr3sV7fF6k="; }; - vendorHash = "sha256-O9Ywq8LunS/0yBX9p9M2mzm+auvX1ynYaAY4EoBaE94="; + vendorHash = "sha256-SoSRSKG7tb09hFu2KZBKtA3/6YY9xbI0dKlCHMwytdI="; doCheck = false; From 1088b405d142b599132d20b6019ed965a9f4ad44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Nov 2023 12:07:53 +0000 Subject: [PATCH 27/32] besu: 23.10.0 -> 23.10.2 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 549437313bb4..bf1e4ced669a 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.10.0"; + version = "23.10.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-PHXzeSv9sIknBbN48Li/wU72zs8div5xHY2Gh+1mh88="; + sha256 = "sha256-JVgYpcYGejiqi1ZdjzKkmhcqdTah03BnO7t19UgmPCw="; }; nativeBuildInputs = [ makeWrapper ]; From b8054ecd8af39fdd2631d2b921024fc39ce2212c Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 23 Nov 2023 03:51:17 +0100 Subject: [PATCH 28/32] treewide: add mainProgram --- pkgs/tools/X11/xidlehook/default.nix | 1 + pkgs/tools/backup/awsbck/default.nix | 1 + pkgs/tools/backup/bdsync/default.nix | 1 + pkgs/tools/backup/conserve/default.nix | 1 + pkgs/tools/cd-dvd/bchunk/default.nix | 1 + pkgs/tools/cd-dvd/bootiso/default.nix | 1 + pkgs/tools/cd-dvd/brasero/default.nix | 1 + pkgs/tools/cd-dvd/ccd2iso/default.nix | 1 + pkgs/tools/cd-dvd/cdi2iso/default.nix | 1 + pkgs/tools/cd-dvd/cue2pops/default.nix | 1 + pkgs/tools/cd-dvd/dvd-vr/default.nix | 1 + pkgs/tools/cd-dvd/dvdisaster/default.nix | 1 + pkgs/tools/cd-dvd/iat/default.nix | 1 + pkgs/tools/cd-dvd/isolyzer/default.nix | 1 + pkgs/tools/cd-dvd/lsdvd/default.nix | 1 + pkgs/tools/cd-dvd/mdf2iso/default.nix | 1 + pkgs/tools/cd-dvd/mkcue/default.nix | 1 + pkgs/tools/cd-dvd/nrg2iso/default.nix | 1 + pkgs/tools/cd-dvd/sacd/default.nix | 1 + pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix | 1 + pkgs/tools/cd-dvd/uif2iso/default.nix | 1 + pkgs/tools/cd-dvd/unetbootin/default.nix | 1 + pkgs/tools/cd-dvd/vobcopy/default.nix | 1 + pkgs/tools/cd-dvd/vobsub2srt/default.nix | 1 + pkgs/tools/compression/brotli/default.nix | 1 + pkgs/tools/compression/bsc/default.nix | 1 + pkgs/tools/compression/crabz/default.nix | 1 + pkgs/tools/compression/dejsonlz4/default.nix | 1 + pkgs/tools/compression/dtrx/default.nix | 1 + pkgs/tools/compression/efficient-compression-tool/default.nix | 1 + pkgs/tools/compression/flips/default.nix | 1 + pkgs/tools/compression/hacpack/default.nix | 1 + pkgs/tools/compression/hactool/default.nix | 1 + pkgs/tools/compression/heatshrink/default.nix | 1 + pkgs/tools/compression/imagelol/default.nix | 1 + pkgs/tools/compression/lzbench/default.nix | 1 + pkgs/tools/compression/lzfse/default.nix | 1 + pkgs/tools/compression/lzip/default.nix | 1 + pkgs/tools/compression/lziprecover/default.nix | 1 + pkgs/tools/compression/lzop/default.nix | 1 + pkgs/tools/compression/mozlz4a/default.nix | 1 + pkgs/tools/compression/nx2elf/default.nix | 1 + pkgs/tools/compression/offzip/default.nix | 1 + pkgs/tools/compression/orz/default.nix | 1 + pkgs/tools/compression/ouch/default.nix | 1 + pkgs/tools/compression/pbzx/default.nix | 1 + pkgs/tools/compression/pixz/default.nix | 1 + pkgs/tools/compression/plzip/default.nix | 1 + pkgs/tools/compression/rzip/default.nix | 1 + pkgs/tools/compression/unzrip/default.nix | 1 + pkgs/tools/compression/upx/default.nix | 1 + pkgs/tools/compression/xar/default.nix | 1 + pkgs/tools/compression/zfp/default.nix | 1 + pkgs/tools/graphics/aaphoto/default.nix | 1 + pkgs/tools/graphics/adriconf/default.nix | 1 + pkgs/tools/graphics/blockhash/default.nix | 1 + pkgs/tools/graphics/blur-effect/default.nix | 1 + pkgs/tools/graphics/briss/default.nix | 1 + pkgs/tools/graphics/cfdg/default.nix | 1 + pkgs/tools/graphics/cuneiform/default.nix | 1 + pkgs/tools/graphics/didder/default.nix | 1 + pkgs/tools/graphics/ditaa/default.nix | 1 + pkgs/tools/graphics/dnglab/default.nix | 1 + pkgs/tools/graphics/dpic/default.nix | 1 + pkgs/tools/graphics/editres/default.nix | 1 + pkgs/tools/graphics/epstool/default.nix | 1 + pkgs/tools/graphics/escrotum/default.nix | 1 + pkgs/tools/graphics/esshader/default.nix | 1 + pkgs/tools/graphics/exif/default.nix | 1 + pkgs/tools/graphics/facedetect/default.nix | 1 + pkgs/tools/graphics/fbv/default.nix | 1 + pkgs/tools/graphics/feedgnuplot/default.nix | 1 + pkgs/tools/graphics/fgallery/default.nix | 1 + pkgs/tools/graphics/ggobi/default.nix | 1 + pkgs/tools/graphics/gnuplot/default.nix | 1 + pkgs/tools/graphics/goverlay/default.nix | 1 + pkgs/tools/graphics/graph-cli/default.nix | 1 + pkgs/tools/graphics/graph-easy/default.nix | 1 + pkgs/tools/graphics/gromit-mpx/default.nix | 1 + pkgs/tools/graphics/guff/default.nix | 1 + pkgs/tools/graphics/ibniz/default.nix | 1 + pkgs/tools/graphics/imgur-screenshot/default.nix | 1 + pkgs/tools/graphics/imgurbash2/default.nix | 1 + pkgs/tools/graphics/jhead/default.nix | 1 + pkgs/tools/graphics/jpegexiforient/default.nix | 1 + pkgs/tools/graphics/leela/default.nix | 1 + pkgs/tools/graphics/logstalgia/default.nix | 1 + pkgs/tools/graphics/lsix/default.nix | 1 + pkgs/tools/graphics/mscgen/default.nix | 1 + pkgs/tools/graphics/nifskope/default.nix | 1 + pkgs/tools/graphics/nip2/default.nix | 1 + pkgs/tools/graphics/optipng/default.nix | 1 + pkgs/tools/graphics/oxipng/default.nix | 1 + pkgs/tools/graphics/pdf2svg/default.nix | 1 + pkgs/tools/graphics/pdftag/default.nix | 1 + pkgs/tools/graphics/pdftoipe/default.nix | 1 + pkgs/tools/graphics/perceptualdiff/default.nix | 1 + pkgs/tools/graphics/piglit/default.nix | 1 + pkgs/tools/graphics/pixel2svg/default.nix | 1 + pkgs/tools/graphics/pngcheck/default.nix | 1 + pkgs/tools/graphics/pngcrush/default.nix | 1 + pkgs/tools/graphics/pngloss/default.nix | 1 + pkgs/tools/graphics/pngout/default.nix | 1 + pkgs/tools/graphics/pngtoico/default.nix | 1 + pkgs/tools/graphics/povray/default.nix | 1 + pkgs/tools/graphics/pstoedit/default.nix | 1 + pkgs/tools/graphics/qrcode/default.nix | 1 + pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix | 1 + pkgs/tools/graphics/s2png/default.nix | 1 + pkgs/tools/graphics/sanjuuni/default.nix | 1 + pkgs/tools/graphics/shot-scraper/default.nix | 1 + pkgs/tools/graphics/shotgun/default.nix | 1 + pkgs/tools/graphics/smartcrop/default.nix | 1 + pkgs/tools/graphics/sng/default.nix | 1 + pkgs/tools/graphics/spirv-cross/default.nix | 1 + pkgs/tools/graphics/steghide/default.nix | 1 + pkgs/tools/graphics/stegsolve/default.nix | 1 + pkgs/tools/graphics/svg2pdf/default.nix | 1 + pkgs/tools/graphics/svgbob/default.nix | 1 + pkgs/tools/graphics/svgcleaner/default.nix | 1 + pkgs/tools/graphics/textplots/default.nix | 1 + pkgs/tools/graphics/texture-synthesis/default.nix | 1 + pkgs/tools/graphics/twilight/default.nix | 1 + pkgs/tools/graphics/viu/default.nix | 1 + pkgs/tools/graphics/vkbasalt-cli/default.nix | 1 + pkgs/tools/graphics/vkdisplayinfo/default.nix | 1 + pkgs/tools/graphics/vkmark/default.nix | 1 + pkgs/tools/graphics/vulkan-helper/default.nix | 1 + pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 1 + pkgs/tools/graphics/xcolor/default.nix | 1 + pkgs/tools/graphics/xcur2png/default.nix | 1 + pkgs/tools/graphics/yaxg/default.nix | 1 + pkgs/tools/llm/gorilla-cli/default.nix | 1 + pkgs/tools/security/agebox/default.nix | 1 + pkgs/tools/security/apkleaks/default.nix | 1 + pkgs/tools/security/bao/default.nix | 1 + pkgs/tools/security/bettercap/default.nix | 1 + pkgs/tools/security/ctmg/default.nix | 1 + pkgs/tools/security/cyclonedx-gomod/default.nix | 1 + pkgs/tools/security/dalfox/default.nix | 1 + pkgs/tools/security/dismember/default.nix | 1 + pkgs/tools/security/erosmb/default.nix | 1 + pkgs/tools/security/feroxbuster/default.nix | 1 + pkgs/tools/security/fscan/default.nix | 1 + pkgs/tools/security/gen-oath-safe/default.nix | 1 + pkgs/tools/security/go-dork/default.nix | 1 + pkgs/tools/security/hash-identifier/default.nix | 1 + pkgs/tools/security/hcxdumptool/default.nix | 1 + pkgs/tools/security/ic-keysmith/default.nix | 1 + pkgs/tools/security/jwt-hack/default.nix | 1 + pkgs/tools/security/kepler/default.nix | 1 + pkgs/tools/security/kube-hunter/default.nix | 1 + pkgs/tools/security/kubestroyer/default.nix | 1 + pkgs/tools/security/ldapnomnom/default.nix | 1 + pkgs/tools/security/lethe/default.nix | 1 + pkgs/tools/security/libmodsecurity/default.nix | 1 + pkgs/tools/security/lmp/default.nix | 1 + pkgs/tools/security/log4jcheck/default.nix | 1 + pkgs/tools/security/log4shell-detector/default.nix | 1 + pkgs/tools/security/logmap/default.nix | 1 + pkgs/tools/security/mantra/default.nix | 1 + pkgs/tools/security/minisign/default.nix | 1 + pkgs/tools/security/mongoaudit/default.nix | 1 + pkgs/tools/security/nsjail/default.nix | 1 + pkgs/tools/security/oath-toolkit/default.nix | 1 + pkgs/tools/security/onesixtyone/default.nix | 1 + pkgs/tools/security/parsero/default.nix | 1 + pkgs/tools/security/prs/default.nix | 1 + pkgs/tools/security/routersploit/default.nix | 1 + pkgs/tools/security/rucredstash/default.nix | 1 + pkgs/tools/security/shellz/default.nix | 1 + pkgs/tools/security/silenthound/default.nix | 1 + pkgs/tools/security/slowhttptest/default.nix | 1 + pkgs/tools/security/smbscan/default.nix | 1 + pkgs/tools/security/stegseek/default.nix | 1 + pkgs/tools/security/stricat/default.nix | 1 + pkgs/tools/security/sx-go/default.nix | 1 + pkgs/tools/security/tessen/default.nix | 1 + pkgs/tools/security/vaultwarden/default.nix | 1 + pkgs/tools/security/webanalyze/default.nix | 1 + pkgs/tools/security/xcrawl3r/default.nix | 1 + pkgs/tools/security/yatas/default.nix | 1 + pkgs/tools/security/yubihsm-connector/default.nix | 1 + pkgs/tools/typesetting/asciidoctorj/default.nix | 1 + pkgs/tools/typesetting/biber-ms/default.nix | 1 + pkgs/tools/typesetting/biber/default.nix | 1 + pkgs/tools/typesetting/biblatex-check/default.nix | 1 + pkgs/tools/typesetting/coq2html/default.nix | 1 + pkgs/tools/typesetting/djvu2pdf/default.nix | 1 + pkgs/tools/typesetting/docbook2odf/default.nix | 1 + pkgs/tools/typesetting/fop/default.nix | 1 + pkgs/tools/typesetting/git-latexdiff/default.nix | 1 + pkgs/tools/typesetting/halibut/default.nix | 1 + pkgs/tools/typesetting/hayagriva/default.nix | 1 + pkgs/tools/typesetting/htmldoc/default.nix | 1 + pkgs/tools/typesetting/kramdown-asciidoc/default.nix | 1 + pkgs/tools/typesetting/mmark/default.nix | 1 + pkgs/tools/typesetting/pdf2djvu/default.nix | 1 + pkgs/tools/typesetting/pdfchain/default.nix | 1 + pkgs/tools/typesetting/pdfgrep/default.nix | 1 + pkgs/tools/typesetting/pdfsandwich/default.nix | 1 + pkgs/tools/typesetting/pdftk/default.nix | 1 + pkgs/tools/typesetting/pulldown-cmark/default.nix | 1 + pkgs/tools/typesetting/rfc-bibtex/default.nix | 1 + pkgs/tools/typesetting/satysfi/default.nix | 1 + pkgs/tools/typesetting/sile/default.nix | 1 + pkgs/tools/typesetting/sshlatex/default.nix | 1 + pkgs/tools/typesetting/tikzit/default.nix | 1 + pkgs/tools/typesetting/typstfmt/default.nix | 1 + pkgs/tools/typesetting/xmlroff/default.nix | 1 + pkgs/tools/video/dvgrab/default.nix | 1 + pkgs/tools/video/go2rtc/default.nix | 1 + pkgs/tools/video/gopro/default.nix | 1 + pkgs/tools/video/harvid/default.nix | 1 + pkgs/tools/video/lux/default.nix | 1 + pkgs/tools/video/play-with-mpv/default.nix | 1 + pkgs/tools/video/rav1e/default.nix | 1 + pkgs/tools/video/replay-sorcery/default.nix | 1 + pkgs/tools/video/swfmill/default.nix | 1 + pkgs/tools/video/vcsi/default.nix | 1 + pkgs/tools/video/vncrec/default.nix | 1 + pkgs/tools/video/wtwitch/default.nix | 1 + pkgs/tools/video/yamdi/default.nix | 1 + pkgs/tools/video/yaydl/default.nix | 1 + 224 files changed, 224 insertions(+) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index bb86014257b8..c23acbedafdf 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ ]; platforms = platforms.unix; badPlatforms = platforms.darwin; + mainProgram = "xidlehook"; }; } diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index d8d54dad392d..3b2bf517a404 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/beeb/awsbck"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ beeb ]; + mainProgram = "awsbck"; }; } diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index bf3afacb9496..8018a1b7cfdf 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; + mainProgram = "bdsync"; }; } diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/tools/backup/conserve/default.nix index 345bd06e23c0..8b6e7e072226 100644 --- a/pkgs/tools/backup/conserve/default.nix +++ b/pkgs/tools/backup/conserve/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sourcefrog/conserve"; license = licenses.gpl2Only; maintainers = with maintainers; [ happysalada ]; + mainProgram = "conserve"; }; } diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index df8ca279107e..a3677b984818 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; license = licenses.gpl2; + mainProgram = "bchunk"; }; } diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix index ee5d4fd8456f..243989d04948 100644 --- a/pkgs/tools/cd-dvd/bootiso/default.nix +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -56,5 +56,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ muscaln ]; platforms = platforms.all; + mainProgram = "bootiso"; }; } diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index decd4352ad45..fb57e2d7decb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -45,5 +45,6 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "brasero"; }; } diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index 1fe606e6acc2..4885b16aa065 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ yana ]; platforms = platforms.unix; + mainProgram = "ccd2iso"; }; } diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 26768747a46c..f6d0b4e1175f 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; + mainProgram = "cdi2iso"; }; } diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 795589a64ec2..6cb93b3e04be 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { homepage = "https://github.com/makefu/cue2pops-linux"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; + mainProgram = "cue2pops"; }; } diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 4375aebe2990..88703b28b582 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; + mainProgram = "dvd-vr"; }; } diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 55e0e51e5f44..abbda3512e5f 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "dvdisaster"; }; } diff --git a/pkgs/tools/cd-dvd/iat/default.nix b/pkgs/tools/cd-dvd/iat/default.nix index 083ff35acd78..0f7a1ad442a7 100644 --- a/pkgs/tools/cd-dvd/iat/default.nix +++ b/pkgs/tools/cd-dvd/iat/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation (finalAttr: { license = licenses.gpl2Plus; maintainers = with maintainers; [ hughobrien ]; platforms = platforms.linux; + mainProgram = "iat"; }; }) diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index f13a17e01f79..6f231430fa86 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -21,5 +21,6 @@ python3.pkgs.buildPythonApplication rec { description = "Verify size of ISO 9660 image against Volume Descriptor fields"; license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "isolyzer"; }; } diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 59e8bf8843a4..3fd116faea5b 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "lsdvd"; }; } diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index e737e38d1bd6..b5fcc557b4e1 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.oxij ]; + mainProgram = "mdf2iso"; }; } diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 596164f13ffa..575adecbd521 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "mkcue"; }; } diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index fdde54b596f1..8807466d05a6 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; platforms = platforms.all; + mainProgram = "nrg2iso"; }; } diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index 948c51428402..c24a5e7c15c7 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3; maintainers = [ maintainers.doronbehar ]; platforms = [ "x86_64-linux" ]; + mainProgram = "sacd"; }; }) diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 80e456d072ce..b0868c885edd 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ericdallo ]; homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; platforms = platforms.unix; + mainProgram = "srt-vtt"; }; } diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index 7a8a6569e533..ae1eff26568f 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://aluigi.org/mytoolz.htm#uif2iso"; license = lib.licenses.gpl1Plus; platforms = lib.platforms.linux; + mainProgram = "uif2iso"; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 88fab512b0b8..fb12968aa728 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; platforms = platforms.linux; + mainProgram = "unetbootin"; }; } diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index 2ebe9e5e0a35..dbe192e039bd 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bluescreen303 ]; platforms = lib.platforms.all; + mainProgram = "vobcopy"; }; } diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index d56cfdf86c8e..2847c68899fe 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.ttuegel ]; + mainProgram = "vobsub2srt"; }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 263478e4ba3c..60429f435ec6 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation (finalAttrs: { "libbrotlienc" ]; platforms = platforms.all; + mainProgram = "brotli"; }; }) diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 93b715f853cf..7d2af1c4898f 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; + mainProgram = "bsc"; }; } diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix index b68d3af1a844..f8cb155f272e 100644 --- a/pkgs/tools/compression/crabz/default.nix +++ b/pkgs/tools/compression/crabz/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "crabz"; }; } diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 0dd703035fa9..51c5d485cfa9 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; + mainProgram = "dejsonlz4"; }; } diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 2bfe975d033c..9890112171d8 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/dtrx-py/dtrx"; license = licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "dtrx"; }; } diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/tools/compression/efficient-compression-tool/default.nix index 6a9615601276..17c1bfcbcf2b 100644 --- a/pkgs/tools/compression/efficient-compression-tool/default.nix +++ b/pkgs/tools/compression/efficient-compression-tool/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.lunik1 ]; platforms = platforms.linux; + mainProgram = "ect"; }; } diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 4ba618556a70..6ee1c03cabce 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.xfix ]; platforms = platforms.linux; + mainProgram = "flips"; }; } diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/tools/compression/hacpack/default.nix index 34722d52ccfd..8d44660898cf 100644 --- a/pkgs/tools/compression/hacpack/default.nix +++ b/pkgs/tools/compression/hacpack/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.ivar ]; platforms = platforms.linux; + mainProgram = "hacpack"; }; } diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 2e6e7437fff2..11adbe3ced1b 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ ivar ]; platforms = platforms.unix; + mainProgram = "hactool"; }; } diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index 290e2dc9d8ca..49ef7354cbc9 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "heatshrink"; }; } diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix index 857de32ad886..950b12826b33 100644 --- a/pkgs/tools/compression/imagelol/default.nix +++ b/pkgs/tools/compression/imagelol/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; + mainProgram = "ImageLOL"; }; } diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix index 93ccc67f7d14..c35f738b2bde 100644 --- a/pkgs/tools/compression/lzbench/default.nix +++ b/pkgs/tools/compression/lzbench/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors"; license = licenses.free; platforms = platforms.all; + mainProgram = "lzbench"; }; } diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 13764971bb51..e5f104a9aef2 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.bsd3; maintainers = with maintainers; [ ]; + mainProgram = "lzfse"; }; } diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index b41b3c843da6..526e3f8c12fc 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ vlaci ]; platforms = lib.platforms.all; + mainProgram = "lzip"; }; } diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/tools/compression/lziprecover/default.nix index 38840a07092d..38051d8efbad 100644 --- a/pkgs/tools/compression/lziprecover/default.nix +++ b/pkgs/tools/compression/lziprecover/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ vlaci ]; platforms = lib.platforms.all; + mainProgram = "lziprecover"; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 8bf58d9cc356..64061647667a 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; + mainProgram = "lzop"; }; } diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 834b7698cf85..a9ab74bc7a59 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kira-bruneau pshirshov raskin ]; platforms = python3.meta.platforms; homepage = "https://gist.github.com/Tblue/62ff47bef7f894e92ed5"; + mainProgram = "mozlz4a"; }; } diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/tools/compression/nx2elf/default.nix index d4963487ada1..a068788dc1d8 100644 --- a/pkgs/tools/compression/nx2elf/default.nix +++ b/pkgs/tools/compression/nx2elf/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; # No license specified upstream platforms = [ "x86_64-linux" ]; # Should work on Darwin as well, but this is untested. aarch64-linux fails. maintainers = [ maintainers.ivar ]; + mainProgram = "nx2elf"; }; } diff --git a/pkgs/tools/compression/offzip/default.nix b/pkgs/tools/compression/offzip/default.nix index cc79d29a91d9..e756d4257264 100644 --- a/pkgs/tools/compression/offzip/default.nix +++ b/pkgs/tools/compression/offzip/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ r-burns ]; platforms = platforms.unix; + mainProgram = "offzip"; }; } diff --git a/pkgs/tools/compression/orz/default.nix b/pkgs/tools/compression/orz/default.nix index a0c9a4653ca5..b760b0132ef7 100644 --- a/pkgs/tools/compression/orz/default.nix +++ b/pkgs/tools/compression/orz/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/richox/orz"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "orz"; }; } diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index 2c645bf56ebf..b2e4bafc3af1 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda psibi ]; + mainProgram = "ouch"; }; } diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 03b984bb6435..44555cd6ddbc 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.matthewbauer ]; + mainProgram = "pbzx"; }; } diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index a8463f8abc4e..9eb1d6539cdf 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; + mainProgram = "pixz"; }; } diff --git a/pkgs/tools/compression/plzip/default.nix b/pkgs/tools/compression/plzip/default.nix index f8af3a26c8e1..310ae2074973 100644 --- a/pkgs/tools/compression/plzip/default.nix +++ b/pkgs/tools/compression/plzip/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ _360ied ]; + mainProgram = "plzip"; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 5f878f8c494f..24f59d25a91f 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "rzip"; }; } diff --git a/pkgs/tools/compression/unzrip/default.nix b/pkgs/tools/compression/unzrip/default.nix index 78b1278d8411..2e92fadd39a9 100644 --- a/pkgs/tools/compression/unzrip/default.nix +++ b/pkgs/tools/compression/unzrip/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/quininer/unzrip"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "unzrip"; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 09aab8258a81..9af509100e00 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "The Ultimate Packer for eXecutables"; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "upx"; }; } diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index d4baab17b91f..fa680ebcf51c 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ copumpkin ]; platforms = lib.platforms.all; + mainProgram = "xar"; }; } diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index fdb005007f1e..145f33a1cf8e 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.spease ]; # 64-bit only platforms = platforms.aarch64 ++ platforms.x86_64; + mainProgram = "zfp"; }; } diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/tools/graphics/aaphoto/default.nix index 6df3ed916613..57744eb6b8ec 100644 --- a/pkgs/tools/graphics/aaphoto/default.nix +++ b/pkgs/tools/graphics/aaphoto/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "aaphoto"; }; } diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 35de292a36c8..3d516f8ee113 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; + mainProgram = "adriconf"; }; } diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 0a08e0cd31ff..a58fcc4e8ec6 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.infinisil ]; platforms = platforms.unix; + mainProgram = "blockhash"; }; } diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index e393da508323..cc88bb088949 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found maintainers = with maintainers; [ romildo ]; + mainProgram = "blur_image"; }; } diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index f95c9b527c14..801b8f5a4862 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = lib.platforms.unix; + mainProgram = "briss"; }; } diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2f8b506c65bd..496255c57953 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "https://contextfreeart.org/"; license = licenses.gpl2Only; + mainProgram = "cfdg"; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 1a1b52502f7d..fa4cb75d174b 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; + mainProgram = "cuneiform"; }; } diff --git a/pkgs/tools/graphics/didder/default.nix b/pkgs/tools/graphics/didder/default.nix index e42a89c72d62..10e97e356daf 100644 --- a/pkgs/tools/graphics/didder/default.nix +++ b/pkgs/tools/graphics/didder/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { "An extensive, fast, and accurate command-line image dithering tool"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "didder"; }; } diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index ab1c6ff74ec3..c6823fbed369 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; + mainProgram = "ditaa"; }; } diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index cb865e51a9c5..9088a1110b7b 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dnglab/dnglab"; license = licenses.lgpl21Only; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "dnglab"; }; } diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 1a4161dd6206..fb3e0c19bf82 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ aespinosa ]; platforms = platforms.all; + mainProgram = "dpic"; }; } diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index ca9be631942a..ce8b2e0a4ff6 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "editres"; }; } diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index cdb1f75cb2c3..5952734e4582 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; platforms = platforms.all; + mainProgram = "epstool"; }; } diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 04c245dbd9a6..c2e5a7ec9a71 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -47,5 +47,6 @@ with python3Packages; buildPythonApplication { platforms = platforms.linux; maintainers = with maintainers; [ rasendubi ]; license = licenses.gpl3; + mainProgram = "escrotum"; }; } diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/tools/graphics/esshader/default.nix index 2e2e9ddbd65e..38bd4d1b7f0a 100644 --- a/pkgs/tools/graphics/esshader/default.nix +++ b/pkgs/tools/graphics/esshader/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; + mainProgram = "esshader"; }; } diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index f07f3d05541e..437ae29a2f50 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; license = licenses.lgpl21Plus; + mainProgram = "exif"; }; } diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index d62f077e06d7..d83501d26da6 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.rycee ]; + mainProgram = "facedetect"; }; } diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix index 5b46d5d2268d..659a661fded8 100644 --- a/pkgs/tools/graphics/fbv/default.nix +++ b/pkgs/tools/graphics/fbv/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "fbv"; }; } diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 827481af497c..6503a2887ab2 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -62,5 +62,6 @@ perlPackages.buildPerlPackage rec { license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ mnacamura ]; + mainProgram = "feedgnuplot"; }; } diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 7af5c6129f25..be8bc4eb6eab 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; + mainProgram = "fgallery"; }; } diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index 4e1b851735f0..2bd5abf00666 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.cpl10; platforms = platforms.linux; maintainers = [ maintainers.michelk ]; + mainProgram = "ggobi"; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f0fa45e59e4d..1d07707b57e4 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -88,5 +88,6 @@ in url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright"; }; maintainers = with maintainers; [ lovek323 ]; + mainProgram = "gnuplot"; }; } diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index d4f88a770a01..b73216a7875c 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -113,5 +113,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "goverlay"; }; } diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix index c504d6b27156..be6769d85e9a 100644 --- a/pkgs/tools/graphics/graph-cli/default.nix +++ b/pkgs/tools/graphics/graph-cli/default.nix @@ -28,5 +28,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/mcastorina/graph-cli/"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ leungbk ]; + mainProgram = "graph"; }; } diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 4f3b89eea917..668c7527e9e4 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -13,5 +13,6 @@ perlPackages.buildPerlPackage { license = licenses.gpl1Only; platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; + mainProgram = "graph-easy"; }; } diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index d98ee8733a04..0a54626419b5 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "gromit-mpx"; }; } diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index daca6f4344eb..2ca68376baa2 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = [ maintainers.marsam ]; platforms = platforms.all; + mainProgram = "guff"; }; } diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix index a74267846c1d..04aadf911e1e 100644 --- a/pkgs/tools/graphics/ibniz/default.nix +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; + mainProgram = "ibniz"; }; } diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 885638c28b8c..fe23866bda0b 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -25,5 +25,6 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; + mainProgram = "imgur-screenshot"; }; } diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 6c0e827a8488..e577c8be5a3d 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; homepage = "https://github.com/ram-on/imgurbash2"; + mainProgram = "imgurbash2"; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 35000088fea9..391780a4df35 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; + mainProgram = "jhead"; }; } diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix index 09d096e7b687..bdf2ce12e837 100644 --- a/pkgs/tools/graphics/jpegexiforient/default.nix +++ b/pkgs/tools/graphics/jpegexiforient/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; + mainProgram = "jpegexiforient"; }; } diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 6676e47ad492..7ddf02d16369 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.puffnfresh ]; platforms = lib.platforms.linux; + mainProgram = "leela"; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 8edde6e3f428..69084a8b5370 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "logstalgia"; }; } diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index dcf078654b82..7cbe2ee8626c 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -32,5 +32,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ kidonng ]; + mainProgram = "lsix"; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 7eb1d6cce818..a391a62ccb68 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; + mainProgram = "mscgen"; }; } diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index f74b720ea9ea..056b3ad8d065 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "NifSkope"; }; } diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 08ec885aed14..651baf547a9e 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ kovirobi ]; platforms = platforms.unix; + mainProgram = "nip2"; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 2f70dec897c0..bbabcaf6b800 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; + mainProgram = "optipng"; }; } diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 8f4793edb45d..23f9692597a3 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { description = "A multithreaded lossless PNG compression optimizer"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dywedir ]; + mainProgram = "oxipng"; }; } diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index c6d2eab45376..b68ba12ebfe9 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; + mainProgram = "pdf2svg"; }; } diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index c10412c976ce..90b8dde05f37 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ leenaars ]; platforms = platforms.unix; + mainProgram = "pdftag"; }; } diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix index d7e757e679bf..e969d90f9e05 100644 --- a/pkgs/tools/graphics/pdftoipe/default.nix +++ b/pkgs/tools/graphics/pdftoipe/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/otfried/ipe-tools/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ yrd ]; + mainProgram = "pdftoipe"; }; } diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 919b99327110..aa88b33aa381 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; + mainProgram = "perceptualdiff"; }; } diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index 561268b3f4b3..aa076d1b84e0 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = licenses.free; # custom license. See COPYING in the source repo. platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "piglit"; }; } diff --git a/pkgs/tools/graphics/pixel2svg/default.nix b/pkgs/tools/graphics/pixel2svg/default.nix index 8e5e86624900..1094cad56a33 100644 --- a/pkgs/tools/graphics/pixel2svg/default.nix +++ b/pkgs/tools/graphics/pixel2svg/default.nix @@ -16,5 +16,6 @@ python310Packages.buildPythonPackage rec { description = "Converts pixel art to SVG - pixel by pixel"; license = licenses.gpl3Plus; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "pixel2svg.py"; }; } diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index a90881dad224..d6ed7a6960fc 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.free; platforms = platforms.unix; maintainers = with maintainers; [ starcraft66 ]; + mainProgram = "pngcheck"; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 16c710ceb79f..8ce9965eae25 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = lib.licenses.free; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "pngcrush"; }; } diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/tools/graphics/pngloss/default.nix index eafd77054e40..7eca91f42d7d 100644 --- a/pkgs/tools/graphics/pngloss/default.nix +++ b/pkgs/tools/graphics/pngloss/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ _2gn ]; + mainProgram = "pngloss"; }; } diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 2b86f5e5e136..c80d4a65adc9 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = "http://advsys.net/ken/utils.htm"; platforms = lib.attrNames platforms; maintainers = [ lib.maintainers.sander ]; + mainProgram = "pngout"; }; } diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 7abf94f0a3e1..c480f99651dc 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; + mainProgram = "pngtoico"; }; } diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index f9a08543fb95..5e432a0d13c4 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { description = "Persistence of Vision Raytracer"; license = licenses.free; platforms = platforms.linux; + mainProgram = "povray"; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index df3d1c6a6938..3bd4c1a86fbc 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; + mainProgram = "pstoedit"; }; } diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 3f1404404005..ce623e25db0e 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; platforms = with platforms; unix; + mainProgram = "qrcode"; }; } diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 05cb130467a7..107a09a0ff92 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ tilcreator ]; platforms = platforms.all; + mainProgram = "realesrgan-ncnn-vulkan"; }; } diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index d3f8b74512a8..940e9db05419 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.dbohdan ]; platforms = lib.platforms.unix; + mainProgram = "s2png"; }; } diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index 71807b0db019..6b96e6ad5a92 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; broken = stdenv.isDarwin; + mainProgram = "sanjuuni"; }; } diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/tools/graphics/shot-scraper/default.nix index e083014f8a98..60aee277b60f 100644 --- a/pkgs/tools/graphics/shot-scraper/default.nix +++ b/pkgs/tools/graphics/shot-scraper/default.nix @@ -35,5 +35,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/simonw/shot-scraper/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick ]; + mainProgram = "shot-scraper"; }; } diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 30d676d4b2ef..d2d3c92982f6 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda lumi novenary ]; platforms = platforms.linux; + mainProgram = "shotgun"; }; } diff --git a/pkgs/tools/graphics/smartcrop/default.nix b/pkgs/tools/graphics/smartcrop/default.nix index d08c11fd3ebf..7660607a9a47 100644 --- a/pkgs/tools/graphics/smartcrop/default.nix +++ b/pkgs/tools/graphics/smartcrop/default.nix @@ -23,5 +23,6 @@ buildGoModule { homepage = "https://github.com/muesli/smartcrop"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "smartcrop"; }; } diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 8ebfd967828b..a8db32128a5e 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; + mainProgram = "sng"; }; } diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 642a49c39b84..cd7489be9aec 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "spirv-cross"; }; }) diff --git a/pkgs/tools/graphics/steghide/default.nix b/pkgs/tools/graphics/steghide/default.nix index 74011917d5fb..c62761bb2a21 100644 --- a/pkgs/tools/graphics/steghide/default.nix +++ b/pkgs/tools/graphics/steghide/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "steghide"; }; }) diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/tools/graphics/stegsolve/default.nix index 3f147ab0deca..a42b3c304b28 100644 --- a/pkgs/tools/graphics/stegsolve/default.nix +++ b/pkgs/tools/graphics/stegsolve/default.nix @@ -55,5 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; + mainProgram = "stegsolve"; }; }) diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 27ef2edd0fa8..d92fa5802d87 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/typst/svg2pdf/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ doronbehar figsoda ]; + mainProgram = "svg2pdf"; }; } diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index e5974d04e1ae..b09d8dee1ab0 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; + mainProgram = "svgbob"; }; } diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index c2938a69b57a..1ec42817456a 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; license = licenses.gpl2; maintainers = with maintainers; [ yuu ]; + mainProgram = "svgcleaner"; }; } diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix index a423ca9f30e2..81d9b5de3e36 100644 --- a/pkgs/tools/graphics/textplots/default.nix +++ b/pkgs/tools/graphics/textplots/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/loony-bean/textplots-rs"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "textplots"; }; } diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/tools/graphics/texture-synthesis/default.nix index d4f66357fadc..7122450587a7 100644 --- a/pkgs/tools/graphics/texture-synthesis/default.nix +++ b/pkgs/tools/graphics/texture-synthesis/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/embarkstudios/texture-synthesis"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "texture-synthesis"; }; } diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 58d4d0df9133..52941f7b96d7 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "twilight"; }; } diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index ade2dd7331bf..83c97376676a 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/atanunq/viu"; license = licenses.mit; maintainers = with maintainers; [ chuangzhu ]; + mainProgram = "viu"; }; } diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix index 0d54f695e9af..efe704ace293 100644 --- a/pkgs/tools/graphics/vkbasalt-cli/default.nix +++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix @@ -27,5 +27,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.com/TheEvilSkeleton/vkbasalt-cli"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = with maintainers; [ martfont ]; + mainProgram = "vkbasalt"; }; } diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/tools/graphics/vkdisplayinfo/default.nix index a48c4d1154fe..3a88b2e21147 100644 --- a/pkgs/tools/graphics/vkdisplayinfo/default.nix +++ b/pkgs/tools/graphics/vkdisplayinfo/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.boost; maintainers = [ maintainers.LunNova ]; + mainProgram = "vkdisplayinfo"; }; } diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/tools/graphics/vkmark/default.nix index 2923c786507e..d9c4f8a2024f 100644 --- a/pkgs/tools/graphics/vkmark/default.nix +++ b/pkgs/tools/graphics/vkmark/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ muscaln ]; + mainProgram = "vkmark"; }; } diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/tools/graphics/vulkan-helper/default.nix index 8db735c662e8..404ce734b5b3 100644 --- a/pkgs/tools/graphics/vulkan-helper/default.nix +++ b/pkgs/tools/graphics/vulkan-helper/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ aidalgol ]; platforms = platforms.linux; + mainProgram = "vulkan-helper"; }; } diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index f936ab83fb56..dd2c15c8fda4 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.xzfc ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "waifu2x-converter-cpp"; }; } diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index dabe14d895fa..50aa912522d9 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Soft/xcolor"; maintainers = with lib.maintainers; [ moni ]; license = licenses.mit; + mainProgram = "xcolor"; }; } diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index e8d761c6d842..5d5396aea273 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; + mainProgram = "xcur2png"; }; } diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 9d83ae71d333..dd428ae0c427 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = with maintainers; [ neonfuz ]; + mainProgram = "yaxg"; }; } diff --git a/pkgs/tools/llm/gorilla-cli/default.nix b/pkgs/tools/llm/gorilla-cli/default.nix index ff5e3468ef91..276793c2c8bc 100644 --- a/pkgs/tools/llm/gorilla-cli/default.nix +++ b/pkgs/tools/llm/gorilla-cli/default.nix @@ -34,5 +34,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/gorilla-llm/gorilla-cli"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; + mainProgram = "gorilla"; }; } diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index ea50c8779b3d..b87cb2b8ca2a 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { description = "Age based repository file encryption gitops tool"; license = licenses.asl20; maintainers = with maintainers; [ lesuisse ]; + mainProgram = "agebox"; }; } diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/tools/security/apkleaks/default.nix index 133601e4025f..29a0b17ccb32 100644 --- a/pkgs/tools/security/apkleaks/default.nix +++ b/pkgs/tools/security/apkleaks/default.nix @@ -33,5 +33,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/dwisiswant0/apkleaks"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "apkleaks"; }; } diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix index f948bccc5f43..503896885c13 100644 --- a/pkgs/tools/security/bao/default.nix +++ b/pkgs/tools/security/bao/default.nix @@ -20,5 +20,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/oconnor663/bao"; maintainers = with lib.maintainers; [ amarshall ]; license = with lib.licenses; [ cc0 asl20 ]; + mainProgram = "bao"; }; } diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 69736b4cc308..2ece9ee6e4c4 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://www.bettercap.org/"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ y0no ]; + mainProgram = "bettercap"; }; } diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index b08af06825e3..81d57513aac3 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux; + mainProgram = "ctmg"; }; } diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 1c404aa3f836..d9e740fcf644 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/CycloneDX/cyclonedx-gomod/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "cyclonedx-gomod"; }; } diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index 85fc3c55a3b0..b6d21b801efc 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/hahwul/dalfox/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "dalfox"; }; } diff --git a/pkgs/tools/security/dismember/default.nix b/pkgs/tools/security/dismember/default.nix index 2dffd8116b9c..cb2dd99b45c5 100644 --- a/pkgs/tools/security/dismember/default.nix +++ b/pkgs/tools/security/dismember/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/liamg/dismember"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "dismember"; }; } diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/tools/security/erosmb/default.nix index b7984feac513..f03e9a958de2 100644 --- a/pkgs/tools/security/erosmb/default.nix +++ b/pkgs/tools/security/erosmb/default.nix @@ -44,5 +44,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "erosmb"; }; } diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 7ff4c2e12458..18af1a0f1c48 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; platforms = platforms.unix; + mainProgram = "feroxbuster"; }; } diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/tools/security/fscan/default.nix index f334555ad1ec..cda7fb968d3d 100644 --- a/pkgs/tools/security/fscan/default.nix +++ b/pkgs/tools/security/fscan/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ Misaka13514 ]; platforms = with platforms; unix ++ windows; + mainProgram = "fscan"; }; } diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index bb607c1fbd32..9ce87ac3bdd1 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.makefu ]; + mainProgram = "gen-oath-safe"; }; } diff --git a/pkgs/tools/security/go-dork/default.nix b/pkgs/tools/security/go-dork/default.nix index 5e6c21d2397b..d5b999d96990 100644 --- a/pkgs/tools/security/go-dork/default.nix +++ b/pkgs/tools/security/go-dork/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/dwisiswant0/go-dork/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "go-dork"; }; } diff --git a/pkgs/tools/security/hash-identifier/default.nix b/pkgs/tools/security/hash-identifier/default.nix index 5e9b49dd73db..2f54d5e6904f 100644 --- a/pkgs/tools/security/hash-identifier/default.nix +++ b/pkgs/tools/security/hash-identifier/default.nix @@ -23,5 +23,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ ethancedwards8 ]; + mainProgram = "hash-identifier"; }; } diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index 3e51d300e9a3..c718ec0b5a0f 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; + mainProgram = "hcxdumptool"; }; } diff --git a/pkgs/tools/security/ic-keysmith/default.nix b/pkgs/tools/security/ic-keysmith/default.nix index c3fd58933a3b..30ca2a467576 100644 --- a/pkgs/tools/security/ic-keysmith/default.nix +++ b/pkgs/tools/security/ic-keysmith/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/dfinity/keysmith"; license = licenses.mit; maintainers = with maintainers; [ imalison ]; + mainProgram = "keysmith"; }; } diff --git a/pkgs/tools/security/jwt-hack/default.nix b/pkgs/tools/security/jwt-hack/default.nix index 351414b25eee..4922f67fe576 100644 --- a/pkgs/tools/security/jwt-hack/default.nix +++ b/pkgs/tools/security/jwt-hack/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/hahwul/jwt-hack"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "jwt-hack"; }; } diff --git a/pkgs/tools/security/kepler/default.nix b/pkgs/tools/security/kepler/default.nix index f4a229030f1d..e4d2fc914cf9 100644 --- a/pkgs/tools/security/kepler/default.nix +++ b/pkgs/tools/security/kepler/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Exein-io/kepler"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "kepler"; }; } diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index 05ee083f4d77..f80f5c70c98c 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -59,5 +59,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/aquasecurity/kube-hunter"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "kube-hunter"; }; } diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/tools/security/kubestroyer/default.nix index bbe0d9cad7a3..8e0922e4dfb0 100644 --- a/pkgs/tools/security/kubestroyer/default.nix +++ b/pkgs/tools/security/kubestroyer/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/Rolix44/Kubestroyer/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "kubestroyer"; }; } diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/tools/security/ldapnomnom/default.nix index 132ecf70591a..65e874d06691 100644 --- a/pkgs/tools/security/ldapnomnom/default.nix +++ b/pkgs/tools/security/ldapnomnom/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/lkarlslund/ldapnomnom/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ldapnomnom"; }; } diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index 0e63b0db2a53..eb3474293814 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kostassoid/lethe"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "lethe"; }; } diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index e1d78b79753e..c44733034b5a 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; + mainProgram = "modsec-rules-check"; }; } diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/tools/security/lmp/default.nix index 2b945478f3da..021b9d33d35a 100644 --- a/pkgs/tools/security/lmp/default.nix +++ b/pkgs/tools/security/lmp/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/0xInfection/LogMePwn"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "lmp"; }; } diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/tools/security/log4jcheck/default.nix index 291bf1ff96b4..1a7608fa73de 100644 --- a/pkgs/tools/security/log4jcheck/default.nix +++ b/pkgs/tools/security/log4jcheck/default.nix @@ -30,5 +30,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/NorthwaveSecurity/log4jcheck"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "log4jcheck"; }; } diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix index 76fc65728438..c29a32bea396 100644 --- a/pkgs/tools/security/log4shell-detector/default.nix +++ b/pkgs/tools/security/log4shell-detector/default.nix @@ -36,5 +36,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Neo23x0/log4shell-detector"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "log4shell-detector"; }; } diff --git a/pkgs/tools/security/logmap/default.nix b/pkgs/tools/security/logmap/default.nix index d6d4cb0f1a54..50f14bc33aff 100644 --- a/pkgs/tools/security/logmap/default.nix +++ b/pkgs/tools/security/logmap/default.nix @@ -30,5 +30,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/zhzyker/logmap"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "logmap"; }; } diff --git a/pkgs/tools/security/mantra/default.nix b/pkgs/tools/security/mantra/default.nix index 7453926a8bd3..348c0afc3251 100644 --- a/pkgs/tools/security/mantra/default.nix +++ b/pkgs/tools/security/mantra/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/MrEmpy/Mantra/releases/tag/v.${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "mantra"; }; } diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 2ab1babcafc7..aaa280f40e90 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; + mainProgram = "minisign"; }; } diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/tools/security/mongoaudit/default.nix index 3ba19256ec34..2f980be5163b 100644 --- a/pkgs/tools/security/mongoaudit/default.nix +++ b/pkgs/tools/security/mongoaudit/default.nix @@ -35,5 +35,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/stampery/mongoaudit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "mongoaudit"; }; } diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 187674596e1f..a92aa5f21041 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ arturcygan bosu c0bw3b ]; platforms = platforms.linux; + mainProgram = "nsjail"; }; } diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index fe8367ea57e4..eda2affaa262 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -26,5 +26,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/oath-toolkit/"; maintainers = with maintainers; [ schnusch ]; platforms = with platforms; linux ++ darwin; + mainProgram = "oathtool"; }; } diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/tools/security/onesixtyone/default.nix index 374d1322246b..1ff1b0266eaf 100644 --- a/pkgs/tools/security/onesixtyone/default.nix +++ b/pkgs/tools/security/onesixtyone/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.fishi0x01 ]; + mainProgram = "onesixtyone"; }; } diff --git a/pkgs/tools/security/parsero/default.nix b/pkgs/tools/security/parsero/default.nix index a8cd9c39eb13..2c3323f25e52 100644 --- a/pkgs/tools/security/parsero/default.nix +++ b/pkgs/tools/security/parsero/default.nix @@ -24,5 +24,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/behindthefirewalls/Parsero"; license = licenses.gpl2Only; maintainers = with maintainers; [ emilytrau fab ]; + mainProgram = "parsero"; }; } diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 33df7e7948ce..cfab2229efee 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -59,5 +59,6 @@ rustPlatform.buildRustPackage rec { gpl3Only # everything else ]; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "prs"; }; } diff --git a/pkgs/tools/security/routersploit/default.nix b/pkgs/tools/security/routersploit/default.nix index e147e8feac0b..3f656e8e4578 100644 --- a/pkgs/tools/security/routersploit/default.nix +++ b/pkgs/tools/security/routersploit/default.nix @@ -52,5 +52,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/threat9/routersploit"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "rsf"; }; } diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index 3a6fcfbf5325..972695ad565e 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/psibi/rucredstash"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; + mainProgram = "rucredstash"; }; } diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/tools/security/shellz/default.nix index f1b226c32137..e7d44bd21926 100644 --- a/pkgs/tools/security/shellz/default.nix +++ b/pkgs/tools/security/shellz/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/evilsocket/shellz"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "shellz"; }; } diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/tools/security/silenthound/default.nix index 92b651bc9a83..f2915c447675 100644 --- a/pkgs/tools/security/silenthound/default.nix +++ b/pkgs/tools/security/silenthound/default.nix @@ -39,5 +39,6 @@ python3.pkgs.buildPythonApplication rec { # Unknown license, https://github.com/layer8secure/SilentHound/issues/1 license = licenses.unfree; maintainers = with maintainers; [ fab ]; + mainProgram = "silenthound"; }; } diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix index b4c2b0efeec3..94e60a6a0084 100644 --- a/pkgs/tools/security/slowhttptest/default.nix +++ b/pkgs/tools/security/slowhttptest/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shekyan/slowhttptest"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "slowhttptest"; }; } diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/tools/security/smbscan/default.nix index f807704005e1..ea2a99b64bb0 100644 --- a/pkgs/tools/security/smbscan/default.nix +++ b/pkgs/tools/security/smbscan/default.nix @@ -37,5 +37,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/jeffhacks/smbscan"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "smbscan"; }; } diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/tools/security/stegseek/default.nix index f898b5eab0e6..dd2c10045754 100644 --- a/pkgs/tools/security/stegseek/default.nix +++ b/pkgs/tools/security/stegseek/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/RickdeJager/stegseek"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "stegseek"; }; } diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index bdd7d18923f1..b21498e009f1 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; + mainProgram = "stricat"; }; } diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix index 11a9b497fdf0..8c8ceee0fe74 100644 --- a/pkgs/tools/security/sx-go/default.nix +++ b/pkgs/tools/security/sx-go/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { homepage = "https://github.com/v-byte-cpu/sx"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "sx-go"; }; } diff --git a/pkgs/tools/security/tessen/default.nix b/pkgs/tools/security/tessen/default.nix index 1113134a1451..e8517dda9b4e 100644 --- a/pkgs/tools/security/tessen/default.nix +++ b/pkgs/tools/security/tessen/default.nix @@ -48,5 +48,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ monaaraj ]; + mainProgram = "tessen"; }; } diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index cb1148fdc1af..762c8312c1e6 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.agpl3Only; maintainers = with maintainers; [ msteen ivan ]; + mainProgram = "vaultwarden"; }; } diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index 3b49b496f62e..7c043c0d0a18 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/pkgs/tools/security/webanalyze/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "webanalyze"; }; } diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/tools/security/xcrawl3r/default.nix index c7b63c238be1..b714d555bafb 100644 --- a/pkgs/tools/security/xcrawl3r/default.nix +++ b/pkgs/tools/security/xcrawl3r/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/hueristiq/xcrawl3r/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "xcrawl3r"; }; } diff --git a/pkgs/tools/security/yatas/default.nix b/pkgs/tools/security/yatas/default.nix index 057f0c7b18b4..e351ea244f5d 100644 --- a/pkgs/tools/security/yatas/default.nix +++ b/pkgs/tools/security/yatas/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/padok-team/YATAS/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "yatas"; }; } diff --git a/pkgs/tools/security/yubihsm-connector/default.nix b/pkgs/tools/security/yubihsm-connector/default.nix index 8e56cc6a227e..ab2a29808380 100644 --- a/pkgs/tools/security/yubihsm-connector/default.nix +++ b/pkgs/tools/security/yubihsm-connector/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://developers.yubico.com/yubihsm-connector/"; maintainers = with maintainers; [ matthewcroughan ]; license = licenses.asl20; + mainProgram = "yubihsm-connector"; }; } diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index ac8683a36db3..91ce383f9a4d 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; + mainProgram = "asciidoctorj"; }; } diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/tools/typesetting/biber-ms/default.nix index f5c161fe2cbc..9cf2bbe014f1 100644 --- a/pkgs/tools/typesetting/biber-ms/default.nix +++ b/pkgs/tools/typesetting/biber-ms/default.nix @@ -50,5 +50,6 @@ perlPackages.buildPerlModule { license = biberSource.meta.license; platforms = platforms.unix; maintainers = [ maintainers.xworld21 ]; + mainProgram = "biber-ms"; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index b09a4b092f9b..08038c41377f 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -31,5 +31,6 @@ perlPackages.buildPerlModule { license = biberSource.meta.license; platforms = platforms.unix; maintainers = [ maintainers.ttuegel ]; + mainProgram = "biber"; }; } diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index d3d3be0f430f..beff04156190 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Pezmc/BibLatex-Check"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "biblatex-check"; }; } diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix index 267309e2e35b..69b3bc0ff239 100644 --- a/pkgs/tools/typesetting/coq2html/default.nix +++ b/pkgs/tools/typesetting/coq2html/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jwiegley siraben ]; platforms = platforms.unix; + mainProgram = "coq2html"; }; } diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index e6c8f80f9d25..9396d43b3962 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://0x2a.at/site/projects/djvu2pdf/"; license = lib.licenses.gpl1Only; platforms = lib.platforms.all; + mainProgram = "djvu2pdf"; }; } diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index e17acac3dd96..7608fb1228ed 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "docbook2odf"; }; } diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 0855c442deb9..254f29d27a78 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "fop"; }; } diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index 154781d1ef18..e7e4351a2088 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; + mainProgram = "git-latexdiff"; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index de76c4956d7a..3429df706d2f 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + mainProgram = "halibut"; }; } diff --git a/pkgs/tools/typesetting/hayagriva/default.nix b/pkgs/tools/typesetting/hayagriva/default.nix index 6723e1acecdb..0db1bf73c9cd 100644 --- a/pkgs/tools/typesetting/hayagriva/default.nix +++ b/pkgs/tools/typesetting/hayagriva/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/typst/hayagriva/releases/tag/v${version}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "hayagriva"; }; } diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 02a1a97010c5..da54f7c62970 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { generates corresponding HTML, PostScript, or PDF files with an optional table of contents. ''; + mainProgram = "htmldoc"; }; } diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index ebe57e3695f5..f3058156848e 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -30,6 +30,7 @@ let license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "kramdoc"; }; }; in diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 0cb100dde5e3..3e1c95ca0241 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/mmarkdown/mmark"; license = with lib.licenses; bsd2; maintainers = with lib.maintainers; [ yrashk ]; + mainProgram = "mmark"; }; } diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 9cbf61304b9a..09285cf2843b 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + mainProgram = "pdf2djvu"; }; } diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/tools/typesetting/pdfchain/default.nix index 256a8ebd6c53..6d772a6fea20 100644 --- a/pkgs/tools/typesetting/pdfchain/default.nix +++ b/pkgs/tools/typesetting/pdfchain/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.unix; + mainProgram = "pdfchain"; }; } diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 3b926a3a4fdc..44854592348b 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ qknight fpletz ]; platforms = with lib.platforms; unix; + mainProgram = "pdfgrep"; }; } diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 26037b05664d..377a7f7bf432 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -28,5 +28,6 @@ meta = with lib; { license = licenses.gpl2; maintainers = [ maintainers.rps ]; platforms = platforms.linux; + mainProgram = "pdfsandwich"; }; } diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index b11975d83c7f..27d95c00c01b 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -95,5 +95,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin averelld ]; platforms = platforms.unix; + mainProgram = "pdftk"; }; } diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/tools/typesetting/pulldown-cmark/default.nix index ee2b124b04ab..9a946eae732d 100644 --- a/pkgs/tools/typesetting/pulldown-cmark/default.nix +++ b/pkgs/tools/typesetting/pulldown-cmark/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/raphlinus/pulldown-cmark"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ CobaltCause ]; + mainProgram = "pulldown-cmark"; }; } diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/tools/typesetting/rfc-bibtex/default.nix index a748983222ef..d9bed6946697 100644 --- a/pkgs/tools/typesetting/rfc-bibtex/default.nix +++ b/pkgs/tools/typesetting/rfc-bibtex/default.nix @@ -29,5 +29,6 @@ with python3.pkgs; buildPythonApplication rec { description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; license = licenses.mit; maintainers = with maintainers; [ teto ]; + mainProgram = "rfcbibtex"; }; } diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 6d77faac76a9..7284e2cc2fdc 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -80,5 +80,6 @@ in license = licenses.lgpl3Only; maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; + mainProgram = "satysfi"; }; } diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 3c64e8872019..f2005f491a17 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -137,5 +137,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; maintainers = with maintainers; [ doronbehar alerque ]; license = licenses.mit; + mainProgram = "sile"; }; }) diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 8a5b4811d770..ed1252928bb3 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus platforms = lib.platforms.all; maintainers = [ maintainers.iblech ]; + mainProgram = "sshlatex"; }; } diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 2f6d169d0cb5..44c2fed0508a 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -29,5 +29,6 @@ mkDerivation { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech maintainers.mgttlinger ]; + mainProgram = "tikzit"; }; } diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index c6c054888f82..cec70394e4f9 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda geri1701 ]; + mainProgram = "typstfmt"; }; } diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index dd8adab9ee8a..f1e7e2c3243f 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { homepage = "http://xmlroff.org/"; platforms = platforms.unix; license = licenses.bsd3; + mainProgram = "xmlroff"; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index c5bb05853bf9..de5c5e906bf5 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.gnu ++ platforms.linux; + mainProgram = "dvgrab"; }; } diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 9b0f9bbe3f70..c6f8b66d1bcd 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { changelog = "https://github.com/AlexxIT/go2rtc/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + mainProgram = "go2rtc"; }; } diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index a1991772bf10..7f234ae5247a 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ jonringer ]; + mainProgram = "gopro"; }; } diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 655d1ba3874f..2860e5f22280 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mitchmindtree ]; + mainProgram = "harvid"; }; } diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index f6a4ea61f2dc..6d1e92af4aca 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/iawia002/lux/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ galaxy ]; + mainProgram = "lux"; }; } diff --git a/pkgs/tools/video/play-with-mpv/default.nix b/pkgs/tools/video/play-with-mpv/default.nix index 9047f9062462..16e645eb4455 100644 --- a/pkgs/tools/video/play-with-mpv/default.nix +++ b/pkgs/tools/video/play-with-mpv/default.nix @@ -57,5 +57,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/Thann/play-with-mpv"; license = licenses.mit; maintainers = with maintainers; [ dawidsowa ]; + mainProgram = "play-with-mpv"; }; } diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 146ff6072544..859e523dfa65 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -63,5 +63,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ ]; + mainProgram = "rav1e"; }; } diff --git a/pkgs/tools/video/replay-sorcery/default.nix b/pkgs/tools/video/replay-sorcery/default.nix index 8f362c3beb96..7323644cdefb 100644 --- a/pkgs/tools/video/replay-sorcery/default.nix +++ b/pkgs/tools/video/replay-sorcery/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "replay-sorcery"; }; } diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 28d7e0039edd..c93534bf1a20 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://swfmill.org"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; + mainProgram = "swfmill"; }; } diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix index bb3bc4c9856c..7db0fdd6962e 100644 --- a/pkgs/tools/video/vcsi/default.nix +++ b/pkgs/tools/video/vcsi/default.nix @@ -33,5 +33,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/amietn/vcsi"; license = licenses.mit; maintainers = with maintainers; [ dandellion zopieux ]; + mainProgram = "vcsi"; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 02608ac16b20..3b3391284f07 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { homepage = "http://ronja.twibright.com/utils/vncrec/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2; + mainProgram = "vncrec"; }; } diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index 9b2a9a7be031..0035e184540c 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; platforms = platforms.all; + mainProgram = "wtwitch"; }; } diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 6665637e6371..1bcfffb92903 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; + mainProgram = "yamdi"; }; } diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index ce7e4ef8eebf..7dea97bf649e 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { description = "Yet another youtube down loader"; license = licenses.cddl; maintainers = with maintainers; []; + mainProgram = "yaydl"; }; } From 0b59886c20b7a5ad4f8da5809b9f4ef93bff0d9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Nov 2023 04:14:26 +0000 Subject: [PATCH 29/32] global: 6.6.10 -> 6.6.11 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index ed0596fef8a0..e0e1ea0e606c 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.10"; + version = "6.6.11"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-LdHmqUXpPAE5D7lBpOaU9McbvXVp1kFJwE6Se79NzOg="; + hash = "sha256-BTMxn3jThguBZo366qUHkBVB5d2oz8MNUt/GzpSJ9eM="; }; nativeBuildInputs = [ libtool makeWrapper ]; From 6816f28c960c523e6a30f2ad4a1cc812251f5ffb Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Nov 2023 01:29:38 +0100 Subject: [PATCH 30/32] lib.fileset.fileFilter: Predicate attribute for file extension --- lib/fileset/default.nix | 9 ++++++++- lib/fileset/internal.nix | 5 ++++- lib/fileset/tests.sh | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 2cb361ec9ba1..1c3efaed43aa 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -573,6 +573,7 @@ in { ({ name :: String, type :: String, + hasExt :: String -> Bool, ... } -> Bool) -> Path @@ -583,7 +584,7 @@ in { fileFilter (file: file.name == "default.nix") ./. # Include all non-Nix files from the current directory - fileFilter (file: ! hasSuffix ".nix" file.name) ./. + fileFilter (file: ! file.hasExt "nix") ./. # Include all files that start with a "." in the current directory fileFilter (file: hasPrefix "." file.name) ./. @@ -603,6 +604,12 @@ in { - `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file. This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path. + - `hasExt` (String -> Bool): Whether the file has a certain file extension. + `hasExt ext` is true only if `hasSuffix ".${ext}" name`. + + This also means that e.g. for a file with name `.gitignore`, + `hasExt "gitignore"` is true. + Other attributes may be added in the future. */ predicate: diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 23d7b847204c..e2f4ba3ca3fe 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -52,6 +52,7 @@ let concatStringsSep substring stringLength + hasSuffix ; in @@ -796,9 +797,11 @@ rec { if predicate { inherit name type; + hasExt = ext: hasSuffix ".${ext}" name; + # To ensure forwards compatibility with more arguments being added in the future, # adding an attribute which can't be deconstructed :) - "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null; + "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file, hasExt }:`, use `{ name, file, hasExt, ... }:` instead." = null; } then type diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 06f92f297d88..046a6bc22e68 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -846,7 +846,7 @@ checkFileset 'fileFilter (file: abort "this is not needed") ./.' # The predicate must be able to handle extra attributes touch a -expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file \}:`, use `\{ name, file, ... \}:` instead."'\' +expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type, hasExt }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file, hasExt \}:`, use `\{ name, file, hasExt, ... \}:` instead."'\' rm -rf -- * # .name is the name, and it works correctly, even recursively @@ -894,6 +894,39 @@ expectEqual \ 'toSource { root = ./.; fileset = union ./d/a ./d/b; }' rm -rf -- * +# Check that .hasExt checks for the file extension +# The empty extension is the same as a file ending with a . +tree=( + [a]=0 + [a.]=1 + [a.b]=0 + [a.b.]=1 + [a.b.c]=0 +) +checkFileset 'fileFilter (file: file.hasExt "") ./.' + +# It can check for the last extension +tree=( + [a]=0 + [.a]=1 + [.a.]=0 + [.b.a]=1 + [.b.a.]=0 +) +checkFileset 'fileFilter (file: file.hasExt "a") ./.' + +# It can check for any extension +tree=( + [a.b.c.d]=1 +) +checkFileset 'fileFilter (file: + all file.hasExt [ + "b.c.d" + "c.d" + "d" + ] +) ./.' + # It's lazy tree=( [b]=1 From 38664f70d14626d7bc44a159a075ce5202824665 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 21 Nov 2023 06:17:01 +0100 Subject: [PATCH 31/32] rl-2311: Add release notes on lib NixOS releases are also `lib` releases :) The release notes were collected from looking at the `git diff` since 22.11. Since the NixOS and Nixpkgs manuals are rendered separately, I'm linking to the "unstable" link to make sure the links definitely work on the time of release. The "stable" link might take some time to become available --- .../manual/release-notes/rl-2311.section.md | 103 +++++++++++++++++- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 4b6335c00719..ff7950ddd99a 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -358,11 +358,6 @@ - `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally. -- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first. - If you depend on the lazier behavior, consider using [`lib.lists.foldl`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl) or [`builtins.foldl'`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-foldl') instead. - -- [`lib.attrsets.foldlAttrs`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.attrsets.foldlAttrs) now always evaluates the initial accumulator argument first. - - `rome` was removed because it is no longer maintained and is succeeded by `biome`. - The `prometheus-knot-exporter` was migrated to a version maintained by CZ.NIC. Various metric names have changed, so checking existing rules is recommended. @@ -606,3 +601,101 @@ The module update takes care of the new config syntax and the data itself (user - Docker now defaults to 24, as 20.10 is stopping to receive security updates and bug fixes after [December 10, 2023](https://github.com/moby/moby/discussions/45104). - There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2. + +## Nixpkgs library changes {#sec-release-23.11-lib} + +### Breaking changes {#sec-release-23.11-lib-breaking} + +- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl-prime) + now always evaluates the initial accumulator argument first. + If you depend on the lazier behavior, consider using [`lib.lists.foldl`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl) + or [`builtins.foldl'`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-foldl') instead. +- [`lib.attrsets.foldlAttrs`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.foldlAttrs) + now always evaluates the initial accumulator argument first. +- Now that the internal NixOS transition to Markdown documentation is complete, + `lib.options.literalDocBook` has been removed after deprecation in 22.11. +- `lib.types.string` is now fully deprecated and gives a warning when used. + +### Additions and improvements {#sec-release-23.11-lib-additions-improvements} + +- [`lib.fileset`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-fileset): + A new sub-library to select local files to use for sources, + designed to be easy and safe to use. + + This aims to be a replacement for `lib.sources`-based filtering. + To learn more about it, see [the tutorial](https://nix.dev/tutorials/file-sets). + +- [`lib.gvariant`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-gvariant): + A partial and basic implementation of GVariant formatted strings. + See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details. + + :::{.warning} + This API is not considered fully stable and it might therefore + change in backwards incompatible ways without prior notice. + ::: + +- [`lib.asserts`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-asserts): New function: + [`assertEachOneOf`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.asserts.assertEachOneOf). +- [`lib.attrsets`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-attrsets): New function: + [`attrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.attrsToList). +- [`lib.customisation`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-customisation): New function: + [`makeScopeWithSplicing'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.customisation.makeScopeWithSplicing-prime). +- [`lib.fixedPoints`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-fixedPoints): Documentation improvements for + [`lib.fixedPoints.fix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fixedPoints.fix). +- `lib.generators`: New functions: + [`mkDconfKeyValue`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.generators.mkDconfKeyValue), + [`toDconfINI`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.generators.toDconfINI). + + `lib.generators.toKeyValue` now supports the `indent` attribute in its first argument. +- [`lib.lists`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-lists): New functions: + [`findFirstIndex`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.findFirstIndex), + [`hasPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.hasPrefix), + [`removePrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.removePrefix), + [`commonPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.commonPrefix), + [`allUnique`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.allUnique). + + Documentation improvements for + [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl-prime). +- [`lib.meta`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-meta): Documentation of functions now gets rendered +- [`lib.path`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-path): New functions: + [`hasPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.hasPrefix), + [`removePrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.removePrefix), + [`splitRoot`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.splitRoot), + [`subpath.components`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.subpath.components). +- [`lib.strings`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-strings): New functions: + [`replicate`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.replicate), + [`cmakeOptionType`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeOptionType), + [`cmakeBool`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeBool), + [`cmakeFeature`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeFeature). +- [`lib.trivial`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-trivial): New function: + [`mirrorFunctionArgs`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.trivial.mirrorFunctionArgs). +- `lib.systems`: New function: + [`equals`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.systems.equals). +- [`lib.options`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-options): Improved documentation for + [`mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption). + + [`mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption). + now also supports the `pkgsText` attribute. + +Module system: +- Options in the `options` module argument now have the `declarationPositions` attribute + containing the position where the option was declared: + ``` + $ nix repl -f '' + [...] + nix-repl> :p options.environment.systemPackages.declarationPositions + [ { + column = 7; + file = "/nix/store/vm9zf9wvfd628cchj0hdij1g4hzjrcz9-source/nixos/modules/config/system-path.nix"; + line = 62; + } ] + ``` + Not to be confused with `definitionsWithLocations`, which is the same but for option _definitions_. +- Improved error message for option declarations missing `mkOption` + +### Deprecations {#sec-release-23.11-lib-deprecations} + +- `lib.meta.getExe pkg` (also available as `lib.getExe`) now gives a warning if `pkg.meta.mainProgram` is not set, + but it continues to default to the derivation name. + Nixpkgs accepts PRs that set `meta.mainProgram` on packages where it makes sense. + Use `lib.getExe' pkg "some-command"` to avoid the warning and/or select a different executable. From e03c9c3f1be4994c63b27ce60d41f13ebfeb3cad Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Fri, 24 Nov 2023 00:08:45 +0100 Subject: [PATCH 32/32] buildLuarocksPackage: save luarocks config as derivation (#269402) * buildLuarocksPackage: save luarocks config as derivation while debugging luarocks packages, it's exhausting to have to build them, look at what random folder they've been built to finally look for their config. With this you can run nix build lua51Packages.plenary-nvim.configFile -f . and infer what luarocks will do. * Update pkgs/development/interpreters/lua-5/build-luarocks-package.nix Co-authored-by: Marc Jakobi --------- Co-authored-by: Marc Jakobi --- .../interpreters/lua-5/build-luarocks-package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 3b49b60ca5d3..c388d0eef8c1 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -3,6 +3,7 @@ , lua , wrapLua , luarocks +, writeTextFile # Whether the derivation provides a lua module or not. , luarocksCheckHook @@ -83,7 +84,7 @@ let __structuredAttrs = true; env = { - LUAROCKS_CONFIG="$PWD/${luarocks_config}"; + LUAROCKS_CONFIG = self.configFile; } // attrs.env or {}; generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec"; @@ -111,6 +112,12 @@ let # explicitly inherit this for it to be available as a shell variable in the # builder rocksSubdir = "${self.pname}-${self.version}-rocks"; + + configFile = writeTextFile { + name = pname + "-luarocks-config.lua"; + text = self.luarocks_content; + }; + luarocks_content = let externalDepsGenerated = lib.filter (drv: !drv ? luaModule) (self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs); @@ -131,12 +138,6 @@ let configurePhase = '' runHook preConfigure - - cat > ${luarocks_config} <