From f0621abc3ad3d017c11bb4651fe5fa3a32553cf9 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sat, 20 Apr 2024 21:35:04 +0200 Subject: [PATCH 001/116] symphony: init at version 5.7.2 --- pkgs/by-name/sy/symphony/package.nix | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/sy/symphony/package.nix diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix new file mode 100644 index 000000000000..51d3316c7d17 --- /dev/null +++ b/pkgs/by-name/sy/symphony/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, coin-utils +, CoinMP +, gfortran +, libtool +, glpk +, osi +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "symphony"; + version = "5.7.2"; + + outputs = [ "out" ]; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "SYMPHONY"; + rev = "releases/${version}"; + sha256 = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; + }; + + nativeBuildInputs = [ libtool pkg-config glpk gfortran CoinMP osi coin-utils ]; + + meta = { + description = "SYMPHONY is an open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs) written in C with a number of unique features"; + homepage = "https://www.coin-or.org/SYMPHONY/index.htm"; + changelog = "https://github.com/coin-or/SYMPHONY/blob/${version}/CHANGELOG.md"; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.epl20; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +} From 5521c2380feddf6e1a01cedf4fd7140ea43e4d64 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sat, 20 Apr 2024 21:39:49 +0200 Subject: [PATCH 002/116] rPackages.Rsymphony: fixed build --- pkgs/development/r-modules/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ecc3d2d66b42..9d4d38002669 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -525,6 +525,7 @@ let Rbwa = [ pkgs.zlib.dev ]; trackViewer = [ pkgs.zlib.dev ]; themetagenomics = [ pkgs.zlib.dev ]; + Rsymphony = [ pkgs.pkg-config ]; NanoMethViz = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.pkg-config ]; HilbertVisGUI = with pkgs; [ pkg-config which ]; @@ -604,7 +605,7 @@ let mashr = [ pkgs.gsl ]; hadron = [ pkgs.gsl ]; AMOUNTAIN = [ pkgs.gsl ]; - Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; + Rsymphony = with pkgs; [ symphony doxygen graphviz subversion cgl clp]; tcltk2 = with pkgs; [ tcl tk ]; rswipl = with pkgs; [ ncurses.dev libxcrypt zlib.dev ]; tikzDevice = with pkgs; [ which texliveMedium ]; From e9ae1719ffb99be22ef8808bcf5ddc5f094159e8 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sat, 20 Apr 2024 22:26:18 +0200 Subject: [PATCH 003/116] maintainers: add b-rodrigues --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a26b96ce3ea0..c20838405f1c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2936,6 +2936,12 @@ fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; }]; }; + b-rodrigues = { + email = "bruno@brodrigues.co"; + github = "b-rodrigues"; + githubId = 2998834; + name = "Bruno Rodrigues"; + }; broke = { email = "broke@in-fucking.space"; github = "broke"; From ec81fe00d90995f7b14fe8823c894fe133015e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Wed, 3 Apr 2024 23:32:48 +0200 Subject: [PATCH 004/116] rPackages.Rhisat2: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixed for aarch-linux by @b-rodrigues Co-authored-by: Justin Bedő --- pkgs/development/r-modules/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ecc3d2d66b42..4714543de68a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -408,6 +408,7 @@ let RcppZiggurat = [ pkgs.gsl ]; reprex = [ pkgs.which ]; rgdal = with pkgs; [ proj.dev gdal ]; + Rhisat2 = [ pkgs.which pkgs.hostname ]; gdalcubes = [ pkgs.pkg-config ]; rgeos = [ pkgs.geos ]; Rglpk = [ pkgs.glpk ]; @@ -1218,6 +1219,17 @@ let ''; }); + # backported patch from 1.9 + Rhisat2= old.Rhisat2.overrideAttrs (attrs: { + patches = [ (pkgs.fetchpatch { + url = "https://github.com/fmicompbio/Rhisat2/commit/a0f27b018831b39f080f99e6db8a4b876fd56fc3.patch"; + sha256 = "sha256-FbYkP/WFmbfQmxArkHgushgVgY0XSypbK8Z5ivQK8k4="; + }) ]; + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -w"; + }; + }); + s2 = old.s2.overrideAttrs (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; From bee10360d9ac9abc16efb930dc775981aaf06f29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 18:27:57 +0000 Subject: [PATCH 005/116] git-machete: 3.25.0 -> 3.25.2 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 3c97c1e2024b..a6cf657d61d7 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.25.0"; + version = "3.25.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-tLEuSwM8X0+oQDB9fmj5OQsC7iA906EQZz3yvB6rXfk="; + hash = "sha256-uTbDrSR2Aqeq73PI0dghCkOQS7QPFb/I9Yrl3wIH9ZQ="; }; nativeBuildInputs = [ installShellFiles ]; From 4531cf76e4d5452ba1397c5d6a6ab811996d20fc Mon Sep 17 00:00:00 2001 From: Andrew Bruce Date: Thu, 25 Apr 2024 13:44:35 +0100 Subject: [PATCH 006/116] fetchHex: remove pname prefix Projects like mix2nix and my own project, deps_nix, are collecting a growing number of workarounds for packages that depend on the working directory of a build to have the same name as the package. See for example: https://github.com/ydlr/mix2nix/commit/da2ebc2c63b18c4967e176468e2717f4a07d6bf0 This change makes the pname of Hex packages equal the package name, so that such workarounds aren't necessary. --- pkgs/development/beam-modules/fetch-hex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 2d1fa623745a..a8241892ee0c 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation ({ - pname = "hex-source-${pkg}"; + pname = pkg; inherit version; dontBuild = true; dontConfigure = true; From c6e3a09efa65da5adec5c387c6622f9ea7495e26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Apr 2024 20:07:09 +0000 Subject: [PATCH 007/116] zxtune: 5056 -> 5060 --- pkgs/by-name/zx/zxtune/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index 436a24153366..7cf8e5043e88 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -41,7 +41,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5056"; + version = "5060"; outputs = [ "out" ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-zvLbgS8AFW4kkvTccGXcr1KEw3EH47XcHwzq6CKzusQ="; + hash = "sha256-mfObtcpBk9sltPckwjY/e5NwEILaxiPy/mbvmyQHeCo="; }; passthru.updateScript = nix-update-script { From b8347ba4326b63c5c24998b936fb48cfb74d54aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 00:24:54 +0200 Subject: [PATCH 008/116] rPackages.mitoClone2: fix build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e290bb2adf29..8d1a37530aab 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -561,6 +561,7 @@ let deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gdalraster = with pkgs; [ gdal proj.dev sqlite.dev ]; + mitoClone2 = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; From be54842dbb81fd21acb251044082004ae6353337 Mon Sep 17 00:00:00 2001 From: Benedikt Hiemer Date: Sat, 27 Apr 2024 22:07:42 +0200 Subject: [PATCH 009/116] vscode-extensions.42crunch.vscode-openapi: 4.25.1 -> 4.25.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9f4c3299386c..608bc07b3f0a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.1"; - sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + version = "4.25.3"; + sha256 = "1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; From fa51310df4a94dc83ad33e80922ac71aad4ce9ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 00:26:02 +0000 Subject: [PATCH 010/116] checkstyle: 10.15.0 -> 10.16.0 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index fc1dea1e5887..1565d7bdc546 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.15.0"; + version = "10.16.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-9p9JXjkkCHGCdNIs/Kh/I/JdU6xOVuc8Ff1WZERxiM4="; + sha256 = "sha256-0Hmg7WnLAGy9YOipW7Oe6KQDxRiRqZ5eI3bKQGU0aQQ="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 857ad2250ea724c8e3d87ab875503597418d74ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 10:15:47 +0000 Subject: [PATCH 011/116] ledger-live-desktop: 2.77.2 -> 2.79.1 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d49902c9d5ac..24ba95df584f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.77.2"; + version = "2.79.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-orIyfRs6TJgqGGLpl2tvoUtejsB0ni8xRK0SboP2LHw="; + hash = "sha256-zgs4uIK73CBp4hTbuO8LdcgvmUN3hYsnv61E+WGlpjg="; }; appimageContents = appimageTools.extractType2 { From 073b6290fb206705db8fa0c6c7346fbf5ebd4473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 07:08:48 +0000 Subject: [PATCH 012/116] dk: 2.1 -> 2.2 --- pkgs/applications/window-managers/dk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 25fcad2ba0b6..631e7b85d18e 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.1"; + version = "2.2"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-bUt4Se4Gu7CZEdv1/VpU92ncq2MBKXG7T4Wpa/2rocI="; + hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; }; buildInputs = [ From 38b92eab15f74d11c289f4801d28c3ca491fdbed Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Wed, 1 May 2024 14:40:28 +0700 Subject: [PATCH 013/116] add javaes to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b328568e5b6a..594daee4a3f9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8848,6 +8848,12 @@ githubId = 6789916; name = "Jason Odoom"; }; + javaes = { + email = "jan+dev@vanesdonk.de"; + github = "javaes"; + githubId = 1131529; + name = "Jan van Esdonk"; + }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; From 51046f85707b9d016088fd8cddc111a245b4a6cf Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 1 May 2024 12:10:57 +0000 Subject: [PATCH 014/116] yad: set `meta.mainProgram` --- pkgs/tools/misc/yad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 9bbb955f1a1b..05d34c63a447 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; + mainProgram = "yad"; maintainers = with maintainers; [ smironov ]; platforms = with platforms; linux; }; From ade937d2834f4746bc42efcb324769e553edc2f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 12:21:19 +0000 Subject: [PATCH 015/116] dune3d: 1.0.0 -> 1.1.0 --- pkgs/by-name/du/dune3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix index 797819354a1b..f3bae25f4feb 100644 --- a/pkgs/by-name/du/dune3d/package.nix +++ b/pkgs/by-name/du/dune3d/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "dune3d"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dune3d"; repo = "dune3d"; rev = "v${version}"; - hash = "sha256-y7jlqH1p2vCFTM14rFURxTkrWUT5hNkCseC3xB6bFFo="; + hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4="; }; nativeBuildInputs = [ From 9a238c98ddc3577fc2dae21a3841c46dd5c558f9 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 1 May 2024 12:02:52 +0000 Subject: [PATCH 016/116] mpvScripts: Replace `substituteInPlace`'s deprecated parameter --- pkgs/applications/video/mpv/scripts/convert.nix | 8 ++++---- pkgs/applications/video/mpv/scripts/cutter.nix | 4 ++-- pkgs/applications/video/mpv/scripts/mpris.nix | 2 +- .../video/mpv/scripts/mpv-playlistmanager.nix | 2 +- pkgs/applications/video/mpv/scripts/mpvacious.nix | 8 ++++---- pkgs/applications/video/mpv/scripts/sponsorblock.nix | 4 ++-- pkgs/applications/video/mpv/scripts/vr-reversal.nix | 2 +- .../video/mpv/scripts/webtorrent-mpv-hook.nix | 4 ++-- pkgs/applications/video/mpv/scripts/youtube-upnext.nix | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index d1fdc9c801bb..cd0e0f99a840 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -22,13 +22,13 @@ buildLua { postPatch = '' substituteInPlace convert_script.lua \ - --replace 'mkvpropedit_exe = "mkvpropedit"' \ + --replace-fail 'mkvpropedit_exe = "mkvpropedit"' \ 'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \ - --replace 'mkvmerge_exe = "mkvmerge"' \ + --replace-fail 'mkvmerge_exe = "mkvmerge"' \ 'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \ - --replace 'yad_exe = "yad"' \ + --replace-fail 'yad_exe = "yad"' \ 'yad_exe = "${yad}/bin/yad"' \ - --replace 'notify_send_exe = "notify-send"' \ + --replace-fail 'notify_send_exe = "notify-send"' \ 'notify_send_exe = "${libnotify}/bin/notify-send"' \ ''; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index ac2f518a9b5a..c58d0a81da63 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -16,13 +16,13 @@ buildLua { postPatch = '' substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' + --replace-fail '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' # needs to be ran separately so that we can replace everything, and not every single mention explicitly # original script places them in the scripts folder, just spawning unnecessary errors # i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" + --replace-fail '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" ''; passthru.scriptName = "cutter.lua"; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 338f0a8dd482..7caaf24a8c9d 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib mpv-unwrapped ffmpeg ]; postPatch = '' - substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + substituteInPlace Makefile --replace-fail 'PKG_CONFIG =' 'PKG_CONFIG ?=' ''; installFlags = [ "SCRIPTS_DIR=${placeholder "out"}/share/mpv/scripts" ]; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 44f09b8f21fe..1b9cdd4e6b42 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -14,7 +14,7 @@ buildLua rec { postPatch = '' substituteInPlace playlistmanager.lua \ - --replace 'youtube_dl_executable = "youtube-dl",' \ + --replace-fail 'youtube_dl_executable = "youtube-dl",' \ 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', ''; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index adac4d1d6069..8e85683b58b0 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -23,11 +23,11 @@ buildLua rec { postPatch = '' substituteInPlace utils/forvo.lua \ - --replace "'curl" "'${curl}/bin/curl" + --replace-fail "'curl" "'${curl}/bin/curl" substituteInPlace platform/nix.lua \ - --replace "'curl" "'${curl}/bin/curl" \ - --replace "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ - --replace "'xclip" "'${xclip}/bin/xclip" + --replace-fail "'curl" "'${curl}/bin/curl" \ + --replace-fail "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ + --replace-fail "'xclip" "'${xclip}/bin/xclip" ''; installPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 56ac2575ecde..d8757143926f 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -28,8 +28,8 @@ buildLua { postPatch = '' substituteInPlace sponsorblock.lua \ - --replace "python3" "${python3}/bin/python3" \ - --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" + --replace-fail "python3" "${python3}/bin/python3" \ + --replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; extraScripts = [ "sponsorblock_shared" ]; diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix index 9a7b335a6591..f68e4566f921 100644 --- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' - substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + substituteInPlace 360plugin.lua --replace-fail ":reset_rot=1:" ":" ''; installPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 10fe3d0cdce0..6deab112d3cb 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -15,9 +15,9 @@ buildNpmPackage rec { }; postPatch = '' - substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${nodejs}/bin/node'" # This executable is just for telling non-Nix users how to install - substituteInPlace package.json --replace '"bin": "build/bin.mjs",' "" + substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' "" rm -rf src/bin.ts ''; diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix index cdd7ea66a176..ec5da9161a03 100644 --- a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix +++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix @@ -13,7 +13,7 @@ buildLua rec { postPatch = '' substituteInPlace youtube-upnext.lua \ - --replace '"curl"' '"${lib.getExe curl}"' + --replace-fail '"curl"' '"${lib.getExe curl}"' ''; passthru.updateScript = unstableGitUpdater { }; From e6cf49e0298723f3aef7ca631627229ceb2378b4 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 1 May 2024 11:47:26 +0000 Subject: [PATCH 017/116] mpvScripts: Replace manual path construction with `lib` functions --- pkgs/applications/video/mpv/scripts/convert.nix | 8 ++++---- .../video/mpv/scripts/mpv-playlistmanager.nix | 2 +- pkgs/applications/video/mpv/scripts/mpvacious.nix | 8 ++++---- pkgs/applications/video/mpv/scripts/sponsorblock.nix | 2 +- pkgs/applications/video/mpv/scripts/thumbfast.nix | 2 +- .../video/mpv/scripts/webtorrent-mpv-hook.nix | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index cd0e0f99a840..2505be15da54 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -23,13 +23,13 @@ buildLua { postPatch = '' substituteInPlace convert_script.lua \ --replace-fail 'mkvpropedit_exe = "mkvpropedit"' \ - 'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \ + 'mkvpropedit_exe = "${lib.getExe' mkvtoolnix-cli "mkvpropedit"}"' \ --replace-fail 'mkvmerge_exe = "mkvmerge"' \ - 'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \ + 'mkvmerge_exe = "${lib.getExe' mkvtoolnix-cli "mkvmerge"}"' \ --replace-fail 'yad_exe = "yad"' \ - 'yad_exe = "${yad}/bin/yad"' \ + 'yad_exe = "${lib.getExe yad}"' \ --replace-fail 'notify_send_exe = "notify-send"' \ - 'notify_send_exe = "${libnotify}/bin/notify-send"' \ + 'notify_send_exe = "${lib.getExe libnotify}"' \ ''; scriptPath = "convert_script.lua"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 1b9cdd4e6b42..ae943eabaaec 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -15,7 +15,7 @@ buildLua rec { postPatch = '' substituteInPlace playlistmanager.lua \ --replace-fail 'youtube_dl_executable = "youtube-dl",' \ - 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', + 'youtube_dl_executable = "${lib.getExe yt-dlp}"', ''; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 8e85683b58b0..abbe2ba747db 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -23,11 +23,11 @@ buildLua rec { postPatch = '' substituteInPlace utils/forvo.lua \ - --replace-fail "'curl" "'${curl}/bin/curl" + --replace-fail "'curl" "'${lib.getExe curl}" substituteInPlace platform/nix.lua \ - --replace-fail "'curl" "'${curl}/bin/curl" \ - --replace-fail "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ - --replace-fail "'xclip" "'${xclip}/bin/xclip" + --replace-fail "'curl" "'${lib.getExe curl}" \ + --replace-fail "'wl-copy" "'${lib.getExe' wl-clipboard "wl-copy"}" \ + --replace-fail "'xclip" "'${lib.getExe xclip}" ''; installPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index d8757143926f..6caa10045c48 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -28,7 +28,7 @@ buildLua { postPatch = '' substituteInPlace sponsorblock.lua \ - --replace-fail "python3" "${python3}/bin/python3" \ + --replace-fail "python3" "${lib.getExe python3}" \ --replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index e30c62774b75..f5595f637b08 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -13,7 +13,7 @@ buildLua { passthru.updateScript = unstableGitUpdater {}; passthru.extraWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + "--prefix" "PATH" ":" (lib.makeBinPath [ mpv-unwrapped ]) ]; meta = { diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 6deab112d3cb..08967c3f2845 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -15,7 +15,7 @@ buildNpmPackage rec { }; postPatch = '' - substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'" # This executable is just for telling non-Nix users how to install substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' "" rm -rf src/bin.ts From 48eb357d3573f2281bf23460a02dac966e2aef2c Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 1 May 2024 14:02:06 +0000 Subject: [PATCH 018/116] mpvScripts.mpv-playlistmanager: Update `postPatch` Issue found by `--replace-fail` on `substituteInPlace`. --- pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index ae943eabaaec..ffc1e81eed5d 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -14,7 +14,7 @@ buildLua rec { postPatch = '' substituteInPlace playlistmanager.lua \ - --replace-fail 'youtube_dl_executable = "youtube-dl",' \ + --replace-fail 'youtube_dl_executable = "yt-dlp",' \ 'youtube_dl_executable = "${lib.getExe yt-dlp}"', ''; From 1d8baac36e798107dbb9b78e6486abd69c24e977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 21:35:06 +0000 Subject: [PATCH 019/116] vcpkg: 2024.03.25 -> 2024.04.26 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index befa6eab94c2..8e2753617ab9 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.03.25"; + version = "2024.04.26"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-HMK3sebq/9TuxHQ75+5UIMvN09cPWmq7TFBBwRY4X7o="; + hash = "sha256-Bu1sZhk8fqG5D7m/0QK3uI97stXx8l8y30lnffTr9h0="; }; installPhase = let From 2a19a6d842d7be2007b98dcd2e2bbc7e0cdc88d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 23:07:27 +0000 Subject: [PATCH 020/116] neo4j: 5.18.1 -> 5.19.0 --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index b43a4d17ff3a..24fd222b0a91 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.18.1"; + version = "5.19.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-jNi8SK1Z8k6ZSc9aa+L+PhAKyes0Tv6mFuoKspZBEIk="; + hash = "sha256-MPTrMVbr3XkFzid1FGyAK5sRBMCMMxsdbKEmqv9aANk="; }; nativeBuildInputs = [ makeWrapper ]; From 7666eadc69167dc1a49e7f1cf4cf3f237037db19 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 27 Apr 2024 00:43:13 -0400 Subject: [PATCH 021/116] nixos/promtail: check-syntax in preStart Co-authored-by: Pol Dellaiera --- nixos/modules/services/logging/promtail.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index a34bc07b6ab2..9eccd34cef23 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -41,6 +41,10 @@ in { wantedBy = [ "multi-user.target" ]; stopIfChanged = false; + preStart = '' + ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ''; + serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; From fd1c5e0e7de4b9cf6d2a743638cdcbd140cfad4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 12:05:44 +0200 Subject: [PATCH 022/116] python312Packages.pwkit: init at 1.2.0 Miscellaneous science/astronomy tools https://github.com/pkgw/pwkit/ --- .../python-modules/pwkit/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pwkit/default.nix diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix new file mode 100644 index 000000000000..f1fe2ad54556 --- /dev/null +++ b/pkgs/development/python-modules/pwkit/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pwkit"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "pkgw"; + repo = "pwkit"; + rev = "refs/tags/pwkit@${version}"; + hash = "sha256-bQno1SIbxAJ1TL068eshfFgAkRXFmbGu2GTbv1BRGU0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ numpy ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pwkit" ]; + + meta = with lib; { + description = "Miscellaneous science/astronomy tools"; + homepage = "https://github.com/pkgw/pwkit/"; + changelog = "https://github.com/pkgw/pwkit/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e928b337fae2..cbbe33b6c59b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10215,6 +10215,8 @@ self: super: with self; { pweave = callPackage ../development/python-modules/pweave { }; + pwkit = callPackage ../development/python-modules/pwkit { }; + pwlf = callPackage ../development/python-modules/pwlf { }; pwntools = callPackage ../development/python-modules/pwntools { From 05a9efb7d733ee49db224790e4458f5490cc4792 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Wed, 1 May 2024 14:41:54 +0700 Subject: [PATCH 023/116] slumber: init at 1.0.1 --- pkgs/by-name/sl/slumber/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/sl/slumber/package.nix diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix new file mode 100644 index 000000000000..4a7979e29d58 --- /dev/null +++ b/pkgs/by-name/sl/slumber/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform }: +rustPlatform.buildRustPackage rec { + pname = "slumber"; + version = "1.0.1"; + + # This release tarball includes source code for the tree-sitter grammars, + # which is not ordinarily part of the repository. + src = fetchFromGitHub { + owner = "LucasPickering"; + repo = "slumber"; + rev = "v${version}"; + hash = "sha256-FXw3hVVY/f49leo9t+z52+Ti9XGk6UJDtd0VpQDQb/o="; + }; + + cargoHash = "sha256-odLFfq3qjCQUNDauFtlOaKrsYVspAIxAc/pRSEZyIwo="; + + meta = with lib; { + description = "Terminal-based HTTP/REST client"; + homepage = "https://slumber.lucaspickering.me"; + license = licenses.mit; + mainProgram = "slumber"; + maintainers = with maintainers; [ javaes ]; + broken = stdenv.isDarwin || stdenv.isAarch64; + }; +} From eed14146a5731c81808b61f856fe986ed24f1218 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 12:13:34 +0200 Subject: [PATCH 024/116] python312Packages.drawsvg: init at 2.3.0 Programmatically generate SVG (vector) images, animations, and interactive Jupyter widgets https://github.com/cduck/drawsvg --- .../python-modules/drawsvg/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/drawsvg/default.nix diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix new file mode 100644 index 000000000000..84fd89373ffc --- /dev/null +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + numpy, + imageio, + cairosvg, + imageio-ffmpeg, + pwkit, +}: + +buildPythonPackage rec { + pname = "drawsvg"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "cduck"; + repo = "drawsvg"; + rev = "refs/tags/${version}"; + hash = "sha256-LoA5yYeHO4GqS3dk7EMg1ZC42HBgmM6rSfigWMc4yUQ="; + }; + + build-system = [ setuptools ]; + + passthru.optional-dependencies = { + all = [ + numpy + imageio + cairosvg + imageio-ffmpeg + pwkit + ]; + raster = [ + numpy + imageio + cairosvg + imageio-ffmpeg + ]; + color = [ + pwkit + numpy + ]; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "drawsvg" ]; + + meta = with lib; { + description = "Programmatically generate SVG (vector) images, animations, and interactive Jupyter widgets"; + homepage = "https://github.com/cduck/drawsvg"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cbbe33b6c59b..1330a9fd05d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3454,6 +3454,8 @@ self: super: with self; { drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + drawsvg = callPackage ../development/python-modules/drawsvg { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; From 5cde2e93861324ccb261d82b2b717aede51bcfee Mon Sep 17 00:00:00 2001 From: John Garcia Date: Thu, 2 May 2024 11:41:46 +0100 Subject: [PATCH 025/116] fastfetch: 2.10.2 -> 2.11.0 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 9bb0fd4919ea..ae59ceface07 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -46,13 +46,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-1ok2HR9RapS+MF8zuNLhzMZMz0F2AQsKsxNqCT7QF/8="; + hash = "sha256-/j0dRnApP5PQV4qVkqM6WlFdSZHlBTheaoWXSd2YP5k="; }; outputs = [ "out" "man" ]; From 45d1b8f9f8d38c27266f84776e664e1fb0306c28 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 2 May 2024 14:03:52 +0300 Subject: [PATCH 026/116] rust-analyzer-unwrapped: 2024-04-08 -> 2024-04-29 Diff: https://github.com/rust-lang/rust-analyzer/compare/2024-04-08...2024-04-29 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f662c89f5969..14d398002382 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-04-08"; - cargoSha256 = "sha256-lVVHp8kbi3bnDQ0lCZugGSNznJduXPftGDq7ByxXWgc="; + version = "2024-04-29"; + cargoSha256 = "sha256-OvkaBWkq5c3amvDZj51iOXUrfevBMhbCaKGHmrA/23E="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us="; + sha256 = "sha256-zttBYGaoHpZfqWHQ8OI5f9OkGHCHb8tDBMySwsYNa2U="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From 1f17183869f4ab9fe8ba3a6b5c2291aec3b3c56f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 12:51:59 +0000 Subject: [PATCH 027/116] doomretro: 5.3 -> 5.4 --- pkgs/games/doom-ports/doomretro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index 127220603bdf..4b016d78582a 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-LCCBtsDEyjzsPS5ADPzsup714p84MO65FQDVjAHhSts="; + hash = "sha256-IOv58BmJvJtO7MMbrvf52MPYI0zjmPuRK7mcTwmBEY0="; }; nativeBuildInputs = [ From 9c5382db8d742f62908f5e3a6b02b6265e3bd480 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 14:29:27 +0200 Subject: [PATCH 028/116] python312Packages.stix2-patterns: refactor --- .../python-modules/stix2-patterns/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index 3817a96fe99c..029a53c4619b 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -2,10 +2,9 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , setuptools -, pytestCheckHook -, wheel , six }: @@ -25,15 +24,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" + --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" ''; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ antlr4-python3-runtime six ]; From 33369e894c0f762972627aa7af78046d2b7edcfb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 14:30:08 +0200 Subject: [PATCH 029/116] python312Packages.stix2-patterns: format with nixfmt --- .../python-modules/stix2-patterns/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index 029a53c4619b..f1c48fd7e14b 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -1,11 +1,12 @@ -{ lib -, antlr4-python3-runtime -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, six +{ + lib, + antlr4-python3-runtime, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { @@ -27,22 +28,16 @@ buildPythonPackage rec { --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ antlr4-python3-runtime six ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "stix2patterns" - ]; + pythonImportsCheck = [ "stix2patterns" ]; disabledTestPaths = [ # Exception: Could not deserialize ATN with version (expected 4) From 869e3fb51a864e4780fc0531614edbdd0a404204 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 12:59:25 +0000 Subject: [PATCH 030/116] guile-lib: 0.2.8 -> 0.2.8.1 --- pkgs/development/guile-modules/guile-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index ca9989bfcd18..1262cd73f670 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "guile-lib"; - version = "0.2.8"; + version = "0.2.8.1"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ZOkC7gy7LO4e+4Fow7+e1J4LMqiiPbhj6DvxSBfXZ9k="; + hash = "sha256-E3TC2Dnmoz0ZDNHavZx/h3U/g4T1W4ZvPhQhVcIrSbE="; }; strictDeps = true; From 494e5dc391d2da48be99077606b8c6b4dc128e2e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 2 May 2024 11:47:05 -0300 Subject: [PATCH 031/116] vscode-extensions."42crunch".vscode-openapi: convert sha256 into hash --- pkgs/applications/editors/vscode/extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 608bc07b3f0a..2536c0452409 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -91,7 +91,7 @@ let publisher = "42Crunch"; name = "vscode-openapi"; version = "4.25.3"; - sha256 = "1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; + hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; From 4e7f87267159d4861d517834bd7e851282317032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 16:57:12 +0200 Subject: [PATCH 032/116] galah: init at 0-unstable-2024-04-28 LLM-powered web honeypot using the OpenAI API https://github.com/0x4D31/galah --- pkgs/by-name/ga/galah/package.nix | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ga/galah/package.nix diff --git a/pkgs/by-name/ga/galah/package.nix b/pkgs/by-name/ga/galah/package.nix new file mode 100644 index 000000000000..d384aa76796f --- /dev/null +++ b/pkgs/by-name/ga/galah/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "galah"; + version = "0-unstable-2024-04-28"; + + src = fetchFromGitHub { + owner = "0x4D31"; + repo = "galah"; + rev = "69346522df6e5849ca808546d40f1ee0a70f56d8"; + hash = "sha256-9Muo08AYtpMmLvpWl2W/WbvyFl8h364BzDbmcJteIAg="; + }; + + vendorHash = "sha256-+I4K5T6fQcS7KJexFGxpjq5QUX9VnopK8i81veeP6Cw="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "LLM-powered web honeypot using the OpenAI API"; + homepage = "https://github.com/0x4D31/galah"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "galah"; + }; +} From c06b17f1b12a90015696dd6b8eda4c08bcc7b076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 15:05:06 +0000 Subject: [PATCH 033/116] typos-lsp: 0.1.17 -> 0.1.18 --- pkgs/by-name/ty/typos-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 821c169cad7d..9de7fca6b0bf 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "typos-lsp"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-Q/V9WabxtsUQ69r7qHzslko8anWyuB3VqVRQJ6gl9O8="; + hash = "sha256-6ELn2Q7pAUgnwe8+vAUbuRjaKFWvbGZ1SMfXQ1qKp5c="; }; - cargoHash = "sha256-Rus79FpYBgz1CPK4n805Au0ncom8rhD3zD82a2DyR3k="; + cargoHash = "sha256-UDID+dI8ETP084WR482uWli2++bI4mRiMvpFpWUlvZE="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 From d59488808a9803f2552626248d16e943dc20ccb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 20:01:14 +0200 Subject: [PATCH 034/116] xnlinkfinder: init at 6.0 Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target https://github.com/xnl-h4ck3r/xnLinkFinder --- pkgs/by-name/xn/xnlinkfinder/package.nix | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/xn/xnlinkfinder/package.nix diff --git a/pkgs/by-name/xn/xnlinkfinder/package.nix b/pkgs/by-name/xn/xnlinkfinder/package.nix new file mode 100644 index 000000000000..85429a64ec70 --- /dev/null +++ b/pkgs/by-name/xn/xnlinkfinder/package.nix @@ -0,0 +1,55 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "xnlinkfinder"; + version = "6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xnl-h4ck3r"; + repo = "xnLinkFinder"; + rev = "refs/tags/v${version}"; + hash = "sha256-UMHMWHLJOhEeR+vO4YE3aNzdsvMAXPpQHQgdFf1QeMY="; + }; + + patches = [ + # Clean-up setup.py + (fetchpatch { + name = "clean-up.patch"; + url = "https://github.com/xnl-h4ck3r/xnLinkFinder/commit/8ef5e2ecf4c627b389cb7bb526f10fffe84acc13.patch"; + hash = "sha256-14j3dFgehhPdqAe4e9FsB8sD66hKnNaPmDJRV1mQTDo="; + }) + ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + html5lib + lxml + psutil + pyyaml + requests + termcolor + urllib3 + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ "xnLinkFinder" ]; + + meta = with lib; { + description = "Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target"; + homepage = "https://github.com/xnl-h4ck3r/xnLinkFinder"; + changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "xnLinkFinder"; + }; +} From 08cb4f9d351872d3f8b9132ad7e597f9252c136f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 18:05:04 +0000 Subject: [PATCH 035/116] python311Packages.yamale: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/yamale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 96d69aaddea7..b02cec6577cf 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "23andMe"; repo = "yamale"; rev = "refs/tags/${version}"; - hash = "sha256-UTtase1b8Zjaixhp/g0tLtT6QZS4cyaSHcFz+h9Qoos="; + hash = "sha256-iiiQAZ050FintRSV3l2zfikTNmphhJgrn+4tUHORiSk="; }; build-system = [ setuptools ]; From 024308f1cd636e47bb4f300adf3c4ebb95853d9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 20:10:30 +0200 Subject: [PATCH 036/116] cent: init at 1.3.3 Tool to handle Nuclei community templates https://github.com/xm1k3/cent --- pkgs/by-name/ce/cent/package.nix | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ce/cent/package.nix diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix new file mode 100644 index 000000000000..8cc910d71c79 --- /dev/null +++ b/pkgs/by-name/ce/cent/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cent"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "xm1k3"; + repo = "cent"; + rev = "refs/tags/v${version}"; + hash = "sha256-E3gAtrgWVucV3cD31ntgtdTDkhmqJHOiFwaUdVJj0jQ="; + }; + + vendorHash = "sha256-LvI9FJFXBnEXNsX3qp2Sl58ccIJtYDGSEtNUwNW/Pp0="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to handle Nuclei community templates"; + homepage = "https://github.com/xm1k3/cent"; + changelog = "https://github.com/xm1k3/cent/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + mainProgram = "cent"; + }; +} From f084a3502de9e8c504906db1f63d83351c2eb979 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 18:34:05 +0000 Subject: [PATCH 037/116] open-policy-agent: 0.64.0 -> 0.64.1 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 243810ef77a0..146a2e0c3bbe 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.64.0"; + version = "0.64.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-BguL9ph7lNzOJs9s2l7jt/SjmD5Wy0MPrwIiEXL/Ip4="; + hash = "sha256-IIW6AXv5x+uQGCZulPPB7IhRlCq7Ww76qUhMHg3Fx7g="; }; vendorHash = null; From 31b789ce8544f66b1cdce6633648cfce28dd0a7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 18:46:24 +0000 Subject: [PATCH 038/116] discord: 0.0.51 -> 0.0.52 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b4e0aca9cc58..15ff9c7a5055 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.51"; + stable = "0.0.52"; ptb = "0.0.81"; canary = "0.0.369"; development = "0.0.17"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk="; + hash = "sha256-5cJzedEuxdGizgUenB+DjFf+MwYk8uTH4tjiWzur+q8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From ce3f5867754f15cafe53142b61f4335790036146 Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Fri, 26 Apr 2024 14:35:31 +0300 Subject: [PATCH 039/116] pkgs/tools: remove licenses.gpl2 --- pkgs/tools/X11/dispad/default.nix | 2 +- pkgs/tools/X11/imwheel/default.nix | 2 +- pkgs/tools/X11/nitrogen/default.nix | 2 +- pkgs/tools/X11/nx-libs/default.nix | 2 +- pkgs/tools/X11/sbs/default.nix | 2 +- pkgs/tools/X11/wmctrl/default.nix | 2 +- pkgs/tools/X11/x11vnc/default.nix | 2 +- pkgs/tools/X11/x2vnc/default.nix | 2 +- pkgs/tools/X11/xcalib/default.nix | 2 +- pkgs/tools/X11/xdg-utils/default.nix | 2 +- pkgs/tools/X11/xmacro/default.nix | 2 +- pkgs/tools/X11/xmousepasteblock/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/X11/xpra/libfakeXinerama.nix | 2 +- pkgs/tools/X11/xtrace/default.nix | 2 +- pkgs/tools/admin/analog/default.nix | 2 +- pkgs/tools/admin/sec/default.nix | 2 +- pkgs/tools/archivers/rpmextract/default.nix | 2 +- pkgs/tools/archivers/unp/default.nix | 2 +- pkgs/tools/archivers/xarchive/default.nix | 2 +- pkgs/tools/audio/alsaequal/default.nix | 2 +- pkgs/tools/audio/bpm-tools/default.nix | 2 +- pkgs/tools/audio/ezstream/default.nix | 2 +- pkgs/tools/audio/mp3cat/default.nix | 2 +- pkgs/tools/audio/pa-applet/default.nix | 2 +- pkgs/tools/audio/trx/default.nix | 2 +- pkgs/tools/audio/vgmtools/default.nix | 2 +- pkgs/tools/audio/volctl/default.nix | 2 +- pkgs/tools/backup/bakelite/default.nix | 2 +- pkgs/tools/backup/bdsync/default.nix | 2 +- pkgs/tools/backup/chunksync/default.nix | 2 +- pkgs/tools/backup/duply/default.nix | 2 +- pkgs/tools/backup/mt-st/default.nix | 2 +- pkgs/tools/backup/mtx/default.nix | 2 +- pkgs/tools/backup/partimage/default.nix | 2 +- pkgs/tools/backup/stenc/default.nix | 2 +- pkgs/tools/bluetooth/obex-data-server/default.nix | 2 +- pkgs/tools/cd-dvd/bchunk/default.nix | 2 +- pkgs/tools/cd-dvd/ccd2iso/default.nix | 2 +- pkgs/tools/cd-dvd/cdi2iso/default.nix | 2 +- pkgs/tools/cd-dvd/cdimgtools/default.nix | 2 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 2 +- pkgs/tools/cd-dvd/cdrkit/default.nix | 2 +- pkgs/tools/cd-dvd/cdrtools/default.nix | 2 +- pkgs/tools/cd-dvd/cuetools/default.nix | 2 +- pkgs/tools/cd-dvd/dvd+rw-tools/default.nix | 2 +- pkgs/tools/cd-dvd/dvd-vr/default.nix | 2 +- pkgs/tools/cd-dvd/isomd5sum/default.nix | 2 +- pkgs/tools/cd-dvd/lsdvd/default.nix | 2 +- pkgs/tools/cd-dvd/mdf2iso/default.nix | 2 +- pkgs/tools/cd-dvd/nrg2iso/default.nix | 2 +- pkgs/tools/cd-dvd/vobcopy/default.nix | 2 +- pkgs/tools/compression/lzop/default.nix | 2 +- pkgs/tools/filesystems/afpfs-ng/default.nix | 2 +- pkgs/tools/filesystems/archivemount/default.nix | 2 +- pkgs/tools/filesystems/bashmount/default.nix | 2 +- pkgs/tools/filesystems/bcache-tools/default.nix | 2 +- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 +- pkgs/tools/filesystems/ceph/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/ciopfs/default.nix | 2 +- pkgs/tools/filesystems/dislocker/default.nix | 2 +- pkgs/tools/filesystems/djmount/default.nix | 2 +- pkgs/tools/filesystems/duperemove/default.nix | 2 +- pkgs/tools/filesystems/e2tools/default.nix | 2 +- pkgs/tools/filesystems/ext4magic/default.nix | 2 +- pkgs/tools/filesystems/extundelete/default.nix | 2 +- pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +- pkgs/tools/filesystems/fuseiso/default.nix | 2 +- pkgs/tools/filesystems/genext2fs/default.nix | 2 +- pkgs/tools/filesystems/genromfs/default.nix | 2 +- pkgs/tools/filesystems/grive2/default.nix | 2 +- pkgs/tools/filesystems/moosefs/default.nix | 2 +- pkgs/tools/filesystems/nilfs-utils/default.nix | 2 +- pkgs/tools/filesystems/orangefs/default.nix | 2 +- pkgs/tools/filesystems/reiser4progs/default.nix | 2 +- pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 +- pkgs/tools/filesystems/smbnetfs/default.nix | 2 +- pkgs/tools/filesystems/u3-tool/default.nix | 2 +- pkgs/tools/filesystems/vmfs-tools/default.nix | 2 +- pkgs/tools/filesystems/wiimms-iso-tools/default.nix | 2 +- pkgs/tools/filesystems/zerofree/default.nix | 2 +- pkgs/tools/games/slipstream/default.nix | 2 +- pkgs/tools/graphics/dynamic-wallpaper/default.nix | 2 +- pkgs/tools/graphics/enblend-enfuse/default.nix | 2 +- pkgs/tools/graphics/epstool/default.nix | 2 +- pkgs/tools/graphics/fgallery/default.nix | 2 +- pkgs/tools/graphics/gifsicle/default.nix | 2 +- pkgs/tools/graphics/ifm/default.nix | 2 +- pkgs/tools/graphics/mscgen/default.nix | 2 +- pkgs/tools/graphics/optar/default.nix | 2 +- pkgs/tools/graphics/pdf2svg/default.nix | 2 +- pkgs/tools/graphics/pstoedit/default.nix | 2 +- pkgs/tools/graphics/s2png/default.nix | 2 +- pkgs/tools/graphics/svgcleaner/default.nix | 2 +- pkgs/tools/graphics/unpaper/default.nix | 2 +- pkgs/tools/graphics/xcftools/default.nix | 2 +- pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix | 2 +- pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix | 2 +- pkgs/tools/inputmethods/nabi/default.nix | 2 +- pkgs/tools/misc/aescrypt/default.nix | 2 +- pkgs/tools/misc/apparix/default.nix | 2 +- pkgs/tools/misc/bfr/default.nix | 2 +- pkgs/tools/misc/bibtex2html/default.nix | 2 +- pkgs/tools/misc/bibtool/default.nix | 2 +- pkgs/tools/misc/bibutils/default.nix | 2 +- pkgs/tools/misc/bmap-tools/default.nix | 2 +- pkgs/tools/misc/bogofilter/default.nix | 2 +- pkgs/tools/misc/ccze/default.nix | 2 +- pkgs/tools/misc/ckb-next/default.nix | 2 +- pkgs/tools/misc/cloc/default.nix | 2 +- pkgs/tools/misc/contacts/default.nix | 2 +- pkgs/tools/misc/cpulimit/default.nix | 2 +- pkgs/tools/misc/cpuminer/default.nix | 2 +- pkgs/tools/misc/csv2latex/default.nix | 2 +- pkgs/tools/misc/dbus-map/default.nix | 2 +- pkgs/tools/misc/ddcutil/default.nix | 2 +- pkgs/tools/misc/duc/default.nix | 2 +- pkgs/tools/misc/dumptorrent/default.nix | 2 +- pkgs/tools/misc/esptool-ck/default.nix | 2 +- pkgs/tools/misc/flashrom/default.nix | 2 +- pkgs/tools/misc/fsmark/default.nix | 2 +- pkgs/tools/misc/geteltorito/default.nix | 2 +- pkgs/tools/misc/grub4dos/default.nix | 2 +- pkgs/tools/misc/h5utils/default.nix | 2 +- pkgs/tools/misc/hdaps-gl/default.nix | 2 +- pkgs/tools/misc/hebcal/default.nix | 2 +- pkgs/tools/misc/ink/default.nix | 2 +- pkgs/tools/misc/keychain/default.nix | 2 +- pkgs/tools/misc/kodi-cli/default.nix | 2 +- pkgs/tools/misc/kronometer/default.nix | 2 +- pkgs/tools/misc/latex2html/default.nix | 2 +- pkgs/tools/misc/lbdb/default.nix | 2 +- pkgs/tools/misc/lcdf-typetools/default.nix | 2 +- pkgs/tools/misc/ldapvi/default.nix | 2 +- pkgs/tools/misc/lesspipe/default.nix | 2 +- pkgs/tools/misc/limitcpu/default.nix | 2 +- pkgs/tools/misc/linuxquota/default.nix | 2 +- pkgs/tools/misc/loadlibrary/default.nix | 2 +- pkgs/tools/misc/lrzsz/default.nix | 2 +- pkgs/tools/misc/makebootfat/default.nix | 2 +- pkgs/tools/misc/man-db/default.nix | 2 +- pkgs/tools/misc/mdbtools/default.nix | 2 +- pkgs/tools/misc/memtest86+/default.nix | 2 +- pkgs/tools/misc/minicom/default.nix | 2 +- pkgs/tools/misc/mlocate/default.nix | 2 +- pkgs/tools/misc/most/default.nix | 2 +- pkgs/tools/misc/mstflint/default.nix | 2 +- pkgs/tools/misc/nagstamon/default.nix | 2 +- pkgs/tools/misc/notify-desktop/default.nix | 2 +- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- pkgs/tools/misc/pal/default.nix | 2 +- pkgs/tools/misc/pastebinit/default.nix | 2 +- pkgs/tools/misc/pipelight/default.nix | 2 +- pkgs/tools/misc/pkgdiff/default.nix | 2 +- pkgs/tools/misc/qjoypad/default.nix | 2 +- pkgs/tools/misc/recoverjpeg/default.nix | 2 +- pkgs/tools/misc/rig/default.nix | 2 +- pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/misc/rshim-user-space/default.nix | 2 +- pkgs/tools/misc/sensible-utils/default.nix | 2 +- pkgs/tools/misc/sixpair/default.nix | 2 +- pkgs/tools/misc/slsnif/default.nix | 2 +- pkgs/tools/misc/sonota/default.nix | 2 +- pkgs/tools/misc/statserial/default.nix | 2 +- pkgs/tools/misc/subberthehut/default.nix | 2 +- pkgs/tools/misc/system-config-printer/default.nix | 2 +- pkgs/tools/misc/timidity/default.nix | 2 +- pkgs/tools/misc/tmpwatch/default.nix | 2 +- pkgs/tools/misc/ttylog/default.nix | 2 +- pkgs/tools/misc/txt2man/default.nix | 2 +- pkgs/tools/misc/uhubctl/default.nix | 2 +- pkgs/tools/misc/ultrastar-creator/default.nix | 2 +- pkgs/tools/misc/ultrastar-manager/default.nix | 2 +- pkgs/tools/misc/vorbisgain/default.nix | 2 +- pkgs/tools/misc/wacomtablet/default.nix | 2 +- pkgs/tools/misc/wv/default.nix | 2 +- pkgs/tools/misc/wyrd/default.nix | 2 +- pkgs/tools/misc/xclip/default.nix | 2 +- pkgs/tools/misc/xfstests/default.nix | 2 +- pkgs/tools/misc/xvfb-run/default.nix | 2 +- pkgs/tools/networking/6tunnel/default.nix | 2 +- pkgs/tools/networking/arpoison/default.nix | 2 +- pkgs/tools/networking/axel/default.nix | 2 +- pkgs/tools/networking/bacnet-stack/default.nix | 2 +- pkgs/tools/networking/biosdevname/default.nix | 2 +- pkgs/tools/networking/chrony/default.nix | 2 +- pkgs/tools/networking/cksfv/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 2 +- pkgs/tools/networking/corkscrew/default.nix | 2 +- pkgs/tools/networking/dirb/default.nix | 2 +- pkgs/tools/networking/dnsmasq/default.nix | 2 +- pkgs/tools/networking/easyrsa/default.nix | 2 +- pkgs/tools/networking/eggdrop/default.nix | 2 +- pkgs/tools/networking/email/default.nix | 2 +- pkgs/tools/networking/ferm/default.nix | 2 +- pkgs/tools/networking/gvpe/default.nix | 2 +- pkgs/tools/networking/httperf/default.nix | 2 +- pkgs/tools/networking/httptunnel/default.nix | 2 +- pkgs/tools/networking/ifstat-legacy/default.nix | 2 +- pkgs/tools/networking/libnids/default.nix | 2 +- pkgs/tools/networking/memtier-benchmark/default.nix | 2 +- pkgs/tools/networking/minidlna/default.nix | 2 +- pkgs/tools/networking/miredo/default.nix | 2 +- pkgs/tools/networking/mmsd/default.nix | 2 +- pkgs/tools/networking/mtr/default.nix | 2 +- pkgs/tools/networking/nbd/default.nix | 2 +- pkgs/tools/networking/ndisc6/default.nix | 2 +- pkgs/tools/networking/ndjbdns/default.nix | 2 +- pkgs/tools/networking/netmask/default.nix | 2 +- pkgs/tools/networking/netrw/default.nix | 2 +- pkgs/tools/networking/nettee/default.nix | 2 +- pkgs/tools/networking/networkmanager/fortisslvpn/default.nix | 2 +- pkgs/tools/networking/nfstrace/default.nix | 2 +- pkgs/tools/networking/noip/default.nix | 2 +- pkgs/tools/networking/opensm/default.nix | 2 +- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 2 +- pkgs/tools/networking/packetdrill/default.nix | 2 +- pkgs/tools/networking/pdsh/default.nix | 2 +- pkgs/tools/networking/pmacct/default.nix | 2 +- pkgs/tools/networking/ppp/default.nix | 2 +- pkgs/tools/networking/pptp/default.nix | 2 +- pkgs/tools/networking/pptpd/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- pkgs/tools/networking/redir/default.nix | 2 +- pkgs/tools/networking/s3cmd/default.nix | 2 +- pkgs/tools/networking/simpleproxy/default.nix | 2 +- pkgs/tools/networking/sipsak/default.nix | 2 +- pkgs/tools/networking/slirp4netns/default.nix | 2 +- pkgs/tools/networking/sshpass/default.nix | 2 +- pkgs/tools/networking/tcp-cutter/default.nix | 2 +- pkgs/tools/networking/tcptraceroute/default.nix | 2 +- pkgs/tools/networking/tgt/default.nix | 2 +- pkgs/tools/networking/tracebox/default.nix | 2 +- pkgs/tools/networking/vde2/default.nix | 2 +- pkgs/tools/networking/webalizer/default.nix | 2 +- pkgs/tools/networking/whois/default.nix | 2 +- pkgs/tools/networking/wireguard-tools/default.nix | 2 +- pkgs/tools/networking/wol/default.nix | 2 +- pkgs/tools/networking/xdp-tools/default.nix | 2 +- pkgs/tools/networking/xl2tpd/default.nix | 2 +- pkgs/tools/networking/xnbd/default.nix | 2 +- pkgs/tools/networking/zssh/default.nix | 2 +- pkgs/tools/package-management/checkinstall/default.nix | 2 +- pkgs/tools/package-management/opkg-utils/default.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/chntpw/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/security/donkey/default.nix | 2 +- pkgs/tools/security/doona/default.nix | 2 +- pkgs/tools/security/duo-unix/default.nix | 2 +- pkgs/tools/security/efitools/default.nix | 2 +- pkgs/tools/security/fcrackzip/default.nix | 2 +- pkgs/tools/security/fpm2/default.nix | 2 +- pkgs/tools/security/gorilla-bin/default.nix | 2 +- pkgs/tools/security/hashcash/default.nix | 2 +- pkgs/tools/security/hashdeep/default.nix | 2 +- pkgs/tools/security/medusa/default.nix | 2 +- pkgs/tools/security/mfcuk/default.nix | 2 +- pkgs/tools/security/mfoc/default.nix | 2 +- pkgs/tools/security/mkpasswd/default.nix | 2 +- pkgs/tools/security/nasty/default.nix | 2 +- pkgs/tools/security/nmap/default.nix | 2 +- pkgs/tools/security/nmap/qt.nix | 2 +- pkgs/tools/security/ossec/agent.nix | 2 +- pkgs/tools/security/ossec/server.nix | 2 +- pkgs/tools/security/paperkey/default.nix | 2 +- pkgs/tools/security/passff-host/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/security/rarcrack/default.nix | 2 +- pkgs/tools/security/signing-party/default.nix | 2 +- pkgs/tools/security/ssdeep/default.nix | 2 +- pkgs/tools/security/tor/torsocks.nix | 2 +- pkgs/tools/security/wipe/default.nix | 2 +- pkgs/tools/system/actkbd/default.nix | 2 +- pkgs/tools/system/amtterm/default.nix | 2 +- pkgs/tools/system/bar/default.nix | 2 +- pkgs/tools/system/collectd/default.nix | 2 +- pkgs/tools/system/datefudge/default.nix | 2 +- pkgs/tools/system/dcfldd/default.nix | 2 +- pkgs/tools/system/fcron/default.nix | 2 +- pkgs/tools/system/fio/default.nix | 2 +- pkgs/tools/system/gdmap/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 2 +- pkgs/tools/system/hardinfo/default.nix | 2 +- pkgs/tools/system/incron/default.nix | 2 +- pkgs/tools/system/ior/default.nix | 2 +- pkgs/tools/system/krakenx/default.nix | 2 +- pkgs/tools/system/ledmon/default.nix | 2 +- pkgs/tools/system/loadwatch/default.nix | 2 +- pkgs/tools/system/memtester/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 2 +- pkgs/tools/system/s-tui/default.nix | 2 +- pkgs/tools/system/setserial/default.nix | 2 +- pkgs/tools/system/stress/default.nix | 2 +- pkgs/tools/system/tree/default.nix | 2 +- pkgs/tools/system/ts/default.nix | 2 +- pkgs/tools/system/vbetool/default.nix | 2 +- pkgs/tools/text/boxes/default.nix | 2 +- pkgs/tools/text/catdoc/default.nix | 2 +- pkgs/tools/text/convertlit/default.nix | 2 +- pkgs/tools/text/enca/default.nix | 2 +- pkgs/tools/text/lv/default.nix | 2 +- pkgs/tools/text/mawk/default.nix | 2 +- pkgs/tools/text/multitran/data/default.nix | 2 +- pkgs/tools/text/multitran/libbtree/default.nix | 2 +- pkgs/tools/text/multitran/libfacet/default.nix | 2 +- pkgs/tools/text/multitran/libmtquery/default.nix | 2 +- pkgs/tools/text/multitran/libmtsupport/default.nix | 2 +- pkgs/tools/text/multitran/mtutils/default.nix | 2 +- pkgs/tools/text/odt2txt/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 2 +- pkgs/tools/text/rpl/default.nix | 2 +- pkgs/tools/text/subedit/default.nix | 2 +- pkgs/tools/text/unoconv/default.nix | 2 +- pkgs/tools/typesetting/bibclean/default.nix | 2 +- pkgs/tools/typesetting/pdf2djvu/default.nix | 2 +- pkgs/tools/typesetting/pdfsandwich/default.nix | 2 +- pkgs/tools/typesetting/ted/default.nix | 2 +- pkgs/tools/typesetting/tex/catdvi/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- pkgs/tools/video/swfmill/default.nix | 2 +- pkgs/tools/video/untrunc-anthwlock/default.nix | 2 +- pkgs/tools/video/vncrec/default.nix | 2 +- pkgs/tools/virtualization/xva-img/default.nix | 2 +- 325 files changed, 325 insertions(+), 325 deletions(-) diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index 11d46bf24cb6..eb0706ab97aa 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small daemon for disabling trackpads while typing"; homepage = "https://github.com/BlueDragonX/dispad"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.linux; mainProgram = "dispad"; diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index bab363583a6c..9e3afb37d4f9 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Mouse wheel configuration tool for XFree86/Xorg"; maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "imwheel"; }; } diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 6097948a7cd3..bcdf84db7d56 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { and settings are stored in a human-readable config file. ''; homepage = "https://github.com/l3ib/nitrogen"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.auntie ]; mainProgram = "nitrogen"; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index c62cba2e2364..3cfeb32272d5 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/X11/sbs/default.nix b/pkgs/tools/X11/sbs/default.nix index 8f16729cd256..cddf508ead02 100644 --- a/pkgs/tools/X11/sbs/default.nix +++ b/pkgs/tools/X11/sbs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple background setter with 200 lines of code"; homepage = "https://github.com/onur-ozkan/sbs"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ onur-ozkan ]; mainProgram = "sbs"; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 08a3e9c365f4..b15b1eb6b425 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sites.google.com/site/tstyblo/wmctrl"; description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; all; maintainers = [ lib.maintainers.Anton-Latukha ]; mainProgram = "wmctrl"; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 8c48951b2d42..b07f9d4518ff 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "A VNC server connected to a real X11 screen"; homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ OPNA2608 ]; mainProgram = "x11vnc"; }; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 8c9648e71d37..bb8525d30916 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://fredrik.hubbe.net/x2vnc.html"; description = "A program to control a remote VNC server"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "x2vnc"; }; } diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 4960aff0f7b0..64aadb7bb3c7 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "A tiny monitor calibration loader for X and MS-Windows"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = []; platforms = platforms.linux; mainProgram = "xcalib"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 03965a5c0557..3cbafa7c97bc 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; - license = if mimiSupport then licenses.gpl2 else licenses.mit; + license = if mimiSupport then licenses.gpl2Only else licenses.mit; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index cf0ef6d8bf8c..a3f97cccad31 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 47140093be25..9d0ec80a1950 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; homepage = "https://github.com/milaq/XMousePasteBlock"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.petercommand ]; mainProgram = "xmousepasteblock"; }; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e77273c6084c..e0be721feee7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -213,7 +213,7 @@ in buildPythonApplication rec { description = "Persistent remote applications for X"; changelog = "https://github.com/Xpra-org/xpra/releases/tag/v${version}"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ offline numinit mvnetbiz ]; }; } diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 414a7c877bfb..ca665259c8f3 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "fakeXinerama for Xpra"; platforms = platforms.linux; maintainers = [ ]; - license = licenses.gpl2; + license = licenses.mit; }; } diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index de1ea88266e2..591b1ef13ab1 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://salsa.debian.org/debian/xtrace"; description = "Tool to trace X11 protocol connections"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; mainProgram = "xtrace"; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 187dc6234cc2..f63ed3537923 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.c-amie.co.uk/software/analog/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; description = "Powerful tool to generate web server statistics"; platforms = lib.platforms.all; mainProgram = "analog"; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index a37f8af5aff1..4a769dbf56cb 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://simple-evcorr.github.io"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; description = "Simple Event Correlator"; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index ed81a23ba7e5..ccb37cc5b567 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Script to extract RPM archives"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ abbradar ]; mainProgram = "rpmextract"; }; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index aeb0fb91c989..247f393226d7 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Command line tool for unpacking archives easily"; homepage = "https://packages.qa.debian.org/u/unp.html"; - license = with licenses; [ gpl2 ]; + license = with licenses; [ gpl2Only ]; maintainers = [ maintainers.timor ]; platforms = platforms.all; }; diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index d26fdabc1d5d..733639c3e106 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A GTK front-end for command line archiving tools"; maintainers = [ lib.maintainers.domenkozar ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; mainProgram = "xarchive"; }; diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix index 13e3e756b6ac..73b95f9fe7cc 100644 --- a/pkgs/tools/audio/alsaequal/default.nix +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Real-time adjustable equalizer plugin for ALSA"; homepage = "https://thedigitalmachine.net/alsaequal.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ymeister ]; }; } diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index e791c838422a..2a9dbcb82e18 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.pogo.org.uk/~mark/bpm-tools/"; description = "Automatically calculate BPM (tempo) of music files"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index ee85f1aabd33..d3b965efc603 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { very little CPU resources. ''; homepage = "https://icecast.org/ezstream/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.barrucadu ]; platforms = platforms.all; }; diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix index 5819eb281b2f..e562d833aade 100644 --- a/pkgs/tools/audio/mp3cat/default.nix +++ b/pkgs/tools/audio/mp3cat/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in its input stream ''; homepage = "https://github.com/tomclegg/mp3cat"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.omnipotententity ]; platforms = platforms.all; mainProgram = "mp3cat"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index ef5cde192baf..2f2310b98c57 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with lib; { description = ""; mainProgram = "pa-applet"; - license = licenses.gpl2; + license = licenses.bsd2; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index b3ffee6419bf..3c03446f8ffa 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus"; homepage = "http://www.pogo.org.uk/~mark/trx/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.hansjoergschurr ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index ae6184a850f2..2b1865a6f91c 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vgmrips/vgmtools"; description = "A collection of tools for the VGM file format"; - license = licenses.gpl2; # Not clarified whether Only or Plus + license = licenses.gpl2Only; # Not clarified whether Only or Plus maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 0d33c586ed37..89b9bc2dd3db 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "PulseAudio enabled volume control featuring per-app sliders"; homepage = "https://buzz.github.io/volctl/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; mainProgram = "volctl"; diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/tools/backup/bakelite/default.nix index 9270be408d2d..d9505562768a 100644 --- a/pkgs/tools/backup/bakelite/default.nix +++ b/pkgs/tools/backup/bakelite/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/richfelker/bakelite"; description = "Incremental backup with strong cryptographic confidentality"; mainProgram = "bakelite"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ mvs ]; # no support for Darwin (yet: https://github.com/richfelker/bakelite/pull/5) platforms = platforms.linux; diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 8018a1b7cfdf..55aff33b03d9 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast block device synchronizing tool"; homepage = "https://github.com/rolffokkens/bdsync"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; mainProgram = "bdsync"; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 5a2ec9e5db7c..49142f77807c 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Space-efficient incremental backups of large files or block devices"; mainProgram = "chunksync"; homepage = "http://chunksync.florz.de/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index d69980cb94b5..77da73a412bb 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { secure backups on non-trusted spaces are no child's play? ''; homepage = "https://duply.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.bjornfor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 8c62ad6512e0..25ab2f5b2bb1 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; homepage = "https://github.com/iustin/mt-st"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.redvers ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index 683bee11067d..11112911e648 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { specification. ''; homepage = "https://sourceforge.net/projects/mtx/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.redvers ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 7a8210566129..bb35fdd7c32c 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource disk backup software"; homepage = "https://www.partimage.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index 96e7ed5eca8d..1f0ea7e2b6a2 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "SCSI Tape Encryption Manager"; mainProgram = "stenc"; homepage = "https://github.com/scsitape/stenc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 646d85d7277d..fee4a2522690 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index a3677b984818..f8aabc4f48ef 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "http://he.fi/bchunk/"; 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; + license = licenses.gpl2Plus; mainProgram = "bchunk"; }; } diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index 4885b16aa065..b364566f4b7d 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; 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 f6d0b4e1175f..3456338d6339 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; mainProgram = "cdi2iso"; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index 5f8d6016aa21..84bb2220e8e8 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ hhm ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 959899d3b3f3..40f890915165 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "https://cdrdao.sourceforge.net/"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; }) diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 402e6f4dde37..ae4a06bb57f2 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://cdrkit.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 68358a0c333f..1a3e58df2cc8 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://cdrtools.sourceforge.net/private/cdrecord.html"; description = "Highly portable CD/DVD/BluRay command line recording software"; - license = with licenses; [ cddl gpl2 lgpl21 ]; + license = with licenses; [ cddl gpl2Plus lgpl21 ]; platforms = with platforms; linux ++ darwin; # Licensing issues: This package contains code licensed under CDDL, GPL2 # and LGPL2. There is a debate regarding the legality of distributing this diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index a6cf5506138b..c3e1779071fd 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set of utilities for working with cue files and toc files"; homepage = "https://github.com/svend/cuetools"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel jcumming ]; platforms = platforms.all; }; diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index a618d93214f6..a6b75e14bef7 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"; description = "Tools for mastering Blu-ray and DVD+-RW/+-R media"; platforms = platforms.unix; - license = with licenses; [ gpl2 publicDomain ]; + license = with licenses; [ gpl2Only publicDomain ]; }; } diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 43aaa534c041..a9d8e1643742 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; mainProgram = "dvd-vr"; }; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index d13a3c5f0f13..671f82281659 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ knl ]; }; } diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 3fd116faea5b..c78ed61f4d24 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "lsdvd"; }; diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index b5fcc557b4e1..c2057b758707 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small utility that converts MDF images to ISO format"; homepage = src.url; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.oxij ]; mainProgram = "mdf2iso"; diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 8807466d05a6..a1cfa7481ab7 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; mainProgram = "nrg2iso"; }; diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index dbe192e039bd..4b74ffbc8ad2 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = "http://vobcopy.org/projects/c/c.shtml"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.bluescreen303 ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 64061647667a..887ae94e5c99 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://www.lzop.org"; description = "Fast file compressor"; maintainers = with maintainers; [ ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "lzop"; }; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 02dd1a7aafe0..6c3d213f734d 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/simonvetter/afpfs-ng"; description = "A client implementation of the Apple Filing Protocol"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 6c0566153a9f..48e78fe7d108 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; mainProgram = "archivemount"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index dbd573d5f012..4612b11a5777 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A menu-driven bash script for the management of removable media with udisks"; mainProgram = "bashmount"; maintainers = [ maintainers.koral ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 9cd8199005b9..d73d17905432 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tree. ''; homepage = "https://bcache.evilpiepirate.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 36566dc71002..f5fd31376a19 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ davidak Madouura ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 6b01e22f6169..41fcc72e5968 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -140,7 +140,7 @@ let getMeta = description: with lib; { homepage = "https://ceph.io/en/"; inherit description; - license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; + license = with licenses; [ lgpl21 gpl2Only bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index e4a20e3da5a0..e77da2d712bb 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 31311756ab47..8b34f0f4ea26 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index 396f8142ba93..f73c49d9799e 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Read BitLocker encrypted partitions in Linux"; homepage = "https://github.com/aorimn/dislocker"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ elitak ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 52a89013ced6..bcd8521b6a15 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { mainProgram = "djmount"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.jagajaga ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index c1d860256804..0f8e8d30469e 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; homepage = "https://github.com/markfasheh/duperemove"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; mainProgram = "duperemove"; diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index d448b0f67b5f..02c97f88daa1 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://e2tools.github.io/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.leenaars ]; }; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index bb23f58c38c6..2af139c619d6 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; homepage = "https://ext4magic.sourceforge.net/ext4magic_en.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; mainProgram = "ext4magic"; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 0c3062fb11ca..d15295659385 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = "https://extundelete.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; mainProgram = "extundelete"; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index d0d97f124d09..2a913be9fa80 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ehmry jagajaga ]; }; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index b731e9c7cc96..a2d42bb5a2a7 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "FUSE module to mount ISO filesystem images"; homepage = "https://sourceforge.net/projects/fuseiso"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "fuseiso"; }; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index b640c99dc82f..cf9cf7ef00e3 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bestouff/genext2fs"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; mainProgram = "genext2fs"; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index ce611736b77e..05b556019dac 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nickcao ]; platforms = platforms.all; mainProgram = "genromfs"; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 41afc98e7f94..507541b683bd 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A console Google Drive client"; homepage = "https://github.com/vitalif/grive2"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "grive"; }; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 55b796ec3254..48ec4cea7c98 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.mfossen ]; }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 3fe4f9af4a08..79a0fe533673 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "NILFS utilities"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus lgpl21 ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; }; } diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 0b4ec481fc71..235639457a31 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scale-out network file system for use on high-end computing systems"; homepage = "http://www.orangefs.org/"; - license = with licenses; [ asl20 bsd3 gpl2 lgpl21 lgpl21Plus openldap ]; + license = with licenses; [ asl20 bsd3 gpl2Only lgpl21 lgpl21Plus openldap ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 9f9b3bd5c2ed..63247da847d4 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "https://sourceforge.net/projects/reiser4/"; description = "Reiser4 utilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index a3dd60635350..1118c9ac2742 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 120b30cbb1d1..a42d6a48350e 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; homepage = "https://sourceforge.net/projects/smbnetfs/"; mainProgram = "smbnetfs"; diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index e666c893b798..a9b2a7abf9b5 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; homepage = "https://sourceforge.net/projects/u3-tool/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ makefu ]; mainProgram = "u3-tool"; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index b60dccc4e68f..e9dafd11b888 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "FUSE-based VMFS (vmware) file system tools"; maintainers = with maintainers; [ peterhoeg ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; inherit (src.meta) homepage; }; diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index 4519ee9d42a6..a9304b9ad0e2 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wit.wiimm.de"; description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ nilp0inter ]; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index d44e92a33c46..77099a01e44f 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { homepage = "https://frippery.org/uml/"; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.theuni ]; mainProgram = "zerofree"; }; diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 250ef7c2f357..617bf60d6065 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -42,7 +42,7 @@ mavenWithJdk.buildMavenPackage rec { meta = with lib; { description = "A mod manager for FTL: Faster Than Light"; homepage = "https://github.com/Vhati/Slipstream-Mod-Manager"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ mib ]; mainProgram = "slipstream"; }; diff --git a/pkgs/tools/graphics/dynamic-wallpaper/default.nix b/pkgs/tools/graphics/dynamic-wallpaper/default.nix index 0a52d19bf441..9b30aba12ac4 100644 --- a/pkgs/tools/graphics/dynamic-wallpaper/default.nix +++ b/pkgs/tools/graphics/dynamic-wallpaper/default.nix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Dynamic wallpaper maker for Gnome"; homepage = "https://github.com/dusansimic/dynamic-wallpaper"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "me.dusansimic.DynamicWallpaper"; maintainers = with maintainers; [ zendo ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index f47a2aa961e6..d665c884751e 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 5952734e4582..85cfa563f474 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.asppsa ]; platforms = platforms.all; mainProgram = "epstool"; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index be8bc4eb6eab..8e2e636d90f7 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Static photo gallery generator"; homepage = "https://www.thregr.org/~wavexx/software/fgallery/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; mainProgram = "fgallery"; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 77247f7fea80..d4d90b118598 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = "https://www.lcdf.org/gifsicle/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix index 854a35262b07..abefdc1c4783 100644 --- a/pkgs/tools/graphics/ifm/default.nix +++ b/pkgs/tools/graphics/ifm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://bitbucket.org/zondo/ifm"; description = "Interactive fiction mapper"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index a391a62ccb68..4af5c9b648e9 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; longDescription = '' Mscgen is a small program that parses Message Sequence Chart diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index 320acaba420c..ea5434e3dd40 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with lib; { description = "OPTical ARchiver - it's a codec for encoding data on paper"; homepage = "http://ronja.twibright.com/optar/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; # possibly others, but only tested on Linux }; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index b68ba12ebfe9..b7da6dad29da 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PDF converter to SVG format"; homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; mainProgram = "pdf2svg"; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 3bd4c1a86fbc..810c2365b2c3 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Translates PostScript and PDF graphics into other vector formats"; homepage = "https://sourceforge.net/projects/pstoedit/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; mainProgram = "pstoedit"; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index 940e9db05419..71f8661dfa2c 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.dbohdan ]; platforms = lib.platforms.unix; mainProgram = "s2png"; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 1ec42817456a..f3db03c53f63 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "Clean and optimize SVG files from unnecessary data"; homepage = "https://github.com/RazrFalcon/SVGCleaner"; changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ yuu ]; mainProgram = "svgcleaner"; }; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index c59353af5a11..0b84d61274d9 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://www.flameeyes.eu/projects/unpaper"; changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS"; description = "Post-processing tool for scanned sheets of paper"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; mainProgram = "unpaper"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index 7b3d45421291..077f016b9e90 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { These tools work independently of the Gimp engine and do not require the Gimp to even be installed. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index dcc7528f0456..c8f34fc3b796 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Ibus Hangul engine"; mainProgram = "ibus-setup-hangul"; homepage = "https://github.com/libhangul/ibus-hangul"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 00ce8df19367..fc5bd3d33be3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { isIbusEngine = true; description = "libkkc (Japanese Kana Kanji input method) engine for ibus"; homepage = "https://github.com/ueno/ibus-kkc"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 61a948529f4d..62bb10494b13 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "The Easy Hangul XIM"; mainProgram = "nabi"; homepage = "https://github.com/choehwanjin/nabi"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 0ced53804643..11052cb59350 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = "https://www.aescrypt.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lovek323 qknight ]; platforms = lib.platforms.all; hydraPlatforms = with platforms; unix; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index a75a9f03f300..7b80c2a5d9bd 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; mainProgram = "apparix"; }; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 5308d2098d5e..60905d95e57d 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A general-purpose command-line pipe buffer"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 2e5ebd1e56a2..ba73de533af9 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A collection of tools for translating from BibTeX to HTML"; homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; }; diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index f9de299c87b2..46c798f12c6d 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for manipulating BibTeX bibliographies"; homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.rycee ]; mainProgram = "bibtool"; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index c454e8cfa1d8..ea5360549b20 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.garrison ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index 4bf170ccbc7d..2f36c452fcb1 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "bmap-related tools"; homepage = "https://github.com/intel/bmap-tools"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "bmaptool"; diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index df78108e43e2..f5fcbc831c89 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 4946fd64d89d..2c028485ccd3 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { for the Perl colorize tool. Includes plugins for a variety of log formats (Apache, Postfix, Procmail, etc.). ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ malyn ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 959493d3e4bd..6b7fc82e0d01 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; homepage = "https://github.com/ckb-next/ckb-next"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "ckb-next"; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 14c7b2133c71..4cb21ea5c99e 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ rycee ]; mainProgram = "cloc"; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 175b7a9ed247..1c789ca1d11d 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Access contacts from the Mac address book from command-line"; homepage = "http://www.gnufoo.org/contacts/contacts.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.darwin; hydraPlatforms = platforms.darwin; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 75c3ba733b14..4788bc57befe 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/opsengine/cpulimit"; description = "CPU usage limiter"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "cpulimit"; maintainers = [ maintainers.jsoo1 ]; }; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 4b7c5fc7f486..8b9e07762c83 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; mainProgram = "minerd"; diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix index cc286c54e9ad..acfe07f26228 100644 --- a/pkgs/tools/misc/csv2latex/default.nix +++ b/pkgs/tools/misc/csv2latex/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line CSV to LaTeX file converter"; homepage = "http://brouits.free.fr/csv2latex/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.catern ]; mainProgram = "csv2latex"; }; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 955a248be7bb..cdd7b840a1d3 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; homepage = "https://github.com/taviso/dbusmap"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; mainProgram = "dbus-map"; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 28a31a16d078..baf41aac7041 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; changelog = "https://github.com/rockowitz/ddcutil/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 0501b681aa3a..56fe697528ab 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 194d40e1c1cc..c80a696f8cba 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dump .torrent file information"; homepage = "https://sourceforge.net/projects/dumptorrent/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.zohl ]; platforms = platforms.all; mainProgram = "dumptorrent"; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index 2dd6415324e4..58f84c9b0630 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ESP8266/ESP32 build helper tool"; homepage = "https://github.com/igrr/esptool-ck"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "esptool"; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b2b9583db232..190841582a4f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz felixsinger ]; platforms = platforms.all; mainProgram = "flashrom"; diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index 2c2aa2c6fef8..340be1a56c2e 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronous write workload file system benchmark"; homepage = "https://sourceforge.net/projects/fsmark/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "fs_mark"; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index 5fb2209ee8c1..7bbedde4dac6 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Extract the initial/default boot image from a CD image if existent"; homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "geteltorito"; }; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index f00720af15ec..8b78c29defe7 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; # Needs a port to modern binutils: # https://github.com/chenall/grub4dos/issues/160 broken = true; diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index f0267608d3a9..705ac56f5baf 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; homepage = "https://github.com/stevengj/h5utils"; changelog = "https://github.com/NanoComp/h5utils/releases/tag/${version}"; - license = with licenses; [ mit gpl2 ]; + license = with licenses; [ mit gpl2Plus ]; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 1999d9ad0d56..eb8259929e82 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.symphorien ]; mainProgram = "hdaps-gl"; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 80d52592c742..ef1686c20cb4 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.hhm ]; platforms = platforms.all; mainProgram = "hebcal"; diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/tools/misc/ink/default.nix index 30df6e9691fa..6932d04c8d6c 100644 --- a/pkgs/tools/misc/ink/default.nix +++ b/pkgs/tools/misc/ink/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. ''; homepage = "https://ink.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; mainProgram = "ink"; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index edb0bc34e776..bd993c34bd2c 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { process, allowing your scripts to take advantage of key-based logins. ''; homepage = "https://www.funtoo.org/Keychain"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ sigma ]; mainProgram = "keychain"; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 10b9cea73d76..fc2aa1400758 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = [ maintainers.pstn ]; }; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 06fafedf42ef..6e303ddfc983 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://kde.org/applications/utilities/kronometer/"; description = "A stopwatch application"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; mainProgram = "kronometer"; }; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index f3cca8872b23..9f0aed7fb424 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ctan.org/pkg/latex2html"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 43dab4772d5f..44f0149cbb7c 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.spinnaker.de/lbdb/"; description = "The Little Brother's Database"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ kaiha bfortz ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/tools/misc/lcdf-typetools/default.nix index eaa2ce01347b..feb2563735b4 100644 --- a/pkgs/tools/misc/lcdf-typetools/default.nix +++ b/pkgs/tools/misc/lcdf-typetools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for manipulating OpenType, PostScript Type 1, and Multiple Master fonts"; homepage = "https://www.lcdf.org/type"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 4be3b9e9024c..03a01da3e5ef 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { can update LDAP entries with a text editor. ''; homepage = "http://www.lichteblau.com/ldapvi/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "ldapvi"; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 5bc3f97c3c78..9922573d3e93 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/wofr06/lesspipe"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.martijnvermaat ]; }; } diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix index 830eed9d94ae..f06bd5ff16a9 100644 --- a/pkgs/tools/misc/limitcpu/default.nix +++ b/pkgs/tools/misc/limitcpu/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [maintainers.rycee]; mainProgram = "cpulimit"; }; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index b5fc42be82dc..65e5646e6a7d 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to manage kernel-level quotas in Linux"; homepage = "https://sourceforge.net/projects/linuxquota/"; - license = licenses.gpl2; # With some files being BSD as an exception + license = licenses.gpl2Plus; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; }; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index f919facf21b4..b07b62624f0a 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -26,7 +26,7 @@ stdenv_32bit.mkDerivation rec { description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "mpclient"; }; } diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 867e492b33e2..137d27ae1bd0 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index b2e93bb140ad..7fcd15c53284 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; mainProgram = "makebootfat"; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 8e2365f475d2..59450f5c360e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "man"; }; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 327b58d8d78b..05299e60845a 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = ".mdb (MS Access) format tools"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2 ]; maintainers = with maintainers; [ ]; platforms = platforms.unix; inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 297ef5dff041..520b0a98c201 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.memtest.org/"; description = "A tool to detect memory errors"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.LunNova ]; }; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 361909ebddf2..50043a132b14 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modem control and terminal emulation program"; homepage = "https://salsa.debian.org/minicom-team/minicom"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Minicom is a menu driven communications program. It emulates ANSI and VT102 terminals. It has a dialing directory and auto zmodem diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index c9253be930af..bf8899b4003e 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Merging locate is an utility to index and quickly search for files"; homepage = "https://pagure.io/mlocate"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 87280b9f295e..dd94f1fed45f 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { windows and can scroll left and right. Why settle for less? ''; homepage = "https://www.jedsoft.org/most/index.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "most"; }; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index c4c99da85e18..425271b6ff36 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source version of Mellanox Firmware Tools (MFT)"; homepage = "https://github.com/Mellanox/mstflint"; - license = with licenses; [ gpl2 bsd2 ]; + license = with licenses; [ gpl2Only bsd2 ]; maintainers = with maintainers; [ thillux ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index e9f76dbf22d9..eb80c03bec91 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "A status monitor for the desktop"; homepage = "https://nagstamon.ifw-dresden.de/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; # fails to install with: # TypeError: cannot unpack non-iterable bool object diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 0265e5dd8974..e1118022edff 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { It also does not use any external dependencies (except from libdbus of course). ''; homepage = "https://github.com/nowrep/notify-desktop"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ylwghst ]; mainProgram = "notify-desktop"; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 40b747f20305..4d455977d6d9 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux and Mac OS support for the CorsairLink Devices "; homepage = "https://github.com/audiohacked/OpenCorsairLink"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ lib.maintainers.expipiplus1 ]; mainProgram = "OpenCorsairLink.elf"; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 5456ffdf061c..c3778ba3bccf 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index ba597934ebbe..21beecc443c0 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://stgraber.org/category/pastebinit/"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ raboof samuel-martineau ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 90c1e8d1e86a..e565bf554fff 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with lib.licenses; [ mpl11 gpl2Only lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/tools/misc/pkgdiff/default.nix index 45ec2df2beaf..77ba84c1df0f 100644 --- a/pkgs/tools/misc/pkgdiff/default.nix +++ b/pkgs/tools/misc/pkgdiff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for visualizing changes in Linux software packages"; homepage = "https://lvc.github.io/pkgdiff/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ sweber ]; platforms = platforms.unix; mainProgram = "pkgdiff"; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index a602e7b7fad6..260c8f498e6b 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { experience just a little bit nicer. ''; homepage = "https://github.com/panzi/qjoypad/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; mainProgram = "qjoypad"; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index db05aeda96a3..998241f5cc39 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index b9a3e0951e3c..45304f3e56f4 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tomberek ]; platforms = with lib.platforms; all; mainProgram = "rig"; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index e852374e2a88..3ce10f131605 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -41,7 +41,7 @@ perl.pkgs.toPerlModule (stdenv.mkDerivation rec { meta = with lib; { homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index 67cf3b6895e0..329c572967a9 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { target and provides a way to access the internal rshim registers. ''; homepage = "https://github.com/Mellanox/rshim-user-space"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ nikstur ]; }; diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/tools/misc/sensible-utils/default.nix index 238b9f400b89..f75629d96f12 100644 --- a/pkgs/tools/misc/sensible-utils/default.nix +++ b/pkgs/tools/misc/sensible-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://salsa.debian.org/debian/sensible-utils"; changelog = "https://salsa.debian.org/debian/sensible-utils/-/tags"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pbek ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index fa444a86a0ac..92f7e81c0ccd 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; homepage = "http://www.pabr.org/sixlinux/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.tomsmeets ]; platforms = lib.platforms.linux; mainProgram = "sixpair"; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 04bc462350f1..7ac1a846484f 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Serial line sniffer"; homepage = "http://slsnif.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "slsnif"; }; diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix index 5f341bbc98ee..efc7ab22b468 100644 --- a/pkgs/tools/misc/sonota/default.nix +++ b/pkgs/tools/misc/sonota/default.nix @@ -48,7 +48,7 @@ in buildPythonApplication rec { meta = with lib; { description = "Flash Itead Sonoff devices with custom firmware via original OTA mechanism"; homepage = src.meta.homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; mainProgram = "sonota"; }; diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix index 526729dcd31c..2bcd9e9bdb77 100644 --- a/pkgs/tools/misc/statserial/default.nix +++ b/pkgs/tools/misc/statserial/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sites.google.com/site/tranter/software"; description = "Display serial port modem status lines"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Statserial displays a table of the signals on a standard 9-pin or diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index 913bc49a5116..66e4442ad460 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ jqueiroz ]; mainProgram = "subberthehut"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index cafc35790193..235de21a6cf5 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/openprinting/system-config-printer"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 65d154476f02..1cb62fec2e02 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/timidity/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 873b7c0f6f0a..1c545b280dd1 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://pagure.io/tmpwatch"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ vlstill ]; platforms = platforms.unix; mainProgram = "tmpwatch"; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index ca90481ba9e6..ff07ba976175 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { A serial port logger which can be used to print everything to stdout that comes from a serial device. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "ttylog"; }; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index a6ebcb288216..57ec9ccb8e53 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index e148e03f820e..4ee7ea3a00e1 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ prusnak ]; platforms = with platforms; linux ++ darwin; mainProgram = "uhubctl"; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 990547291f61..547d0a86f957 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -39,7 +39,7 @@ mkDerivation { meta = with lib; { description = "Ultrastar karaoke song creation tool"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index d5dd47e0f669..4921c1de397e 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -116,7 +116,7 @@ in mkDerivation { meta = with lib; { description = "Ultrastar karaoke song manager"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index e5a85049df0a..f5a2e2d1dad5 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; mainProgram = "vorbisgain"; diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index f10ccd698cb9..b7a0652b359c 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { with profile support to handle different button / pen layouts per profile. ''; homepage = "https://invent.kde.org/system/wacomtablet"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index e1824c1d3709..0d2443be9f9b 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AbiWord/wv"; description = "Converter from Microsoft Word formats to human-editable ones"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; }) diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 4010a0b42d0f..cdce7a5e347f 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://pessimization.com/software/wyrd/"; downloadPage = "http://pessimization.com/software/wyrd/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; mainProgram = "wyrd"; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 721d300a19ed..e56382879d59 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; mainProgram = "xclip"; }; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 5080c8592492..aed576f7d34a 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Torture test suite for filesystems"; homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "xfstests-check"; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index eb1e7c5b01b7..038cae8f39e6 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Convenience script to run a virtualized X-Server"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.artturin ]; mainProgram = "xvfb-run"; }; diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/tools/networking/6tunnel/default.nix index 50259f827321..2f0e0320548b 100644 --- a/pkgs/tools/networking/6tunnel/default.nix +++ b/pkgs/tools/networking/6tunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Tunnelling for application that don't speak IPv6"; mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index 912636a0e72a..347f2bf3ea6f 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "UNIX arp cache update utility"; homepage = "http://www.arpoison.net/"; - license = with licenses; [ gpl2 ]; + license = with licenses; [ gpl2Only ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; mainProgram = "arpoison"; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 2480d0e31e25..b30157755e49 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/axel-download-accelerator/axel"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "axel"; }; } diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index 528dd8141761..697ae7af34b3 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ WhittlesJr ]; }; } diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index fe9ccb3dd20a..c9d2f4bbd62d 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Udev helper for naming devices per BIOS names"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = ["x86_64-linux" "i686-linux"]; maintainers = with maintainers; [ ]; mainProgram = "biosdevname"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 74132e792447..4b8b8e8b9708 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "https://chrony.tuxfamily.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 2d5a2b533a61..d8a255337504 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "A tool for verifying files against a SFV checksum file"; maintainers = with maintainers; [ ]; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "cksfv"; }; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index 45fc56f3ba2d..b2a4193ff049 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = "https://cntlm.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.qknight diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 882b742ebc76..d97d93e62f61 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bryanpkc/corkscrew"; description = "A tool for tunneling SSH through HTTP proxies"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = platforms.unix; mainProgram = "corkscrew"; }; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index 17a518bdea21..313ecc110b0f 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { description = "A web content scanner"; homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2Only ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index c63c2fa4fbbc..623c498f995f 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "dnsmasq"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 1591bff41c8f..47f4e5a7b835 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple shell based CA utility"; homepage = "https://openvpn.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.offline maintainers.numinit ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index 788a2df8cf10..fad18ce2213f 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; homepage = "https://www.eggheads.org"; description = "An Internet Relay Chat (IRC) bot"; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index c4ef390e6b81..3472fdc17225 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2Plus ]; homepage = "https://deanproxy.com/code"; platforms = lib.platforms.unix; mainProgram = "email"; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 518bb5c26daa..63f247ab986b 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { command. The firewall configuration resembles structured programming-like language, which can contain levels and lists. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [mic92]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 5170df24b91c..04033aaa375c 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://software.schmorp.de/pkg/gvpe.html"; maintainers = [ maintainers.raskin ]; platforms = with platforms; linux ++ freebsd; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index dca67e7c39a1..54fdb06b6c58 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "The httperf HTTP load generator"; homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; mainProgram = "httperf"; }; diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index c8ff4fa7719d..9a8a9ee11db5 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; homepage = "http://www.gnu.org/software/httptunnel/httptunnel.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index ff36f83ef8dc..25c7dbb60ec4 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "http://gael.roualland.free.fr/ifstat/"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "ifstat-legacy"; }; } diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index e6df2850a1c9..97edccfea173 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; homepage = "https://libnids.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris platforms = platforms.linux; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index d77ef2d417d5..ac27ad54667c 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; homepage = "https://github.com/redislabs/memtier_benchmark"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; mainProgram = "memtier_benchmark"; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 6bdea670c13b..085a5671d24a 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { compliant with DLNA/UPnP-AV clients. ''; homepage = "https://sourceforge.net/projects/minidlna/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "minidlnad"; }; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index d47485f22b1e..bac427228b52 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Teredo IPv6 Tunneling Daemon"; homepage = "https://www.remlab.net/miredo/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index f7ea7be22c08..474fa046bffe 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multimedia Messaging Service Daemon"; homepage = "https://01.org/ofono"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c586d6a75ef1..e62b4547525a 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A network diagnostics tool"; homepage = "https://www.bitwizard.nl/mtr/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ koral orivej raskin globin ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index ebef277feb21..68bcc6265558 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://nbd.sourceforge.io/"; description = "Map arbitrary files as block devices over the network"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ nickcao ]; }; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 6a728ec30bfe..a0257b72cfda 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 6746f456cfe3..7f494de41432 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. ''; homepage = "http://pjp.dgplug.org/ndjbdns/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index f564e09ba032..008688a757c5 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tlby/netmask"; description = "An IP address formatting tool "; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jensbin ]; mainProgram = "netmask"; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index c5e54ab8f432..bfab84bf0221 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; homepage = "https://mamuti.net/netrw/index.en.html"; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index b281d6b29680..74b1f317e204 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://saf.bio.caltech.edu/nettee.html"; description = ''Network "tee" program''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.linux; mainProgram = "nettee"; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index a1ef139008fc..7e927c650cdd 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetworkManager’s FortiSSL plugin"; inherit (networkmanager.meta) maintainers platforms; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 1a0268f960d2..c54a5deec46f 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://epam.github.io/nfstrace/"; description = "NFS and CIFS tracing/monitoring/capturing/analyzing tool"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "nfstrace"; }; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 85614001342f..d71cbcec507a 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Dynamic DNS daemon for no-ip accounts"; homepage = "http://noip.com/download?page=linux"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.iand675 ]; platforms = platforms.linux; mainProgram = "noip2"; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index 6026292f386f..42415c9aa26c 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Infiniband subnet manager"; homepage = "https://www.openfabrics.org/"; - license = licenses.gpl2; # dual licensed as 2-clause BSD + license = licenses.gpl2Only; # dual licensed as 2-clause BSD maintainers = [ maintainers.aij ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index e8533a214af1..53d2b272c449 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 139078f2f6fc..baf2a53c4d78 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; homepage = "https://github.com/google/packetdrill"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dmjio cleverca22 ]; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 2708f3d95840..bbfbc2d40cb8 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index dfc31498ddd1..6c4be00c3ef5 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.pmacct.net/"; changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 20e59167699b..54693a57a651 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsdOriginal publicDomain - gpl2 + gpl2Only lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 4bc0ed3219fa..38734375be0a 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PPTP client for Linux"; homepage = "https://pptpclient.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index 3c24d2ac0715..d1cb90089e0c 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index ca175f5f2a91..c73908062588 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple HTTP server for quickly sharing files"; homepage = "https://xyne.archlinux.ca/projects/quickserve/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lassulus ]; mainProgram = "quickserve"; }; diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 17975521de16..46233e4a4daa 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; homepage = "https://github.com/troglobit/redir"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; mainProgram = "redir"; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 18aed1301355..d4864160fc34 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; mainProgram = "s3cmd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index 7f9ccd1c9865..e91d5d4eb272 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vzaliva/simpleproxy"; description = "A simple TCP proxy"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.montag451 ]; mainProgram = "simpleproxy"; }; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 4d1cf08a11b8..ba6325cd53f0 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ sheenobu ]; platforms = with platforms; unix; mainProgram = "sipsak"; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 85c5f36063a7..b9c6db399e7b 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ orivej ] ++ teams.podman.members; platforms = platforms.linux; mainProgram = "slirp4netns"; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 6818fe33a94d..60ce32a5e747 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/sshpass/"; description = "Non-interactive ssh password auth"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.madjar ]; platforms = platforms.unix; mainProgram = "sshpass"; diff --git a/pkgs/tools/networking/tcp-cutter/default.nix b/pkgs/tools/networking/tcp-cutter/default.nix index 71075cc5dd1c..4231ddef2433 100644 --- a/pkgs/tools/networking/tcp-cutter/default.nix +++ b/pkgs/tools/networking/tcp-cutter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.offline ]; mainProgram = "tcp-cutter"; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index cc5594afd5a5..978d06557071 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets"; homepage = "https://github.com/mct/tcptraceroute"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ ]; mainProgram = "tcptraceroute"; }; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 349c0823a510..f04f06acc7d3 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "iSCSI Target daemon with RDMA support"; homepage = "https://github.com/fujita/tgt"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg ]; }; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index dce1fc532046..0652e6e59bef 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ck3d ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 83cee2e466af..0d86c5637866 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index c8945fa454aa..93bd4dad005c 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "Web server log file analysis program"; homepage = "https://webalizer.net/"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 253a233b852d..4b7d7b778c0a 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://packages.qa.debian.org/w/whois.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; mainProgram = "whois"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index effba4adce05..ebac01f063cd 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ericsagnes zx2c4 globin ma27 d-xo ]; mainProgram = "wg"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix index 14cf48ae0dbd..0d1abbf33544 100644 --- a/pkgs/tools/networking/wol/default.nix +++ b/pkgs/tools/networking/wol/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implements Wake On LAN functionality in a small program"; homepage = "https://sourceforge.net/projects/wake-on-lan/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; mainProgram = "wol"; platforms = platforms.linux; diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index f1bcb4dfd115..14fdecbde8bc 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/xdp-project/xdp-tools"; description = "Library and utilities for use with XDP"; - license = with licenses; [ gpl2 lgpl21 bsd2 ]; + license = with licenses; [ gpl2Only lgpl21 bsd2 ]; maintainers = with maintainers; [ tirex vcunat vifino ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 2f84a4d330fd..3b0ee699ff32 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 52f332a0e8f8..e7faf8302f18 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 3c4be71998e8..b64d2c959a1a 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "https://zssh.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ ]; # required by deepin-terminal platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 323464847b60..a56880cb3426 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; knownVulnerabilities = [ "CVE-2020-25031" ]; diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 922fa4c93e1e..1fea0f6cc7a2 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Helper scripts for use with the opkg package manager"; homepage = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 9ab8e089f30b..b893c9b0b2d6 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AES encrypting or decrypting pipe"; homepage = "https://loop-aes.sourceforge.net/aespipe.README"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index c4463d16d348..827a00f718c1 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; maintainers = with lib.maintainers; [ deepfire ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index c9d15351da4e..1076bc71a278 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ robberer qknight globin ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/tools/security/donkey/default.nix index ec95715853ec..22793db15431 100644 --- a/pkgs/tools/security/donkey/default.nix +++ b/pkgs/tools/security/donkey/default.nix @@ -47,7 +47,7 @@ the host. The name "Donkey" is an acronym of "Don't Key". ''; homepage = "https://devel.ringlet.net/security/donkey"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ raboof ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix index 2598f2ecbb96..fd36680c022d 100644 --- a/pkgs/tools/security/doona/default.nix +++ b/pkgs/tools/security/doona/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { A fork of the Bruteforce Exploit Detector Tool (BED). BED is a program which is designed to check daemons for potential buffer overflows, format string bugs etc. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pamplemousse ]; }; } diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index f0ddb1c0c2aa..1d04cfef3544 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Duo Security Unix login integration"; homepage = "https://duosecurity.com"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix index 70032504f475..0d8dab926cb2 100644 --- a/pkgs/tools/security/efitools/default.nix +++ b/pkgs/tools/security/efitools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for manipulating UEFI secure boot platforms"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.grahamc ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index 31d0b44fb710..b3b82a015115 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "zip password cracker, similar to fzc, zipcrack and others"; homepage = "http://oldhome.schmorp.de/marc/fcrackzip.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ nico202 ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 68781d05dc68..e59322a51c9d 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; mainProgram = "fpm2"; homepage = "https://als.regnet.cz/fpm2/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; }; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 898abbbd25a4..95ca0b08bf8e 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index f86684178fcb..8b1fdea1c935 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; homepage = "http://hashcash.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ kisonecat ]; }; } diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 5bc752eb3611..f4f327b48d80 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set of cross-platform tools to compute hashes"; homepage = "https://github.com/jessek/hashdeep"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.karantan ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix index 3a29f2a6e283..c7008be8f948 100644 --- a/pkgs/tools/security/medusa/default.nix +++ b/pkgs/tools/security/medusa/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jmk-foofus/medusa"; description = "A speedy, parallel, and modular, login brute-forcer"; mainProgram = "medusa"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index d6736b5b097a..74761dd994e8 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with lib; { description = "MiFare Classic Universal toolKit"; mainProgram = "mfcuk"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://github.com/nfc-tools/mfcuk"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 9ede0ffc6157..bc85261305d3 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mifare Classic Offline Cracker"; mainProgram = "mfoc"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://github.com/nfc-tools/mfoc"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 00b1e8a01501..edbdfdc711c6 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; mainProgram = "mkpasswd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index f0bd0d406c33..80b6a2da8e2d 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { this program could be at least 100x faster. ''; homepage = "http://www.vanheusden.com/nasty/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 64dcd4f220bd..8d5b3d90e5c6 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; }; diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 56ebc5db6213..956649088ff3 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Qt frontend for nmap"; mainProgram = "nmapsi4"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; inherit (src.meta) homepage; }; diff --git a/pkgs/tools/security/ossec/agent.nix b/pkgs/tools/security/ossec/agent.nix index 003d2141c567..c5ba8688123b 100644 --- a/pkgs/tools/security/ossec/agent.nix +++ b/pkgs/tools/security/ossec/agent.nix @@ -61,7 +61,7 @@ EOF meta = with lib; { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ happysalada ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/ossec/server.nix b/pkgs/tools/security/ossec/server.nix index 1a7a3e813675..2c015617176c 100644 --- a/pkgs/tools/security/ossec/server.nix +++ b/pkgs/tools/security/ossec/server.nix @@ -62,7 +62,7 @@ EOF meta = with lib; { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ happysalada ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index a22c1617f07b..3b3a2d81d106 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { are generally used to back up computer data. ''; homepage = "https://www.jabberwocky.com/software/paperkey/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ AndersonTorres peterhoeg ]; }; diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index bc882cb419f6..3ec277ce273a 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Host app for the WebExtension PassFF"; homepage = "https://github.com/passff/passff-host"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 3612caa196c2..aa9687ba3a41 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication { to the process. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = with lib.maintainers; [ kierdavis ]; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 3745a9520f1c..40043022f278 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { Warning: Please don't use this program for any illegal things! ''; homepage = "https://github.com/jaredsburrows/Rarcrack"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ davidak ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index e08632154385..323d7075a79c 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -219,7 +219,7 @@ in stdenv.mkDerivation rec { * keyart: creates a random ASCII art of a PGP key file * gpg-key2latex: generate LaTeX file with fingerprint paper slips ''; - license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ]; + license = with licenses; [ bsd2 bsd3 gpl2Only gpl2Plus gpl3Plus ]; maintainers = with maintainers; [ primeos ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index a7c937f03ee0..110174d1a8bb 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A program for calculating fuzzy hashes"; mainProgram = "ssdeep"; homepage = "http://www.ssdeep.sf.net"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index ae1a42a944d3..0ad36688bd6b 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Wrapper to safely torify applications"; mainProgram = "torsocks"; homepage = "https://gitlab.torproject.org/tpo/core/torsocks"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 0d9653f27918..e41e22c3a25d 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Secure file wiping utility"; mainProgram = "wipe"; homepage = "https://wipe.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.abbradar ]; }; diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index 5dd024e573d4..7f8058433a1d 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { recognises key combinations and can handle press, repeat and release events. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"; platforms = platforms.linux; mainProgram = "actkbd"; diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 6ec57c253e89..1dd26e5b3c1b 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Intel AMT® SoL client + tools"; homepage = "https://www.kraxel.org/cgit/amtterm/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; }) diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index 1109def2bf30..ee53e9d1cbfb 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Console progress bar"; homepage = "https://clpbar.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.rdnetto ]; platforms = lib.platforms.all; mainProgram = "bar"; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 5dcd85448375..bbcc9f704bc4 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Daemon which collects system performance statistics periodically"; homepage = "https://collectd.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 8c3ca0dc2b40..922fdbd2a1c6 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettimeofday and clock_gettime system calls. ''; homepage = "https://packages.qa.debian.org/d/datefudge.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; mainProgram = "datefudge"; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 395b4431acee..0814055d4839 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "https://dcfldd.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 8b54b77e8a2c..95f46833cf20 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description="A command scheduler with extended capabilities over cron and anacron"; homepage = "http://fcron.free.fr"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 1796661c7d4c..d73d8dda7a77 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexible IO Tester - an IO benchmark tool"; homepage = "https://git.kernel.dk/cgit/fio/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 900dabf834b5..b2844c950200 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; mainProgram = "gdmap"; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index ea6b12ac5eb0..254aa3e82c42 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://www.rodsbooks.com/gdisk/"; platforms = platforms.all; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 99ffe50786ec..462ef09aca04 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://hardinfo.org/"; description = "Display information about your hardware and operating system"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ bjornfor ]; platforms = [ "x86_64-linux" "i686-linux" ]; # ARMv7 and AArch64 are unsupported mainProgram = "hardinfo"; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index cc986d453569..b0a2765ddfe1 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cron-like daemon which handles filesystem events"; homepage = "https://github.com/ar-/incron"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index c2616797da38..ba3e5f1c7ffa 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ior.readthedocs.io/en/latest/"; description = "Parallel file system I/O performance test"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ bzizou ]; }; diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index a5a2f7e2ef0d..3c9c6435ffbe 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Python script to control NZXT cooler Kraken X52/X62/X72"; homepage = "https://github.com/KsenijaS/krakenx"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index 0ca1aa441db7..088f8cf281eb 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/ledmon"; description = "Enclosure LED Utilities"; platforms = platforms.linux; - license = with licenses; [ gpl2 ]; + license = with licenses; [ gpl2Only ]; maintainers = with lib.maintainers; [ sorki ]; }; } diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix index 27e33a22d4b9..c9ef1b541d4f 100644 --- a/pkgs/tools/system/loadwatch/default.nix +++ b/pkgs/tools/system/loadwatch/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Run a program using only idle cycles"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ woffs ]; platforms = platforms.all; }; diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index 7753ed804e16..cb4f6768f236 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A userspace utility for testing the memory subsystem for faults"; homepage = "http://pyropus.ca/software/memtester/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; mainProgram = "memtester"; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index a43b2ff7f202..79f96cccf39f 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://proot-me.github.io"; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ]; mainProgram = "proot"; }; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 5867670424d5..6a8e5ec0be19 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; broken = stdenv.isDarwin; # https://github.com/amanusk/s-tui/issues/49 mainProgram = "s-tui"; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index d224b96d89dc..5a03c69d7e84 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; mainProgram = "setserial"; }; } diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 0334ed757b36..1f66c26578db 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "stress"; }; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 191f9466f339..383c281bd212 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://oldmanprogrammer.net/source.php?dir=projects/tree"; description = "Command to produce a depth indented directory listing"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala dircolors if diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index ee51a861d87e..26a8afa951af 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "Task spooler - batch queue"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ viric ]; platforms = platforms.all; mainProgram = "ts"; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index 8cc7b338ca96..d969d2f61a1c 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "vbetool"; }; } diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 37980719a274..2f1f450ada15 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -39,7 +39,7 @@ gccStdenv.mkDerivation rec { description = "A command line program which draws, removes, and repairs ASCII art boxes"; mainProgram = "boxes"; homepage = "https://boxes.thomasjensen.com"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ waiting-for-dev ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index db57243efdc2..38d1ba5e06e4 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; []; }; } diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 23112e83b8c8..751b969e4469 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://www.convertlit.com/"; description = "A tool for converting Microsoft Reader ebooks to more open formats"; mainProgram = "clit"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 7015bd4453cb..f3098a22f41a 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/tools/text/lv/default.nix index 48ed867c8e4c..ad76cf51d11f 100644 --- a/pkgs/tools/text/lv/default.nix +++ b/pkgs/tools/text/lv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Powerful multi-lingual file viewer / grep"; homepage = "https://web.archive.org/web/20160310122517/www.ff.iij4u.or.jp/~nrt/lv/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ kayhide ]; }; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 06dcdcd8a9ba..7af363405102 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Interpreter for the AWK Programming Language"; mainProgram = "mawk"; homepage = "https://invisible-island.net/mawk/mawk.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index 78b6ee79ea0f..ba25b68fd7f5 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "https://multitran.sourceforge.net/"; description = "Multitran data english-russian"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index c10a65c271d4..99f15b8b21ed 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index b035ce32cbf1..5efb57ddff92 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 41f17560d286..5ebb45cf98b8 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 06317fe3043b..adb54f170095 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index 9a9ecf0b2675..f37a8f1bd342 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; mainProgram = "mtquery"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 3f8338d6ae08..480c07f9cdcc 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mainProgram = "odt2txt"; homepage = "https://github.com/dstosberg/odt2txt"; platforms = lib.platforms.all; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 7dec478a6342..2ab51fa24a30 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; homepage = "https://getpopfile.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; # Should work on macOS, but havent tested it. # Windows support is more complicated. diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index 1b4e89408dc8..b565de537629 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { description = "Replace strings in files"; mainProgram = "rpl"; homepage = "https://github.com/rrthomas/rpl"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ cbley ]; }; } diff --git a/pkgs/tools/text/subedit/default.nix b/pkgs/tools/text/subedit/default.nix index fede6583e788..9bacdc23de0d 100644 --- a/pkgs/tools/text/subedit/default.nix +++ b/pkgs/tools/text/subedit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://github.com/helixarch/subedit"; description = "Command-line subtitle editor written in BASH"; mainProgram = "subedit"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ppom ]; }; } diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index ae70bd9f561e..66f8fd2a6509 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; homepage = "http://dag.wieers.com/home-made/unoconv/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix index f51a41e5f343..eb84ff8d7037 100644 --- a/pkgs/tools/typesetting/bibclean/default.nix +++ b/pkgs/tools/typesetting/bibclean/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files"; homepage = "http://ftp.math.utah.edu/pub/bibclean"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 09285cf2843b..b695ff9ebec3 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Creates djvu files from PDF files"; homepage = "https://jwilk.net/software/pdf2djvu"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; mainProgram = "pdf2djvu"; }; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 377a7f7bf432..8343e382c807 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with lib; { description = "OCR tool for scanned PDFs"; homepage = "http://www.tobias-elze.de/pdfsandwich/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.rps ]; platforms = platforms.linux; mainProgram = "pdfsandwich"; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index eb9178c33b83..4cff637d7706 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { Acrobat PDF converter. ''; homepage = "https://nllgg.nl/Ted/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; broken = stdenv.isDarwin; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/typesetting/tex/catdvi/default.nix b/pkgs/tools/typesetting/tex/catdvi/default.nix index 1958a2f4c073..fe0f22bd95b0 100644 --- a/pkgs/tools/typesetting/tex/catdvi/default.nix +++ b/pkgs/tools/typesetting/tex/catdvi/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://catdvi.sourceforge.net"; description = "A DVI to plain text translator"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; }; }) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index b6293ffbc539..acb59fd21bdb 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Toolkit for RTMP streams"; homepage = "https://rtmpdump.mplayerhq.hu/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 8e6d0baf7e72..67c35d838fc7 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; mainProgram = "swfmill"; }; diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 6ec52db7ebfd..a7fff1c44141 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 3b3391284f07..983bf16e100d 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "VNC recorder"; homepage = "http://ronja.twibright.com/utils/vncrec/"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; mainProgram = "vncrec"; }; } diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/tools/virtualization/xva-img/default.nix index bb5c9d5a5992..09eb5745e570 100644 --- a/pkgs/tools/virtualization/xva-img/default.nix +++ b/pkgs/tools/virtualization/xva-img/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { maintainers = with lib.maintainers; [ lheckemann willibutz ]; description = "Tool for converting Xen images to raw and back"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "xva-img"; }; From 4dfc94628b0899ac83954c7ea22d33cb6e53a37a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 21:08:23 +0200 Subject: [PATCH 040/116] python312Packages.hstspreload: 2024.4.1 -> 2024.5.1 Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.4.1...2024.5.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index f8c4e32faf94..b4d58c36cf4f 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.4.1"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-kbcUf06tgVgr5qu5YSCwHtlBVzUEEqF1A/D+4RCnUcc="; + hash = "sha256-Ut2VhU2+o4wm4WY4zz/25EyDLvrYoBu3iVFkx3FZVYo="; }; build-system = [ From d7d078e8e5e3dd2882fb45811eb7b75dd1d8a0f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 21:09:56 +0200 Subject: [PATCH 041/116] python312Packages.hstspreload: format with nixfmt --- .../python-modules/hstspreload/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index b4d58c36cf4f..692cd31354ed 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -19,16 +20,12 @@ buildPythonPackage rec { hash = "sha256-Ut2VhU2+o4wm4WY4zz/25EyDLvrYoBu3iVFkx3FZVYo="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests require network connection doCheck = false; - pythonImportsCheck = [ - "hstspreload" - ]; + pythonImportsCheck = [ "hstspreload" ]; meta = with lib; { description = "Chromium HSTS Preload list as a Python package and updated daily"; From bf489d56a3e4641ba3396eabcad76d228493239f Mon Sep 17 00:00:00 2001 From: SiriusStarr <2049163+SiriusStarr@users.noreply.github.com> Date: Thu, 2 May 2024 11:57:31 -0700 Subject: [PATCH 042/116] lunatask: 1.7.8 -> 2.0.0 --- pkgs/applications/misc/lunatask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 4bdb6cca92ca..84ad583c63b5 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "1.7.8"; + version = "2.0.0"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-DhTWD9uL7zKWiRfeLYKxPtmAy1yR20wjlVA+N33YgpQ="; + sha256 = "sha256-rRE7VE6Fugqbbv/fTIZGuWDQmTP1tRDiKrb6VcpsBjk="; }; appimageContents = appimageTools.extractType2 { From 671704283bef4740392b29795079e691f038f4e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 19:28:01 +0000 Subject: [PATCH 043/116] regal: 0.21.2 -> 0.21.3 --- pkgs/by-name/re/regal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 70f6058c674a..d97004f6439b 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { name = "regal"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-YGUXJ5rfzyLwqhOLBuIRdN1G0fTcrPmuIsYKS/CzzW4="; + hash = "sha256-MeEamVAETl+PJXJ2HpbhYdEG3kqvEeT5bGzRHyTrjcY="; }; vendorHash = "sha256-5rj2dCWya24VUmIFf0oJQop80trq9NnqqFlBW/A6opk="; From df51baedee926c7251f26009c1816e438b12587b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 May 2024 22:18:15 +0200 Subject: [PATCH 044/116] utm: 4.4.5 -> 4.5.2 --- pkgs/os-specific/darwin/utm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 50f84a254dfc..4915b9b54d78 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.4.5"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-FlIPSWqY2V1akd/InS6BPEBfc8pomJ8jgDns7wvaOm8="; + hash = "sha256-pBRmtHXnw9BoFeaCCokk5hulChdEFl9dENbL8zzXMzs="; }; nativeBuildInputs = [ undmg makeWrapper ]; @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation rec { See https://docs.getutm.app/ for more information. ''; homepage = "https://mac.getutm.app/"; - changelog = "https://github.com/utmapp/${pname}/releases/tag/v${version}"; + changelog = "https://github.com/utmapp/utm/releases/tag/v${version}"; mainProgram = "UTM"; license = licenses.asl20; platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. From f22336fda52bbe6d1c7be8f8bcd0f78736cfa9a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 May 2024 22:23:27 +0200 Subject: [PATCH 045/116] zenith: 0.14.0-unstable-2023-11-21 -> 0.14.1 --- pkgs/tools/system/zenith/Cargo.lock | 755 +++++++++++++++++---------- pkgs/tools/system/zenith/default.nix | 8 +- 2 files changed, 473 insertions(+), 290 deletions(-) diff --git a/pkgs/tools/system/zenith/Cargo.lock b/pkgs/tools/system/zenith/Cargo.lock index 0c7828d6a445..ff6923e055f3 100644 --- a/pkgs/tools/system/zenith/Cargo.lock +++ b/pkgs/tools/system/zenith/Cargo.lock @@ -35,16 +35,29 @@ dependencies = [ ] [[package]] -name = "async-executor" -version = "1.5.4" +name = "async-channel" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ - "async-lock", + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 2.2.0", "slab", ] @@ -54,10 +67,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -66,20 +79,39 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.25", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +dependencies = [ + "async-lock 3.3.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.5.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -89,15 +121,26 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + [[package]] name = "async-net" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ - "async-io", + "async-io 1.13.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -106,50 +149,50 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener 3.0.0", - "futures-lite", - "rustix 0.38.19", - "windows-sys", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", + "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", - "async-lock", + "async-io 2.3.1", + "async-lock 2.8.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.19", + "rustix 0.38.31", "signal-hook-registry", "slab", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.1" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -175,23 +218,24 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", "log", - "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.52", "which", ] @@ -203,31 +247,31 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.2.0", "piper", "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "byte-unit" @@ -253,12 +297,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723" [[package]] name = "cexpr" @@ -283,43 +324,43 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.4", ] [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.2", ] [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -327,51 +368,43 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -379,7 +412,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -400,9 +433,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.10.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -410,27 +443,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.10.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "darling_macro" -version = "0.10.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -482,27 +515,27 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "log", ] [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -513,15 +546,57 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -555,9 +630,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -570,9 +645,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -580,15 +655,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -597,9 +672,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -617,39 +692,52 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "futures-lite" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -665,9 +753,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -881,31 +969,31 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -946,7 +1034,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -959,10 +1047,19 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.64" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -981,9 +1078,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -995,6 +1092,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164" +dependencies = [ + "cfg-if 1.0.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -1003,15 +1121,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "linux-taskstats" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fdd14efd42f7d3383f76d5da9cbc1056ac6497be7352eadfabef14a5d699c0" +checksum = "ced563164e6cf093308728858ac54a04c957c5e820e6452e19801102f72a847c" dependencies = [ "bindgen", "libc", @@ -1022,9 +1140,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1032,9 +1150,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "macaddr" @@ -1053,9 +1171,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -1075,15 +1193,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1092,23 +1201,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1132,7 +1241,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset", ] [[package]] @@ -1167,22 +1276,21 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -1199,9 +1307,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1213,7 +1321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" dependencies = [ "bitflags 1.3.2", - "libloading", + "libloading 0.7.4", "nvml-wrapper-sys", "static_assertions", "thiserror", @@ -1226,14 +1334,14 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-float" @@ -1246,9 +1354,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1262,15 +1370,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1279,12 +1387,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pin-project-lite" version = "0.2.13" @@ -1327,23 +1429,47 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.31", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "prettyplease" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn 2.0.52", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1354,11 +1480,11 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cassowary", "crossterm", "indoc", - "itertools", + "itertools 0.11.0", "paste", "strum", "unicode-segmentation", @@ -1376,9 +1502,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -1386,9 +1512,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1396,30 +1522,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -1446,29 +1563,29 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] @@ -1485,29 +1602,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -1550,9 +1667,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smol" @@ -1560,22 +1677,22 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -1606,9 +1723,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" @@ -1621,15 +1738,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -1645,9 +1762,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -1670,29 +1787,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", "tracing-core", @@ -1718,9 +1835,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -1750,21 +1867,21 @@ dependencies = [ ] [[package]] -name = "users" -version = "0.11.0" +name = "utf8-width" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "uzers" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" dependencies = [ "libc", "log", ] -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - [[package]] name = "waker-fn" version = "1.1.1" @@ -1779,9 +1896,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -1789,24 +1906,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1814,22 +1931,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "which" @@ -1840,7 +1957,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.19", + "rustix 0.38.31", ] [[package]] @@ -1872,12 +1989,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -1886,7 +2003,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -1895,13 +2021,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -1910,36 +2051,72 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -1947,20 +2124,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "wrapcenum-derive" -version = "0.4.0" +name = "windows_x86_64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "wrapcenum-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "zenith" -version = "0.14.0" +version = "0.14.1" dependencies = [ "bincode", "byte-unit", @@ -1985,5 +2168,5 @@ dependencies = [ "starship-battery", "sysinfo", "unicode-width", - "users", + "uzers", ] diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 7beaab4713a5..4af272ccb49d 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -11,13 +11,13 @@ assert nvidiaSupport -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.14.0-unstable-2023-11-21"; + version = "0.14.1"; src = fetchFromGitHub { owner = "bvaisvil"; - repo = pname; - rev = "0ed09e6a68c1517b4d050f5e3163421718226040"; - hash = "sha256-vw/ar2Qi06HxPfPsfcxtfRhMTqY4FCE+7tCfe9sLEv0="; + repo = "zenith"; + rev = version; + hash = "sha256-y+/s0TDVAFGio5uCzHjf+kHFZB0G8dDgTt2xaqSSz1c="; }; # remove cargo config so it can find the linker on aarch64-linux From c7ff1e36eca51eb92a3463ada44b08422edca355 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 22:26:37 +0200 Subject: [PATCH 046/116] python312Packages.pysendfile: refactor --- .../python-modules/pysendfile/default.nix | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index af3c07cb851c..d59a99926435 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,31 +1,40 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi -, python +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pysendfile"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "05qf0m32isflln1zjgxlpw0wf469lj86vdwwqyizp1h94x5l22ji"; + hash = "sha256-UQpBSycJhvujx5y3bZCkyRDHAb+0P/mDpdTpKEYFDhc="; }; - checkPhase = '' - # this test takes too long - sed -i 's/test_big_file/noop/' test/test_sendfile.py - ${python.executable} test/test_sendfile.py - ''; + build-system = [ + setuptools + ]; + + # Tests depend on asynchat and asyncore + doCheck = false; + + pythonImportsCheck = [ + "sendfile" + ]; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://github.com/giampaolo/pysendfile"; description = "A Python interface to sendfile(2)"; + homepage = "https://github.com/giampaolo/pysendfile"; + changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; + broken = stdenv.isDarwin; }; - } From d987921c24d820a47c6cbe0dbbd32c50ccc0f2af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 22:27:20 +0200 Subject: [PATCH 047/116] python312Packages.pysendfile: format with nixfmt --- .../python-modules/pysendfile/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index d59a99926435..0edd04ae331a 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,16 +19,12 @@ buildPythonPackage rec { hash = "sha256-UQpBSycJhvujx5y3bZCkyRDHAb+0P/mDpdTpKEYFDhc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests depend on asynchat and asyncore doCheck = false; - pythonImportsCheck = [ - "sendfile" - ]; + pythonImportsCheck = [ "sendfile" ]; meta = with lib; { description = "A Python interface to sendfile(2)"; From 30bc72655945382c5be451289604999f3575736a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 22:40:09 +0200 Subject: [PATCH 048/116] python312Packages.pyftpdlib: refactor --- .../development/python-modules/pyftpdlib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 5ff81a268f2e..1066a8bb2fb0 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -6,12 +6,13 @@ , pyopenssl , pysendfile , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyftpdlib"; version = "1.5.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pysendfile ]; @@ -45,9 +50,10 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous FTP server library"; - mainProgram = "ftpbench"; homepage = "https://github.com/giampaolo/pyftpdlib/"; + changelog = "https://github.com/giampaolo/pyftpdlib/blob/release-${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "ftpbench"; }; } From 624ceb79f78e4dee0ae0bc6fcad0ee2c77edee94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 22:40:29 +0200 Subject: [PATCH 049/116] python312Packages.pyftpdlib: format with nixfmt --- .../python-modules/pyftpdlib/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 1066a8bb2fb0..e154e6f9a1a8 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchPypi -, mock -, psutil -, pyopenssl -, pysendfile -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + psutil, + pyopenssl, + pysendfile, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -21,18 +22,12 @@ buildPythonPackage rec { hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pysendfile - ]; + dependencies = [ pysendfile ]; passthru.optional-dependencies = { - ssl = [ - pyopenssl - ]; + ssl = [ pyopenssl ]; }; nativeCheckInputs = [ @@ -44,9 +39,7 @@ buildPythonPackage rec { # on Hydra: https://hydra.nixos.org/build/84374861 doCheck = false; - pythonImportsCheck = [ - "pyftpdlib" - ]; + pythonImportsCheck = [ "pyftpdlib" ]; meta = with lib; { description = "Asynchronous FTP server library"; From a6350e4697a5647926cabfd0379b6433d3d14090 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Thu, 2 May 2024 22:30:27 +0100 Subject: [PATCH 050/116] rbw: add meta.mainProgram --- pkgs/tools/security/rbw/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 201c86c86162..e6d54c235940 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -77,5 +77,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; license = licenses.mit; maintainers = with maintainers; [ albakham luc65r ]; + mainProgram = "rbw"; }; } From 241f40db933c5cccdbedb876b9bb4db4b48111c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 23:45:40 +0200 Subject: [PATCH 051/116] python311Packages.logilab-common: refactor --- .../python-modules/logilab/common.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index b8fadc0832ad..57c65a703824 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,19 +1,19 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, setuptools , importlib-metadata , mypy-extensions -, typing-extensions , pytestCheckHook +, pythonOlder , pytz +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "logilab-common"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,11 +22,11 @@ buildPythonPackage rec { hash = "sha256-ojvR2k3Wpj5Ej0OS57I4aFX/cGFVeL/PmT7riCTelws="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ setuptools mypy-extensions typing-extensions @@ -44,10 +44,11 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python packages and modules used by Logilab "; - mainProgram = "logilab-pytest"; + description = "Python packages and modules used by Logilab"; homepage = "https://logilab-common.readthedocs.io/"; changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; + mainProgram = "logilab-pytest"; }; } From fe32cf5c0e007f1bfc7a72c69164ec88689cb878 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 23:47:56 +0200 Subject: [PATCH 052/116] python312Packages.logilab-common: fix test failure on Python 3.12 --- pkgs/development/python-modules/logilab/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 57c65a703824..cd700626cdd8 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -4,6 +4,7 @@ , importlib-metadata , mypy-extensions , pytestCheckHook +, pythonAtLeast , pythonOlder , pytz , setuptools @@ -22,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-ojvR2k3Wpj5Ej0OS57I4aFX/cGFVeL/PmT7riCTelws="; }; + postPatch = lib.optionals (pythonAtLeast "3.12") '' + substituteInPlace logilab/common/testlib.py \ + --replace-fail "_TextTestResult" "TextTestResult" + ''; + build-system = [ setuptools ]; From 54b74b21c32f0ff638c19ec3bc1ecf6a108b4fcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 23:48:41 +0200 Subject: [PATCH 053/116] python312Packages.logilab-common: format with nixfmt --- .../python-modules/logilab/common.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index cd700626cdd8..3e2797b6d675 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchPypi -, importlib-metadata -, mypy-extensions -, pytestCheckHook -, pythonAtLeast -, pythonOlder -, pytz -, setuptools -, typing-extensions +{ + lib, + buildPythonPackage, + fetchPypi, + importlib-metadata, + mypy-extensions, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + pytz, + setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -28,17 +29,13 @@ buildPythonPackage rec { --replace-fail "_TextTestResult" "TextTestResult" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ setuptools mypy-extensions typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; nativeCheckInputs = [ pytestCheckHook From 33a84830a5a7e6cdeded43a2ee5d48bc5d5f030a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:04:39 +0200 Subject: [PATCH 054/116] python312Packages.env-canada: 0.6.1 -> 0.6.2 Diff: https://github.com/michaeldavie/env_canada/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.6.2/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index f11b85d8bf7b..ecb117e8655f 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-6p4holWMAoaosmTL8AveRGuBS/MymC7usvK3I7CBEKQ="; + hash = "sha256-2lrZpjOdijE/udGRzUXT63xI+f9yI+04arfWdt6fMSA="; }; propagatedBuildInputs = [ From e5a425bb46cd92bd11cb907350b161a49de1231a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:10:39 +0200 Subject: [PATCH 055/116] trufflehog: 3.74.0 -> 3.75.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.74.0...v3.75.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.75.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 4c5a536c882f..aed1f4b89a96 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.74.0"; + version = "3.75.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-smG27WHWGe15Q0XIjeK4C45mEvJuYqsUf0SsaMyYGzs="; + hash = "sha256-C8yMJnxc0j5F5U854ukWEsS2m7966Czsbp+T3sNswY0="; }; - vendorHash = "sha256-FOFrFmILeONJyKGZ7I+sWd8Di0Ni6P5/buA5QbR41A4="; + vendorHash = "sha256-CEGb9utdXyu6Navapbp0C/cWoNOrc0woRe0WAF/vr/M="; proxyVendor = true; From 43576da46671ea94d0eb5ea7f4e0917fc2407af5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:12:16 +0200 Subject: [PATCH 056/116] qovery-cli: 0.91.1 -> 0.91.3 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.91.1...v0.91.3 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.91.3 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 71fe92169a28..8c991c03a1cb 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.91.1"; + version = "0.91.3"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-yu7S4i7mbHOV48YfIoacofQrNTEjFfQ5Ex2ZBXw5QjQ="; + hash = "sha256-Kdk3T699cfyIDAt1vo8nQAmkR7TanNmjjI9v80PMTuE="; }; - vendorHash = "sha256-RobQz/R7TlU3fBHBy9UmQfpjT9urTHTU8hl2++Wbo7I="; + vendorHash = "sha256-8u+V/D8Pr+VIy+6QbJYRQcfcpAbHEHN6TBitoYxgKHw="; nativeBuildInputs = [ installShellFiles ]; From eab9b27a24e83bd7434f180b28276657aaa2414d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:18:06 +0200 Subject: [PATCH 057/116] python312Packages.env-canada: refactor --- pkgs/development/python-modules/env-canada/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index ecb117e8655f..4b0fab97e95f 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , python-dateutil , pythonOlder +, setuptools , voluptuous }: buildPythonPackage rec { pname = "env-canada"; version = "0.6.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,11 @@ buildPythonPackage rec { hash = "sha256-2lrZpjOdijE/udGRzUXT63xI+f9yI+04arfWdt6fMSA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp geopy imageio From 30d4e8d7a1a29fdab57471bc4cd6728bf8f7676e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:18:36 +0200 Subject: [PATCH 058/116] grype: 0.77.1 -> 0.77.2 Diff: https://github.com/anchore/grype/compare/refs/tags/v0.77.1...v0.77.2 Changelog: https://github.com/anchore/grype/releases/tag/v0.77.2 --- pkgs/by-name/gr/grype/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 645c9cadb4fc..60154ce825a9 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.1"; + version = "0.77.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI="; + hash = "sha256-opDuyuh7rtdFVfxKHyLUAf4ySqiSg0bAUW0dV+PHXFA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -90,6 +90,8 @@ buildGoModule rec { --replace-fail "TestAllNames" "SkipAllNames" substituteInPlace test/cli/version_cmd_test.go \ --replace-fail "TestVersionCmdPrintsToStdout" "SkipVersionCmdPrintsToStdout" + substituteInPlace grype/presenter/sarif/presenter_test.go \ + --replace-fail "Test_SarifIsValid" "SkipTest_SarifIsValid" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go @@ -103,10 +105,9 @@ buildGoModule rec { ''; meta = with lib; { + description = "Vulnerability scanner for container images and filesystems"; homepage = "https://github.com/anchore/grype"; changelog = "https://github.com/anchore/grype/releases/tag/v${version}"; - description = "Vulnerability scanner for container images and filesystems"; - mainProgram = "grype"; longDescription = '' As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. @@ -117,5 +118,6 @@ buildGoModule rec { jk kashw2 ]; + mainProgram = "grype"; }; } From 2418a9ed49ad476d5293d10aaec47b194c105249 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:27:09 +0200 Subject: [PATCH 059/116] python312Packages.heatzypy: 2.2.0 -> 2.5.4 Changelog: https://github.com/cyr-ius/heatzypy/releases/tag/2.5.4 --- pkgs/development/python-modules/heatzypy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 9093afc2353a..e2b903404364 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -6,12 +6,12 @@ , pytestCheckHook , pythonOlder , setuptools -, wheel +, setuptools-scm }: buildPythonPackage rec { pname = "heatzypy"; - version = "2.2.0"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-Q6v1Ob1PY8tpMnd8hchepq983dsZ6lJPCKz83RRwL3w="; + hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel + setuptools-scm ]; propagatedBuildInputs = [ From c677e5425bb7f695455e21d9d32034cdeffb90c5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 3 May 2024 01:25:06 +0200 Subject: [PATCH 060/116] python312Packages.domeneshop: 0.4.3 -> 0.4.4 changelog: https://github.com/domeneshop/python-domeneshop/releases/tag/v0.4.4 --- pkgs/development/python-modules/domeneshop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix index ab01424c0940..8778dfc6aa93 100644 --- a/pkgs/development/python-modules/domeneshop/default.nix +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "domeneshop"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-kL0X1mEsmVWqnq5NgsMBxeAu48zjmi3muhZYryTCOMo="; + hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "domeneshop" ]; meta = with lib; { + changelog = "https://github.com/domeneshop/python-domeneshop/releases/tag/v${version}"; description = "Python library for working with the Domeneshop API"; homepage = "https://api.domeneshop.no/docs/"; license = licenses.mit; From 18ca45c49b764bf20312491e2a5f97641c7be501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:28:55 +0200 Subject: [PATCH 061/116] python312Packages.heatzypy: refactor --- pkgs/development/python-modules/heatzypy/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index e2b903404364..ecacab2260ef 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, requests , pytestCheckHook , pythonOlder , setuptools @@ -23,19 +22,13 @@ buildPythonPackage rec { hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "replace_by_workflow" "${version}" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - requests ]; # Module has no tests From c2ea4283a98b8c577661131219cacd6232332e3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:29:18 +0200 Subject: [PATCH 062/116] python312Packages.heatzypy: format with nixfmt --- .../python-modules/heatzypy/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index ecacab2260ef..843c8cbf1348 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -27,16 +28,12 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "heatzypy" - ]; + pythonImportsCheck = [ "heatzypy" ]; meta = with lib; { description = "Module to interact with Heatzy devices"; From ab337daa1b3caa71bd228f67d36c7f44b3c14672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 23:53:58 +0000 Subject: [PATCH 063/116] evcc: 0.124.10 -> 0.126.1 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index aa701e92b1ed..ba41a9dc7210 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,20 +21,20 @@ in buildGoModule rec { pname = "evcc"; - version = "0.124.10"; + version = "0.126.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-NbM8Uev2qIIS6WriP7QnVUumF29rZSOCavouPkPmYpE="; + hash = "sha256-qNH1YdKQZptTGGOf/Nh4pBOpWCSgnq+JltF2OjlVGDk="; }; - vendorHash = "sha256-PZWMqv3R4Dq4cLtGNuvHCQ/GiYvlKJfSKEmBn0JYnb8="; + vendorHash = "sha256-jJOxFkoVBT1NrnhntHPa2/irjHD09zKbtNDQoyelJp4="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-FWnRZ/NI49QZj8Uv6IbHc8IPAh3F5u4S6hY64B8+Uvk="; + hash = "sha256-KW2aVK3Ui5sGBcNhTsNXUr9HyHcm0iJxxzBUjrNWrqw="; }; nativeBuildInputs = [ From b4f198803898fa50442efa1316560c182e1a2cd7 Mon Sep 17 00:00:00 2001 From: nuko Date: Wed, 24 Apr 2024 12:02:42 +1200 Subject: [PATCH 064/116] wpaperd: 0.3.0 -> 1.0.1 & mv to by-name --- .../wp/wpaperd/package.nix} | 26 +- pkgs/tools/wayland/wpaperd/Cargo.lock | 2041 ----------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 9 insertions(+), 2060 deletions(-) rename pkgs/{tools/wayland/wpaperd/default.nix => by-name/wp/wpaperd/package.nix} (63%) delete mode 100644 pkgs/tools/wayland/wpaperd/Cargo.lock diff --git a/pkgs/tools/wayland/wpaperd/default.nix b/pkgs/by-name/wp/wpaperd/package.nix similarity index 63% rename from pkgs/tools/wayland/wpaperd/default.nix rename to pkgs/by-name/wp/wpaperd/package.nix index dc7ce198e8e7..f059b22640a7 100644 --- a/pkgs/tools/wayland/wpaperd/default.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -1,35 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon, wayland, libGL }: rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "0.3.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "danyspin97"; - repo = pname; + repo = "wpaperd"; rev = version; - sha256 = "cgjHCSBrkX3aoz42qBS/1JUGhc7sZKarKByntp7ubaQ="; + hash = "sha256-5riZ/6yjgsW++SUIyJP5rFG65tkjJKgtvDLIGaoiHN0="; }; + cargoHash = "sha256-EkCGLxUQeSCR88Y95Hog9TAjpYMmZHlOqEM//ENiCco="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ + wayland + libGL libxkbcommon ]; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "smithay-client-toolkit-0.16.0" = "iPDL7pxTez4EnIBaUH25lLSWpu3RRL2QBF9pfdTDsP8="; - }; - }; - - postPatch = '' - rm Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; - meta = with lib; { description = "Minimal wallpaper daemon for Wayland"; longDescription = '' @@ -41,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/danyspin97/wpaperd"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ DPDmancul ]; + maintainers = with maintainers; [ DPDmancul nu-nu-ko ]; mainProgram = "wpaperd"; }; } diff --git a/pkgs/tools/wayland/wpaperd/Cargo.lock b/pkgs/tools/wayland/wpaperd/Cargo.lock deleted file mode 100644 index ea07ee7e61dd..000000000000 --- a/pkgs/tools/wayland/wpaperd/Cargo.lock +++ /dev/null @@ -1,2041 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap 2.34.0", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitreader" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84ea71c85d1fe98fe67a9b9988b1695bc24c0b0d3bfb18d4c510f44b4b09941" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytemuck" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "calloop" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192" -dependencies = [ - "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi 0.3.9", -] - -[[package]] -name = "clang-sys" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim 0.10.0", - "termcolor", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" -dependencies = [ - "clap 4.1.6", -] - -[[package]] -name = "clap_derive" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_mangen" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48283ce8d5cd9513633949a674a0442bcb507ab61ed6533863437052ddbb494b" -dependencies = [ - "clap 4.1.6", - "roff", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color-eyre" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" -dependencies = [ - "backtrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset 0.7.1", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dav1d" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7284148338177cb1cd0d0cdd7bf26440f8326999063eed294aa7d77b46a7e263" -dependencies = [ - "dav1d-sys", -] - -[[package]] -name = "dav1d-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e40c4c77d141a3b70113ee45a1502b9c80e24f176958d39a8361abcf30c883" -dependencies = [ - "bindgen", - "system-deps", -] - -[[package]] -name = "dcv-color-primitives" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1457f4dd8395fef9f61996b5783b82ed7b234b4b55e1843d04e07fded0538005" -dependencies = [ - "paste", - "wasm-bindgen", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fallible_collections" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f57ccc32870366ae684be48b32a1a2e196f98a42a9b4361fe77e13fd4a34755" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "figment" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9" -dependencies = [ - "atomic", - "serde", - "toml 0.5.11", - "uncased", - "version_check", -] - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "010b5c83ec9d37d9636aa37132b777ef0818949b217109de9b88784e923bbf3a" -dependencies = [ - "atty", - "chrono", - "glob", - "lazy_static", - "log", - "nu-ansi-term", - "thiserror", -] - -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hotwatch" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39301670a6f5798b75f36a1b149a379a50df5aa7c71be50f4b41ec6eab445cb8" -dependencies = [ - "log", - "notify", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "image" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "dav1d", - "dcv-color-primitives", - "jpeg-decoder", - "mp4parse", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "is-terminal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mp4parse" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d2b6c6932c2cce721e9bd213461412300466d4613d93d25a36fb8881d9f8de" -dependencies = [ - "bitreader", - "byteorder", - "env_logger 0.8.4", - "fallible_collections", - "log", - "num-traits", - "static_assertions", -] - -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "new_mime_guess" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - -[[package]] -name = "notify" -version = "4.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi 0.3.9", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "paste" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "git+https://github.com/Smithay/client-toolkit#a3d1af852a607587114ccc6631c87046ecc898d3" -dependencies = [ - "bitflags", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2", - "nix 0.26.2", - "pkg-config", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml 0.5.11", - "version-compare", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" -dependencies = [ - "rustix", - "windows-sys", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5" -dependencies = [ - "indexmap", - "nom8", - "serde", - "serde_spanned", - "toml_datetime", -] - -[[package]] -name = "uncased" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wayland-backend" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ebd48bfc1178c9190c7ff80cc822b3335ffc83141e9aa723168f377257623e" -dependencies = [ - "cc", - "downcast-rs", - "io-lifetimes", - "nix 0.26.2", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bde68449abab1a808e5227b6e295f4ae3680911eb7711b4a2cb90141edb780" -dependencies = [ - "bitflags", - "calloop", - "log", - "nix 0.26.2", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-cursor" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" -dependencies = [ - "nix 0.26.2", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" -dependencies = [ - "bitflags", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" -dependencies = [ - "bitflags", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4834c14b3edf1d9986c83ca79b1e7e3afbe9874c7c144702f6467063259ce45d" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "wpaperd" -version = "0.3.0" -dependencies = [ - "clap 4.1.6", - "clap_complete", - "clap_mangen", - "color-eyre", - "dirs", - "figment", - "flexi_logger", - "hotwatch", - "humantime-serde", - "image", - "log", - "mime", - "new_mime_guess", - "nix 0.26.2", - "rand", - "serde", - "smithay-client-toolkit", - "toml 0.7.2", - "walkdir", - "xdg", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xdg" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebd18cd5bb68..b5b21c1fa2f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4800,8 +4800,6 @@ with pkgs; wob = callPackage ../tools/wayland/wob { }; - wpaperd = callPackage ../tools/wayland/wpaperd { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; wtype = callPackage ../tools/wayland/wtype { }; From e207abf7969ccf0a7f1e8ca2a27836111b25a978 Mon Sep 17 00:00:00 2001 From: nuko Date: Thu, 25 Apr 2024 17:25:26 +1200 Subject: [PATCH 065/116] Release Notes: breaking wpaperd config change in 1.0.+ --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 5f2c384473da..a252d2715e76 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -347,6 +347,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details. +- The `wpaperd` package has a breaking change moving to 1.0.1, previous version 0.3.0 had 2 different configuration files, one for wpaperd and one for the wallpapers. Remove the former and move the latter (`wallpaper.toml`) to `config.toml`. + - Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version. - Paths provided as `restartTriggers` and `reloadTriggers` for systemd units will now be copied into the nix store to make the behavior consistent. From c3214a332a00827140392af315614734915977a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 00:44:42 +0000 Subject: [PATCH 066/116] systemctl-tui: 0.3.3 -> 0.3.4 --- pkgs/by-name/sy/systemctl-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 23a831e9e9c5..fa67d8906211 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.3"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - hash = "sha256-oFXLxWS2G+CkG0yuJLkA34SqoGGcXU/eZmFMRYw+Gzo="; + hash = "sha256-yEBh8A0mWXVBkbemPEhvSNgsP+YF/WiLYKMkOPCa6e4="; }; - cargoHash = "sha256-MKxeRQupgAxA2ui8qSK8BvhxqqgjJarD8pY9wmk8MvA="; + cargoHash = "sha256-IaDAQ9EHkcwwI2z0c8YNIgbjs2zwMblHbCKF0E92+V8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 11c80ace5650f4783ac429fc9596b3c5da154bd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 01:11:57 +0000 Subject: [PATCH 067/116] focuswriter: 1.8.6 -> 1.8.7 --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 179cbb0fdbf6..618ea2f471a2 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-z3DQaMgaTjzj2Oh1QI7A5v9G7GxjlGj/7jInxH/tDaY="; + hash = "sha256-op76oHVo6yCpXzRFYAYXMCEslCgDA6jXPcgWdTeGJ+E="; }; nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; From 4df49577f7df299d22a59c396e0e9e874d7ffeeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 01:38:30 +0000 Subject: [PATCH 068/116] squashfs-tools-ng: 1.3.0 -> 1.3.1 --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 0d4ca4942165..e31d548fd156 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "sha256-X5HfXrTUrmtvYT6bfNNG2vRTc6GwZcbBsIkahqvhPo8="; + sha256 = "sha256-ByjoJfGM4a8OwAkK6YkmZeYVkLuUkQ8SvwgQuHT9zn8="; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; From 032c84e0ae1be1f78f0c642f9e591953962fdb2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:01:50 +0000 Subject: [PATCH 069/116] cargo-generate: 0.20.0 -> 0.21.0 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index dd6630d8d309..a63d82ddf295 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-k4bTuTRZMWx8mMi/hdAr4YPCWqe39fG8nkmHH2D80ew="; + sha256 = "sha256-utJYgbmCLi7rWKsRDZqJDCtEbVijAjnMqpYoALKO+Ho="; }; - cargoHash = "sha256-wi1Y1eU+v9Q/4nkLNCUluPlDGfz6ld8nuVWR9orkDV4="; + cargoHash = "sha256-9rgdpoXNKaw850EnK6jDwT+jba/B/66PqQackx2knuk="; nativeBuildInputs = [ pkg-config ]; From 6bf4dfeff0f674e2de737c345fabbcd80727c9a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:33:57 +0000 Subject: [PATCH 070/116] kubecolor: 0.3.1 -> 0.3.2 --- pkgs/applications/networking/cluster/kubecolor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 1869cc83d916..589b93cd2f72 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1gEEmF9RRMwFAvmhLwidkVh+lnibs6x5ZHy/nJRum9E="; + sha256 = "sha256-9fL1zuhQ1B8QpJXcGVxg8mqIQoM5ZhwuE000rDcrrw0="; }; vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; From ebbc3841374d7fff4cf849795c923e81cda7c19f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:39:25 +0000 Subject: [PATCH 071/116] randoop: 4.3.2 -> 4.3.3 --- pkgs/development/tools/analysis/randoop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index f5936704e304..552f5fef7cae 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.3.2"; + version = "4.3.3"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-lcYI0Yns/R5VeOUG68Xe8h1BO8wlKvL1CZIqzWkgsqo="; + sha256 = "sha256-x9kAoVa4wvUp3gpg9GCodvjwql3CBtn5EqJIZYSSqVI="; }; nativeBuildInputs = [ unzip ]; From f7ad4763800029781070471f32e0144c10bd5aa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:47:52 +0000 Subject: [PATCH 072/116] rain: 1.8.5 -> 1.8.6 --- pkgs/development/tools/rain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 340dc3085a8a..8132c2370458 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AI7P5X9LNjXUQBkYTE0PCQ0xvK1CscVjnauoNVYp3GY="; + sha256 = "sha256-wQ767MgLSdcNm3Z1HL8VgmUk2tMFmIyACMaMhPr4lmY="; }; - vendorHash = "sha256-CD7W+y/vQwWe7JFTl8+Zl7IKE88+Mu+Vvdr7Q1S+90w="; + vendorHash = "sha256-SXgyxf8pqSZzlMoOissGLBfeXueY4aSkCcd7ahT2KMA="; subPackages = [ "cmd/rain" ]; From e0f35b176caf61d039d80fc1abb9ba91251f3ae8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:50:04 +0000 Subject: [PATCH 073/116] ttfb: 1.11.0 -> 1.12.0 --- pkgs/development/tools/ttfb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index 145144528fef..c2c599f32ff7 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.11.0"; + version = "1.12.0"; src = fetchCrate { inherit pname version; - hash = "sha256-38mhwYfWoMZzdbkgv65hBpX23wCpAWwiahuzO5xRpmA="; + hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-Gqv4XvG3aYMRdMP1mzUlsCPN+NMLHq2nf283KBQCems=="; + cargoHash = "sha256-U8CG0GqnUwya+ZK0qXtOFZ/MbbqSvB5egX7XJKtl88g="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. From f10b660d623a6e219fd1a41c8e7793762aa6643e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 13:29:32 -0300 Subject: [PATCH 074/116] SDL2_mixer: adopted by AndersonTorres --- pkgs/development/libraries/SDL2_mixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index d9e8d7e774a7..eaf51d1d77f8 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; license = licenses.zlib; }; } From ba650ad0144bbeae17ce74dc5a718719db988b47 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 18:39:11 -0300 Subject: [PATCH 075/116] SDL2_mixer: refactor - finalAttrs - use fetchFromGitHub (since the url is deactivated) - strictDeps - no nested with --- .../libraries/SDL2_mixer/default.nix | 90 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index eaf51d1d77f8..c271614d8f5f 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,47 +1,40 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, AudioToolbox -, AudioUnit -, CoreServices -, SDL2 -, flac -, fluidsynth -, libmodplug -, libogg -, libvorbis -, mpg123 -, opusfile -, smpeg2 -, timidity +{ + lib, + SDL2, + darwin, + fetchFromGitHub, + flac, + fluidsynth, + libmodplug, + libogg, + libvorbis, + mpg123, + opusfile, + pkg-config, + smpeg2, + stdenv, + timidity, }: -stdenv.mkDerivation rec { +let + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; +in +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; version = "2.8.0"; - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-HPs0yHsm29vHr9aMT1RcARarX5C7/sxa6+Kpy0uzFUk="; + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "release-${finalAttrs.version}"; + hash = "sha256-jLKawxnwP5dJglUhgHfWgmKh27i32Rr4LcJQdpXasco="; }; - configureFlags = [ - "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mod-modplug-shared" - "--disable-music-mp3-mpg123-shared" - "--disable-music-opus-shared" - "--disable-music-midi-fluidsynth-shared" - - # override default path to allow MIDI files to be played - "--with-timidity-cfg=${timidity}/share/timidity/timidity.cfg" - ] ++ lib.optionals stdenv.isDarwin [ - "--disable-sdltest" - "--disable-smpegtest" + nativeBuildInputs = [ + SDL2 + pkg-config ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit @@ -64,11 +57,26 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with lib; { - description = "SDL multi-channel audio mixer library"; - platforms = platforms.unix; + strictDeps = true; + + configureFlags = [ + (lib.enableFeature false "music-ogg-shared") + (lib.enableFeature false "music-flac-shared") + (lib.enableFeature false "music-mod-modplug-shared") + (lib.enableFeature false "music-mp3-mpg123-shared") + (lib.enableFeature false "music-opus-shared") + (lib.enableFeature false "music-midi-fluidsynth-shared") + (lib.enableFeature (!stdenv.isDarwin) "sdltest") + (lib.enableFeature (!stdenv.isDarwin) "smpegtest") + # override default path to allow MIDI files to be played + (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") + ]; + + meta = { homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.zlib; + description = "SDL multi-channel audio mixer library"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffe55bb47fc7..0b889594b56d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24340,9 +24340,7 @@ with pkgs; }; }); - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; - }; + SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; # SDL2_mixer_2_0 pinned for lzwolf SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; From 5fa2bdc79d6f9198c93275aecd606571c020cba1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 18:50:05 -0300 Subject: [PATCH 076/116] SDL2_mixer_2_0: refactor - get rid of rec - use fetchFromGitHub (since the url is deactivated) --- pkgs/development/libraries/SDL2_mixer/2_0.nix | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/2_0.nix b/pkgs/development/libraries/SDL2_mixer/2_0.nix index e75e0c9c5cc0..e98353a0a404 100644 --- a/pkgs/development/libraries/SDL2_mixer/2_0.nix +++ b/pkgs/development/libraries/SDL2_mixer/2_0.nix @@ -1,34 +1,39 @@ -{ fetchurl -, fetchpatch -, lzwolf -, SDL2_mixer -, timidity +{ + SDL2_mixer, + fetchFromGitHub, + fetchpatch, + lzwolf, + timidity, }: -SDL2_mixer.overrideAttrs(oa: rec { - version = "2.0.4"; +let + attrset = { + version = "2.0.4"; - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz"; - sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "release-${attrset.version}"; + hash = "sha256-vo9twUGeK2emDiGd9kSGuA/X8TxVmQrRFFm71zawWYM="; + }; + + patches = [ + # These patches fix incompatible function pointer conversion errors with clang 16. + (fetchpatch { + url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; + stripLen = 2; + hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; + }) + # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f + ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch + ]; + + # fix default path to timidity.cfg so MIDI files could be played + postPatch = '' + substituteInPlace timidity/options.h \ + --replace "/usr/share/timidity" "${timidity}/share/timidity" + ''; + + passthru.tests.lzwolf = lzwolf; }; - - patches = [ - # These patches fix incompatible function pointer conversion errors with clang 16. - (fetchpatch { - url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; - stripLen = 2; - hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; - }) - # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f - ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch - ]; - - # fix default path to timidity.cfg so MIDI files could be played - postPatch = '' - substituteInPlace timidity/options.h \ - --replace "/usr/share/timidity" "${timidity}/share/timidity" - ''; - - passthru.tests.lzwolf = lzwolf; -}) +in SDL2_mixer.overrideAttrs(_: attrset) From 5f77c558facf597834bdb283a902857646699f1c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 18:54:11 -0300 Subject: [PATCH 077/116] SDL2_mixer_2_0: migrate to by-name --- .../SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch | 0 .../2_0.nix => by-name/sd/SDL2_mixer_2_0/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{development/libraries/SDL2_mixer => by-name/sd/SDL2_mixer_2_0}/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch (100%) rename pkgs/{development/libraries/SDL2_mixer/2_0.nix => by-name/sd/SDL2_mixer_2_0/package.nix} (96%) diff --git a/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch b/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch similarity index 100% rename from pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch rename to pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch diff --git a/pkgs/development/libraries/SDL2_mixer/2_0.nix b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix similarity index 96% rename from pkgs/development/libraries/SDL2_mixer/2_0.nix rename to pkgs/by-name/sd/SDL2_mixer_2_0/package.nix index e98353a0a404..9413b8dda96e 100644 --- a/pkgs/development/libraries/SDL2_mixer/2_0.nix +++ b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix @@ -1,3 +1,4 @@ +# SDL2_mixer_2_0 pinned for lzwolf { SDL2_mixer, fetchFromGitHub, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b889594b56d..981ec74db2e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24341,8 +24341,6 @@ with pkgs; }); SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; - # SDL2_mixer_2_0 pinned for lzwolf - SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; From c0ad46e480df160c0c51dcf2cc02ba40b730e99c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 2 May 2024 21:21:51 -0300 Subject: [PATCH 078/116] SDL2_mixer: migrate to by-name --- .../default.nix => by-name/sd/SDL2_mixer/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/SDL2_mixer/default.nix => by-name/sd/SDL2_mixer/package.nix} (100%) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix similarity index 100% rename from pkgs/development/libraries/SDL2_mixer/default.nix rename to pkgs/by-name/sd/SDL2_mixer/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 981ec74db2e1..79a3a3eb92c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24340,8 +24340,6 @@ with pkgs; }; }); - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; SDL2_sound = callPackage ../development/libraries/SDL2_sound { From fc4123f5fe20af5f7bbbb0affc86daac2b70f5c9 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Thu, 2 May 2024 23:20:55 -0400 Subject: [PATCH 079/116] kanji-stroke-order-font: 4.003 -> 4.004 --- .../fonts/kanji-stroke-order-font/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 80c97024ac36..7d7d025bbb76 100644 --- a/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,28 +1,36 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchzip }: let - version = "4.003"; - debianVersion = "dfsg-1"; -in stdenv.mkDerivation { - name = "kanji-stroke-order-font-${version}"; + font = "kanji-stroke-order"; + version = "4.004"; +in +stdenv.mkDerivation { + pname = "${font}-font"; + inherit version; - src = fetchurl { - url = "https://salsa.debian.org/fonts-team/fonts-kanjistrokeorders/-/archive/debian/${version}_${debianVersion}/fonts-kanjistrokeorders-debian-${version}_${debianVersion}.tar.bz2"; - sha256 = "1a8hxzkrfjz0h5gl9h0panzzsn7cldlklxryyzmpam23g32q6bg1"; + src = fetchzip { + # https://github.com/NixOS/nixpkgs/issues/60157 + url = "https://drive.google.com/uc?export=download&id=1snpD-IQmT6fGGQjEePHdDzE2aiwuKrz4#${font}.zip"; + hash = "sha256-wQpurDS6APnpNMbMHofwW/UKeBF8FXeiCVx4wAOeRoE="; + stripRoot = false; }; installPhase = '' - mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order - cp *.ttf $out/share/fonts/kanji-stroke-order - cp *.txt $out/share/doc/kanji-stroke-order + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/${font} + install -Dm644 *.txt -t $out/share/doc/${font} + install -Dm644 *.pdf -t $out/share/doc/${font} + + runHook postInstall ''; meta = with lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; - homepage = "https://sites.google.com/site/nihilistorguk/"; + homepage = "https://www.nihilist.org.uk/"; license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ ptrhlm ]; + maintainers = with maintainers; [ ptrhlm stephen-huan ]; platforms = platforms.all; }; } From 0d87342ed19ff359832edd6d1b506942564153ea Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Thu, 2 May 2024 20:38:38 -0700 Subject: [PATCH 080/116] csvq: move to pkgs/by-name --- .../tools/csvq/default.nix => by-name/cs/csvq/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/csvq/default.nix => by-name/cs/csvq/package.nix} (100%) diff --git a/pkgs/development/tools/csvq/default.nix b/pkgs/by-name/cs/csvq/package.nix similarity index 100% rename from pkgs/development/tools/csvq/default.nix rename to pkgs/by-name/cs/csvq/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffe55bb47fc7..f33010760739 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4858,8 +4858,6 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvq = callPackage ../development/tools/csvq { }; - csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; From 89822cc130c8928490caa37e3ab547f41841cd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 04:04:37 +0000 Subject: [PATCH 081/116] python311Packages.roadlib: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/roadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 303024a90f52..81792fddd0e0 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0hDiuF0dBRyR2B9dp4c7/jsC6li8uOduQBbhs6fFLfU="; + hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; nativeBuildInputs = [ From be00ce08f2c7ff81910be68ea414c6cec34e828d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 04:43:58 +0000 Subject: [PATCH 082/116] python311Packages.aiounifi: 76 -> 77 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index e36d82b521c5..f4f150c820f8 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "76"; + version = "77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-N9N7sMHBiEhYUFok4bTSJZyp5pkJzj9pMxahY6FTx+I="; + hash = "sha256-c3UR/AwnQLm6h1jsM6mk6MOii2/xQzFcrci+oG4BsDs="; }; postPatch = '' From b4f4199b6ec3c88eca6ad1e9f2d8d0e2b90f5115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 3 May 2024 06:58:53 +0200 Subject: [PATCH 083/116] openvscode-server: 1.88.0 > 1.88.1 --- pkgs/servers/openvscode-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index dd6b6b551d65..bc1e7a3f5e18 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -60,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.88.0"; + version = "1.88.1"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-cZ/q8EUPZ4YqKpwH/XvXzE8pMHKGO93ADqhGHbqJBF8="; + hash = "sha256-Yc16L13Z8AmsGoSFbvy+4+KBdHxvqLMwZLeU2/dAQVU="; }; yarnCache = stdenv.mkDerivation { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Zy8YPY+vEF9Y5ol4xWk9UMkHUQ0hY8n+mcXfm8iVbys="; + outputHash = "sha256-89c6GYLT2RzHqwxBKegYqB6g5rEJ6/nH53cnfV7b0Ts="; }; nativeBuildInputs = [ From 49eacfc440b61b116faf28738159c4af9a0a768d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 06:31:59 +0000 Subject: [PATCH 084/116] redpanda-client: 23.3.13 -> 23.3.14 --- pkgs/servers/redpanda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c90f055be42d..97d8aafa0831 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.13"; + version = "23.3.14"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-5JbC9FEF0h9nExrb4IGnc5lzStf7FyQ9imkz6ekRyJg="; + sha256 = "sha256-xFXcxtWTVRg+ZgxKfIU32JF0hRXzsLMwS9fSwge3/bc="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-B//qmqxS3g9u2yir8Z3iV2fjQ4XXPAjFujeOZjdt8PE="; + vendorHash = "sha256-Gm4zimkI77mKO5/Q4ylE4SOJayOetu2QU4bftQy5UjE="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' From 686277819bbba33974e735228b6abab04dc094c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 02:02:06 +0000 Subject: [PATCH 085/116] python311Packages.recoll: 1.37.4 -> 1.37.5 --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 99d4b79d1cc0..36c9f7a7160a 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.37.4"; + version = "1.37.5"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-MQnXamW7L4hyMbZDmU7XAcLv5roHcfhFGzni8YbDtq0="; + hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU="; }; configureFlags = [ From a3ae066838e765f666a5575010c1e97d679194fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 07:08:31 +0000 Subject: [PATCH 086/116] python311Packages.yq: 3.4.1 -> 3.4.3 --- pkgs/development/python-modules/yq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 6a7c58c7d895..febf3aad2fd1 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "yq"; - version = "3.4.1"; + version = "3.4.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-tVjatvFcA+JKHESHiVALINbzB+6cpMk2E4fzZYFjAA0="; + hash = "sha256-ulhqGm8wz3BbL5IgZxLfIoHNMgKAIQ57e4Cty48lbjs="; }; patches = [ From 541d458df41683faa25739d7fca4a0f54427b8f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:23:04 +0200 Subject: [PATCH 087/116] python311Packages.roadlib: refactor --- pkgs/development/python-modules/roadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 81792fddd0e0..378ac50fa1b8 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ adal pyjwt sqlalchemy From dbb9bdf420f0ecfeb3238f853676bd22cf580cdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:25:24 +0200 Subject: [PATCH 088/116] python312Packages.roadlib: format with nixfmt --- .../python-modules/roadlib/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 378ac50fa1b8..77c05f8dc597 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -1,11 +1,12 @@ -{ lib -, adal -, buildPythonPackage -, fetchPypi -, pyjwt -, pythonOlder -, setuptools -, sqlalchemy +{ + lib, + adal, + buildPythonPackage, + fetchPypi, + pyjwt, + pythonOlder, + setuptools, + sqlalchemy, }: buildPythonPackage rec { @@ -20,9 +21,7 @@ buildPythonPackage rec { hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ adal @@ -33,9 +32,7 @@ buildPythonPackage rec { # Module has no test doCheck = false; - pythonImportsCheck = [ - "roadtools.roadlib" - ]; + pythonImportsCheck = [ "roadtools.roadlib" ]; meta = with lib; { description = "ROADtools common components library"; From 8d9843246c83c56246987fd9811bcc1704efb286 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:30:08 +0200 Subject: [PATCH 089/116] python312Packages.airthings-ble: 0.7.1 -> 0.8.0 Diff: https://github.com/vincegio/airthings-ble/compare/refs/tags/0.7.1...0.8.0 Changelog: https://github.com/vincegio/airthings-ble/releases/tag/v0.8.0 --- pkgs/development/python-modules/airthings-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 1f9458541065..85cd88d24a2a 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.7.1"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM="; + hash = "sha256-BgjfvKrVpw/cP93JCloZKq+PIyS/w7/v6+obfgDT64A="; }; postPatch = '' From 2ac6998abbd657cad987e416274215040e59865c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:30:43 +0200 Subject: [PATCH 090/116] python312Packages.airthings-ble: refactor --- pkgs/development/python-modules/airthings-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 85cd88d24a2a..a5cb442236db 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { --replace-fail "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-interrupt bleak bleak-retry-connector From ad6582c96dd065c49e38fd45c67903211202f3ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:31:26 +0200 Subject: [PATCH 091/116] python312Packages.airthings-ble: format with nixfmt --- .../python-modules/airthings-ble/default.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index a5cb442236db..9fc7d0e68049 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,13 +1,14 @@ -{ lib -, async-interrupt -, async-timeout -, bleak -, bleak-retry-connector -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + async-interrupt, + async-timeout, + bleak, + bleak-retry-connector, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -29,25 +30,17 @@ buildPythonPackage rec { --replace-fail "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ async-interrupt bleak bleak-retry-connector - ] ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "airthings_ble" - ]; + pythonImportsCheck = [ "airthings_ble" ]; meta = with lib; { description = "Library for Airthings BLE devices"; From e0d856327728d4d70946daabfddbfaa1a6d7525e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:33:25 +0200 Subject: [PATCH 092/116] python312Packages.lacuscore: 1.9.2 -> 1.9.3 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.9.2...v1.9.3 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.9.3 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 950c215e9005..d03376184bba 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-vfhRbbutNuZW/oI/eCJUXydCn47ThOlWRz2NJJrE3Tw="; + hash = "sha256-jfbDg74vHwOFvbOETPSaApFCpzw9Khu8PgGpsoAwSGc="; }; pythonRelaxDeps = [ From aa10bacb813a4abc9c3da66de11362244a57a502 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Thu, 2 May 2024 12:03:34 +0100 Subject: [PATCH 093/116] nixos/ebusd: clean up module --- .../services/home-automation/ebusd.nix | 159 +++++------------- 1 file changed, 46 insertions(+), 113 deletions(-) diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix index d388022d7b50..ac9ec06639c1 100644 --- a/nixos/modules/services/home-automation/ebusd.nix +++ b/nixos/modules/services/home-automation/ebusd.nix @@ -4,41 +4,6 @@ with lib; let cfg = config.services.ebusd; - - package = pkgs.ebusd; - - arguments = [ - "${package}/bin/ebusd" - "--foreground" - "--updatecheck=off" - "--device=${cfg.device}" - "--port=${toString cfg.port}" - "--configpath=${cfg.configpath}" - "--scanconfig=${cfg.scanconfig}" - "--log=all:${cfg.logs.all}" - "--log=main:${cfg.logs.main}" - "--log=network:${cfg.logs.network}" - "--log=bus:${cfg.logs.bus}" - "--log=update:${cfg.logs.update}" - "--log=other:${cfg.logs.other}" - ] ++ lib.optionals cfg.readonly [ - "--readonly" - ] ++ lib.optionals cfg.mqtt.enable [ - "--mqtthost=${cfg.mqtt.host}" - "--mqttport=${toString cfg.mqtt.port}" - "--mqttuser=${cfg.mqtt.user}" - "--mqttpass=${cfg.mqtt.password}" - ] ++ lib.optionals cfg.mqtt.home-assistant [ - "--mqttint=${package}/etc/ebusd/mqtt-hassio.cfg" - "--mqttjson" - ] ++ lib.optionals cfg.mqtt.retain [ - "--mqttretain" - ] ++ cfg.extraArguments; - - usesDev = hasPrefix "/" cfg.device; - - command = concatStringsSep " " arguments; - in { meta.maintainers = with maintainers; [ nathan-gs ]; @@ -46,6 +11,8 @@ in options.services.ebusd = { enable = mkEnableOption "ebusd, a daemon for communication with eBUS heating systems"; + package = mkPackageOptionMD pkgs "ebusd" { }; + device = mkOption { type = types.str; default = ""; @@ -57,7 +24,8 @@ in ens:DEVICE for enhanced high speed serial device (only adapter v3 and newer with firmware since 20220731), DEVICE for serial device (normal speed, for all other serial adapters like adapter v2 as well as adapter v3 in non-enhanced mode), or [udp:]IP:PORT for network device. - https://github.com/john30/ebusd/wiki/2.-Run#device-options + + Source: ''; }; @@ -81,7 +49,7 @@ in type = types.str; default = "https://cfg.ebusd.eu/"; description = '' - Read CSV config files from PATH (local folder or HTTPS URL) [https://cfg.ebusd.eu/] + Directory to read CSV config files from. This can be a local folder or a URL. ''; }; @@ -95,65 +63,21 @@ in ''; }; - logs = { - main = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - - network = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - - bus = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - - update = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - - other = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - - all = mkOption { - type = types.enum [ "none" "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (none|error|notice|info|debug) [all:notice]. - ''; - }; - }; + logs = let + # "all" must come first so it can be overridden by more specific areas + areas = [ "all" "main" "network" "bus" "update" "other" ]; + levels = [ "none" "error" "notice" "info" "debug" ]; + in listToAttrs (map (area: nameValuePair area (mkOption { + type = types.enum levels; + default = "notice"; + example = "debug"; + description = '' + Only write log for matching `AREA`s (${concatStringsSep "|" areas}) below or equal to `LEVEL` (${concatStringsSep "|" levels}) + ''; + })) areas); mqtt = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Adds support for MQTT - ''; - }; + enable = mkEnableOption "support for MQTT"; host = mkOption { type = types.str; @@ -179,13 +103,7 @@ in ''; }; - retain = mkOption { - type = types.bool; - default = false; - description = '' - Set the retain flag on all topics instead of only selected global ones - ''; - }; + retain = mkEnableOption "set the retain flag on all topics instead of only selected global ones"; user = mkOption { type = types.str; @@ -200,7 +118,6 @@ in The MQTT password. ''; }; - }; extraArguments = mkOption { @@ -210,25 +127,44 @@ in Extra arguments to the ebus daemon ''; }; - }; - config = mkIf (cfg.enable) { - + config = let + usesDev = hasPrefix "/" cfg.device; + in mkIf cfg.enable { systemd.services.ebusd = { description = "EBUSd Service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = command; + ExecStart = let + args = cli.toGNUCommandLineShell { } (foldr (a: b: a // b) { } [ + { + inherit (cfg) device port configpath scanconfig readonly; + foreground = true; + updatecheck = "off"; + log = mapAttrsToList (name: value: "${name}:${value}") cfg.logs; + mqttretain = cfg.mqtt.retain; + } + (optionalAttrs cfg.mqtt.enable { + mqtthost = cfg.mqtt.host; + mqttport = cfg.mqtt.port; + mqttuser = cfg.mqtt.user; + mqttpass = cfg.mqtt.password; + }) + (optionalAttrs cfg.mqtt.home-assistant { + mqttint = "${cfg.package}/etc/ebusd/mqtt-hassio.cfg"; + mqttjson = true; + }) + ]); + in "${cfg.package}/bin/ebusd ${args} ${escapeShellArgs cfg.extraArguments}"; + DynamicUser = true; Restart = "on-failure"; # Hardening CapabilityBoundingSet = ""; - DeviceAllow = lib.optionals usesDev [ - cfg.device - ] ; + DeviceAllow = optionals usesDev [ cfg.device ]; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = false; @@ -254,9 +190,7 @@ in RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; - SupplementaryGroups = [ - "dialout" - ]; + SupplementaryGroups = [ "dialout" ]; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service @pkey" @@ -265,6 +199,5 @@ in UMask = "0077"; }; }; - }; } From ecd04dede8a8db56b5c8ed0e15882d7bf27f3180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:36:48 +0200 Subject: [PATCH 094/116] python312Packages.roadtx: refactor --- pkgs/development/python-modules/roadtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 4ea50269cd76..6c67dc83fda5 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pycryptodomex pyotp requests From 2313c67fcf0fa924652c73957240d2644abef9ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:37:18 +0200 Subject: [PATCH 095/116] python312Packages.roadtx: 1.7.0 -> 1.8.1 --- pkgs/development/python-modules/roadtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 6c67dc83fda5..1187e7e82340 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.7.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; + hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; }; build-system = [ From f9e7b448127ad8ebe962190f8527d2324c49ede0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:37:34 +0200 Subject: [PATCH 096/116] python312Packages.roadtx: format with nixfmt --- .../python-modules/roadtx/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 1187e7e82340..eca756a0f033 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pycryptodomex -, pyotp -, pythonOlder -, requests -, roadlib -, selenium -, selenium-wire -, setuptools -, signxml +{ + lib, + buildPythonPackage, + fetchPypi, + pycryptodomex, + pyotp, + pythonOlder, + requests, + roadlib, + selenium, + selenium-wire, + setuptools, + signxml, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pycryptodomex @@ -38,9 +37,7 @@ buildPythonPackage rec { signxml ]; - pythonImportsCheck = [ - "roadtools.roadtx" - ]; + pythonImportsCheck = [ "roadtools.roadtx" ]; meta = with lib; { description = "ROADtools Token eXchange"; From 4fc84a24b86a6f02b54a37fc858436cc747b6e8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:41:57 +0200 Subject: [PATCH 097/116] python312Packages.puremagic: refactor --- pkgs/development/python-modules/puremagic/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 72f0dfc4dde7..aee0801a8e53 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "puremagic"; version = "1.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdgriffith"; - repo = pname; + repo = "puremagic"; rev = "refs/tags/${version}"; hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 407c357d8ab91474bac8a2cf6c43d729d9bc06cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:42:25 +0200 Subject: [PATCH 098/116] python312Packages.puremagic: 1.21 -> 1.22 Diff: https://github.com/cdgriffith/puremagic/compare/refs/tags/1.21...1.22 Changelog: https://github.com/cdgriffith/puremagic/blob/1.22/CHANGELOG.md --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index aee0801a8e53..22d9abbf34de 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.21"; + version = "1.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; + hash = "sha256-48gtwH6NXj/n3mm313Im1ey4ZH9TbsSFwjsQuBGuqwA="; }; build-system = [ From 5f345fdffc07ebd37564798dfdea0bdaff7290b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:42:46 +0200 Subject: [PATCH 099/116] python312Packages.puremagic: format with nixfmt --- .../python-modules/puremagic/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 22d9abbf34de..d9171b6497c6 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,17 +21,11 @@ buildPythonPackage rec { hash = "sha256-48gtwH6NXj/n3mm313Im1ey4ZH9TbsSFwjsQuBGuqwA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "puremagic" - ]; + pythonImportsCheck = [ "puremagic" ]; meta = with lib; { description = "Implementation of magic file detection"; From dc4af9eb9e3ae8b5d113c04396194feda5d2070b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:43:10 +0200 Subject: [PATCH 100/116] python312Packages.playwrightcapture: 1.24.6 -> 1.24.7 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.24.6...v1.24.7 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.24.7 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 36c701b1a49f..37766343c269 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.6"; + version = "1.24.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-DFMnlFN9CooQ7HBiw6Ur6KMTMrEw6JxkT6IxlVU+PdY="; + hash = "sha256-mCwV5rgJLns4LvCVwnGAJeqs426GK/8rfp93YKH34VA="; }; pythonRelaxDeps = [ From cb5b2f9aa36815f3614e2cc2c4a5e320f1bbb18b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:48:10 +0200 Subject: [PATCH 101/116] python312Packages.mkdocstrings-python: 1.9.2 -> 1.10.0 Diff: https://github.com/mkdocstrings/python/compare/refs/tags/1.9.2...1.10.0 Changelog: https://github.com/mkdocstrings/python/blob/1.10.0/CHANGELOG.md --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 7a57a73338ad..094713367e90 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.9.2"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; + hash = "sha256-sKRheGIR//kmiznHKsVGd35oSvGHgoocsbYCzDRv2Zs="; }; build-system = [ pdm-backend ]; From 1c2c9516fa706b75d531b0bcfeb6e254e08395b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:49:07 +0200 Subject: [PATCH 102/116] python312Packages.mkdocs-rss-plugin: 1.12.1 -> 1.12.2 Diff: https://github.com/Guts/mkdocs-rss-plugin/compare/refs/tags/1.12.1...1.12.2 Changelog: https://github.com/Guts/mkdocs-rss-plugin/blob/refs/tags/1.12.2/CHANGELOG.md --- pkgs/development/python-modules/mkdocs-rss-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 5328c196c31e..a11dd831e8bb 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.12.1"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-cLQfhMYW/9Eb+IamQIC7fZRTm/ORD8xbcrmKkSkUrMs="; + hash = "sha256-CeVt4Vkr3tGvWsDQtw8eAaRS5jBeDei0TrS5rViSCaI="; }; postPatch = '' From 9009757709d43bc6e47cf044268a9bfb19e6d06d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:50:27 +0200 Subject: [PATCH 103/116] python312Packages.llama-index-core: 0.10.33 -> 0.10.34 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.10.33...v0.10.34 Changelog: https://github.com/run-llama/llama_index/blob/0.10.34/CHANGELOG.md --- pkgs/development/python-modules/llama-index-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index d49c0f042f54..0c76c6f8c471 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.33"; + version = "0.10.34"; pyproject = true; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-UlKZX7qWb8/XeqxNTW9PawKauwZRsMjsFP+xXI1CyeE="; + hash = "sha256-KOoTN+ERJZHOer82lLBTWzWW5MIoJaqOmhoa3HYk0fs="; }; sourceRoot = "${src.name}/${pname}"; From 05237d2d1b99f39c224f3a711b4ff04f2214f9e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 07:57:55 +0000 Subject: [PATCH 104/116] python311Packages.ucsmsdk: 0.9.16 -> 0.9.17 --- pkgs/development/python-modules/ucsmsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index 7d285b062880..f2442d2a6078 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.16"; + version = "0.9.17"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-9ksHA8uvBv370/6Umt5iz/4F8VsDDI9X8kVc5Lv0RVk="; + hash = "sha256-Ejn99MArKZjCHsl81WSHfpWV3Kz/mBrItIa0tPVProU="; }; propagatedBuildInputs = [ From 4d7c65032c0752b8e9a0bc8564b194b291d6dc8d Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 3 May 2024 16:39:01 +0800 Subject: [PATCH 105/116] trezor-suite: 24.3.2 -> 24.4.3 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 328e423535f3..76968bda6735 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.3.2"; + version = "24.4.3"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-oj/UrUFTH0QZD2eTHdR/Lu6Tz6AIhbIBgPJD3jH1YJKgOZIzX21H0KSddMgu+iKPw2WmoKf0UP+qqf+yFs/mVQ=="; - x86_64-linux = "sha512-RakNuSDKR0neO0IZwTVaARX9tWNDfJwOBFL3teUsNlcrur862I1c6NaaA/RxriujolDRI+wgG0twaUGEXXar5g=="; + aarch64-linux = "sha512-EPpnEgE9euHGSo7CFMJg7hF3p5LqPc3zPxDQsNzyOI2lNv90vydtEmOm1fORj0MXbQsGLLS1nSzMH3vI6O9WmA=="; + x86_64-linux = "sha512-FjHaomHjMSVwxO63NEEC5UjotzDlrX8yTGaz20RyoadClAUKIeVfeEt/5jDueFr2ZXfeLraRIQ0ywKm+wkC2EQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 1d35c905a8846e249a9e4904f74dbb0b240be101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 3 May 2024 10:45:43 +0200 Subject: [PATCH 106/116] typstyle: 0.11.13 -> 0.11.16 --- pkgs/by-name/ty/typstyle/Cargo.lock | 2 +- pkgs/by-name/ty/typstyle/package.nix | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock index 47ae5437f5b9..73892cb629cf 100644 --- a/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3649,7 +3649,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.13" +version = "0.11.16" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index aa44d1de31c8..1022537164f8 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , libgit2 , zlib @@ -10,15 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.13"; + version = "0.11.16"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-xJoL/YgdkORQf+U/1E2OVk6pD/IuXxJJTw+Xufonjd0="; + hash = "sha256-ZmGrdAHbU4PQgd9haoVEZ8Wn8Scujm9bJAtvO2+aPoQ="; }; + patches = [ + (fetchpatch { + # Trim whitespace patch + name = "whitespace-trim.patch"; + url = "https://github.com/Enter-tainer/typstyle/commit/127b7362f5938e091e2e5a33976ad3f63b6e4ee3.patch"; + hash = "sha256-Xzo51bgpEUKP7WDQ7BFNAZsyofPcPDIJMWOf4S+GGvI="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From 171fa441a985646b3ff3ff4d3342e27d90a19c28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 May 2024 10:51:09 +0200 Subject: [PATCH 107/116] zigbee2mqtt: 1.36.1 -> 1.37.0 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.37.0 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 19242ddf0c51..0da5940acbee 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.36.1"; + version = "1.37.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-LZ25EWO4cOVnF0bWFKwGfnX7kpzNafp1X6+/JYxn6Ek="; + hash = "sha256-YYwnIWZJowIWCUY6PNRd3xWfzoHcSrFiAa3lEE7Vvw8="; }; - npmDepsHash = "sha256-6EorAqPLusWAEfTePn+O+tgZcv3g82mkPs2hSHPRRfo="; + npmDepsHash = "sha256-tba/VGybkC+eQwtPhAL98+shFOSH8lIbkSQ/KHggDqM="; buildInputs = [ systemdMinimal From baa67f8d82bf5555d64eafc2a086901eaa29fda7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 09:25:05 +0000 Subject: [PATCH 108/116] gamescope: 3.14.6 -> 3.14.11 --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index fa20ddcf225c..695623d209e0 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -44,14 +44,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.6"; + version = "3.14.11"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Nj66d42Ih4pD15cNuMe81sviUepVVzVX8BEP7O2p0o0="; + hash = "sha256-Ex4uJ50EiX9ZVzmndygxET0wZmPtPB4Ditjq5bdhKTQ="; }; patches = [ From ea51404f4e50c9a2692697f30dae6b2649f953f9 Mon Sep 17 00:00:00 2001 From: Sebastian Ertel Date: Fri, 3 May 2024 11:32:09 +0200 Subject: [PATCH 109/116] coqPackages.ssprove: init at 0.2.0 (#306981) --- .../coq-modules/ssprove/default.nix | 48 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/coq-modules/ssprove/default.nix diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix new file mode 100644 index 000000000000..714872170c3b --- /dev/null +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -0,0 +1,48 @@ +{ lib, mkCoqDerivation, coq, version ? null +, equations +, mathcomp-ssreflect +, mathcomp-analysis +, extructures +, deriving +}: + +(mkCoqDerivation { + pname = "ssprove"; + owner = "SSProve"; + + inherit version; + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp-ssreflect.version] [ + { cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.0"; } + # This is the original dependency: + # { cases = ["8.17" "1.18.0"]; out = "0.1.0"; } + # But it is not loadable. The math-comp nixpkgs configuration + # will always only output version 1.18.0 for Coq 8.17. + # Hence, the Coq 8.17 and math-comp 1.17.0 must be explicitly set + # to load it. + # (This version is not on the math-comp CI and hence not checked.) + { cases = ["8.17" "1.17.0"]; out = "0.1.0"; } + ] null; + + releaseRev = v: "v${v}"; + + release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o="; + release."0.1.0".sha256 = "sha256-Yj+k+mBsudi3d6bRVlZLyM4UqQnzAX5tHvxtKoIuNTE="; + + propagatedBuildInputs = [equations + mathcomp-ssreflect + mathcomp-analysis + extructures + deriving]; + + meta = with lib; { + description = "SSProve: A Foundational Framework for Modular Cryptographic Proofs in Coq"; + license = licenses.mit; + maintainers = [ { + name = "Sebastian Ertel"; + email = "sebastian.ertel@gmail.com"; + github = "sertel"; + githubId = 3703100; + } ]; + }; + +}) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1964f666a86b..88538a7da773 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -117,6 +117,7 @@ let simple-io = callPackage ../development/coq-modules/simple-io { }; smpl = callPackage ../development/coq-modules/smpl { }; smtcoq = callPackage ../development/coq-modules/smtcoq { }; + ssprove = callPackage ../development/coq-modules/ssprove {}; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; From 0fd185959674e5a330c4bba5eee917388d0ebdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 May 2024 11:34:16 +0200 Subject: [PATCH 110/116] ceph: fix build of overridden pyopenssl (but some other deps are still failing) --- pkgs/tools/filesystems/ceph/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 6b01e22f6169..a460445f5ac9 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -242,6 +242,9 @@ let disabledTests = old.disabledTests or [ ] ++ [ "test_export_md5_digest" ]; + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ + self.flaky + ]; }); # Ceph does not support `kubernetes` >= 19, see: From ab83e3fd1e93b44660157369d58b1ba8e1e24f6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 10:06:47 +0000 Subject: [PATCH 111/116] llama-cpp: 2746 -> 2781 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 8e1e0efd842b..b88f06f9ab4d 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -72,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2746"; + version = "2781"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-KrIeZEq6RAz3N47wgtQjlfNzoGcTh3DqOhYBOxJPGzs="; + hash = "sha256-a+Ji8h0Yh52pGnDsrJSgfG5kdMDAmhEQ6YKdtZRc7S8="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From 54fd6284797d5111dc73dffe14bc297ea29fa791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 May 2024 12:43:34 +0200 Subject: [PATCH 112/116] ceph: switch python from 3.10 to 3.11 Some of the dependencies wouldn't build anymore: https://hydra.nixos.org/build/257585236/nixlog/5/tail Tested on x86_64-linux: ceph ceph-client ceph-csi ceph-dev ceph.tests --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index a460445f5ac9..314e72f3b9cb 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -41,7 +41,7 @@ , lz4 , oath-toolkit , openldap -, python310 +, python311 , rdkafka , rocksdb , snappy @@ -168,7 +168,7 @@ let }; # Watch out for python <> boost compatibility - python = python310.override { + python = python311.override { packageOverrides = self: super: let cryptographyOverrideVersion = "40.0.1"; bcryptOverrideVersion = "4.0.1"; From e768d95f414fa3ed2643b4b25fd15eafa3446254 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 3 May 2024 11:51:07 +0200 Subject: [PATCH 113/116] linux/generic.nix: Fix CONFIG_RUST I thought it was module based, but it wasn't. Fixes https://github.com/NixOS/nixpkgs/pull/306790#issuecomment-2092485576 > This has broken [...] Rust support --- pkgs/os-specific/linux/kernel/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 631217735d8f..37c138402d00 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -221,7 +221,7 @@ let config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; - CONFIG_RUST = lib.mkIf withRust "y"; + CONFIG_RUST = if withRust then "y" else "n"; }; }); From e0c850e97fb4f788b0ade33e751148c9ef3ec903 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 3 May 2024 13:36:23 +0200 Subject: [PATCH 114/116] CODEOWNERS: Drop piegames --- .github/CODEOWNERS | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 109b64d7392a..3d45e69971b1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -41,7 +41,7 @@ /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/stdenv/generic @Ericson2314 -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 /pkgs/stdenv/cross @Ericson2314 /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 @@ -305,13 +305,6 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag # terraform providers /pkgs/applications/networking/cluster/terraform-providers @zowoq -# Matrix -/pkgs/servers/heisenbridge @piegamesde -/pkgs/servers/matrix-conduit @piegamesde -/nixos/modules/services/misc/heisenbridge.nix @piegamesde -/nixos/modules/services/misc/matrix-conduit.nix @piegamesde -/nixos/tests/matrix-conduit.nix @piegamesde - # Forgejo nixos/modules/services/misc/forgejo.nix @bendlas @emilylange pkgs/applications/version-management/forgejo @bendlas @emilylange From 3813ff1a48c169c943d5aed0dbeccaa852db9a56 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 3 May 2024 13:37:57 +0200 Subject: [PATCH 115/116] conduit: Drop piegames from maintainers --- nixos/modules/services/matrix/conduit.nix | 2 +- pkgs/servers/matrix-conduit/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index 9b8a4f45c268..b1d9b0424295 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -9,7 +9,7 @@ let configFile = format.generate "conduit.toml" cfg.settings; in { - meta.maintainers = with maintainers; [ pstn piegames ]; + meta.maintainers = with maintainers; [ pstn ]; options.services.matrix-conduit = { enable = mkEnableOption "matrix-conduit"; diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 1eb7500222d3..115c7e226e84 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { description = "A Matrix homeserver written in Rust"; homepage = "https://conduit.rs/"; license = licenses.asl20; - maintainers = with maintainers; [ pstn piegames pimeys ]; + maintainers = with maintainers; [ pstn pimeys ]; mainProgram = "conduit"; }; } From 315db4f0f26ecb703722e02a3ec300125d83d7ff Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 3 May 2024 13:38:25 +0200 Subject: [PATCH 116/116] heisenbridge: Drop piegames from maintainers --- nixos/modules/services/misc/heisenbridge.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix index de109e726633..54c298f1b560 100644 --- a/nixos/modules/services/misc/heisenbridge.nix +++ b/nixos/modules/services/misc/heisenbridge.nix @@ -210,5 +210,5 @@ in }; }; - meta.maintainers = [ lib.maintainers.piegames ]; + meta.maintainers = [ ]; }