--#endif
--
- #include "system.h"
- #include "die.h"
- #include "error.h"
-@@ -167,6 +162,24 @@ print_element (char const *element)
- fputs (element, stdout);
- }
-
-+/* Print ELEMENT, preceded by a space if something has already been
-+ printed. But if the environment variable ENVVAR is set, print its
-+ value instead of ELEMENT. */
-+
-+static void
-+print_element_env (char const *element, char const *envvar)
-+{
-+#ifdef __APPLE__
-+ if (envvar)
-+ {
-+ char const *val = getenv (envvar);
-+ if (val)
-+ element = val;
-+ }
-+#endif
-+ print_element (element);
-+}
-+
-
- /* Set all the option flags according to the switches specified.
- Return the mask indicating which elements to print. */
-@@ -287,26 +300,36 @@ main (int argc, char **argv)
- die (EXIT_FAILURE, errno, _("cannot get system name"));
-
- if (toprint & PRINT_KERNEL_NAME)
-- print_element (name.sysname);
-+ print_element_env (name.sysname, "UNAME_SYSNAME");
- if (toprint & PRINT_NODENAME)
-- print_element (name.nodename);
-+ print_element_env (name.nodename, "UNAME_NODENAME");
- if (toprint & PRINT_KERNEL_RELEASE)
-- print_element (name.release);
-+ print_element_env (name.release, "UNAME_RELEASE");
- if (toprint & PRINT_KERNEL_VERSION)
-- print_element (name.version);
-+ print_element_env (name.version, "UNAME_VERSION");
- if (toprint & PRINT_MACHINE)
-- print_element (name.machine);
-+ print_element_env (name.machine, "UNAME_MACHINE");
- }
-
- if (toprint & PRINT_PROCESSOR)
- {
- char const *element = unknown;
-+#ifdef __APPLE__
-+# if defined __arm__ || defined __arm64__
-+ element = "arm";
-+# elif defined __i386__ || defined __x86_64__
-+ element = "i386";
-+# elif defined __ppc__ || defined __ppc64__
-+ element = "powerpc";
-+# endif
-+#endif
- #if HAVE_SYSINFO && defined SI_ARCHITECTURE
-- {
-- static char processor[257];
-- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-- element = processor;
-- }
-+ if (element == unknown)
-+ {
-+ static char processor[257];
-+ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+ element = processor;
-+ }
- #endif
- #ifdef UNAME_PROCESSOR
- if (element == unknown)
-@@ -316,26 +339,6 @@ main (int argc, char **argv)
- static int mib[] = { CTL_HW, UNAME_PROCESSOR };
- if (sysctl (mib, 2, processor, &s, 0, 0) >= 0)
- element = processor;
--
--# ifdef __APPLE__
-- /* This kludge works around a bug in Mac OS X. */
-- if (element == unknown)
-- {
-- cpu_type_t cputype;
-- size_t cs = sizeof cputype;
-- NXArchInfo const *ai;
-- if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0
-- && (ai = NXGetArchInfoFromCpuType (cputype,
-- CPU_SUBTYPE_MULTIPLE))
-- != NULL)
-- element = ai->name;
--
-- /* Hack "safely" around the ppc vs. powerpc return value. */
-- if (cputype == CPU_TYPE_POWERPC
-- && STRNCMP_LIT (element, "ppc") == 0)
-- element = "powerpc";
-- }
--# endif
- }
- #endif
- if (! (toprint == UINT_MAX && element == unknown))
diff --git a/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch b/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch
deleted file mode 100644
index a966c3bda917..000000000000
--- a/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?=
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: [PATCH] chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
----
- NEWS | 6 ++++++
- src/chmod.c | 4 ++--
- tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
- tests/local.mk | 1 +
- 4 files changed, 40 insertions(+), 2 deletions(-)
- create mode 100755 tests/chmod/ignore-symlink.sh
-
-diff --git a/NEWS b/NEWS
-index a1470a7d7..1cb3c28a1 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** Bug fixes
-+
-+ chmod -R no longer exits with error status when encountering symlinks.
-+ All files would be processed correctly, but the exit status was incorrect.
-+ [bug introduced in coreutils-9.0]
-+
-
- * Noteworthy changes in release 9.0 (2021-09-24) [stable]
-
-diff --git a/src/chmod.c b/src/chmod.c
-index 37b04f500..57ac47f33 100644
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
- enum
- {
- CH_NO_STAT,
-- CH_NOT_APPLIED,
- CH_FAILED,
-+ CH_NOT_APPLIED,
- CH_NO_CHANGE_REQUESTED,
- CH_SUCCEEDED
- }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
- if ( ! recurse)
- fts_set (fts, ent, FTS_SKIP);
-
-- return CH_NO_CHANGE_REQUESTED <= ch.status;
-+ return CH_NOT_APPLIED <= ch.status;
- }
-
- /* Recursively change the modes of the specified FILES (the last entry
-diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
-new file mode 100755
-index 000000000..5ce3de816
---- /dev/null
-+++ b/tests/chmod/ignore-symlink.sh
-@@ -0,0 +1,31 @@
-+#!/bin/sh
-+# Test for proper exit code of chmod on a processed symlink.
-+
-+# Copyright (C) 2021 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see .
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ chmod
-+
-+mkdir dir || framework_failure_
-+touch dir/f || framework_failure_
-+ln -s f dir/l || framework_failure_
-+
-+# This operation ignores symlinks but should succeed.
-+chmod u+w -R dir 2> out || fail=1
-+
-+compare /dev/null out || fail=1
-+
-+Exit $fail
-diff --git a/tests/local.mk b/tests/local.mk
-index 228d0e368..b5b893fb7 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -456,6 +456,7 @@ all_tests = \
- tests/chmod/c-option.sh \
- tests/chmod/equal-x.sh \
- tests/chmod/equals.sh \
-+ tests/chmod/ignore-symlink.sh \
- tests/chmod/inaccessible.sh \
- tests/chmod/octal.sh \
- tests/chmod/setgid.sh \
diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix
index a72d1ea30514..dfe8cbc055e2 100644
--- a/pkgs/tools/misc/depotdownloader/default.nix
+++ b/pkgs/tools/misc/depotdownloader/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, fetchFromGitHub
, buildDotnetModule
}:
@@ -18,6 +19,7 @@ buildDotnetModule rec {
nugetDeps = ./deps.nix;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Steam depot downloader utilizing the SteamKit2 library";
license = licenses.gpl2Only;
maintainers = [ maintainers.babbaj ];
diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix
index c18a336bc696..02fb122d4465 100644
--- a/pkgs/tools/misc/dialogbox/default.nix
+++ b/pkgs/tools/misc/dialogbox/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, mkDerivation
, fetchFromGitHub
, qmake
@@ -36,6 +37,7 @@ mkDerivation rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://github.com/martynets/dialogbox/";
description = "Qt-based scriptable engine providing GUI dialog boxes";
license = licenses.gpl3Plus;
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index d2ab1a9ba44f..add11f233880 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "213";
+ version = "214";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "sha256-l2kdV1QUGsS3D6Y/b485iDmQcBNIzaBywxhqfRDINX8=";
+ sha256 = "sha256-ap+U9b+pCfQ2UwqQDTx0mQ0nvXJsl4D89Q/Ecl7w+8c=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 39c1a6abea48..3c18345a0edf 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -1,20 +1,17 @@
-{ lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }:
+{ lib, stdenv, fetchurl, coreutils }:
stdenv.mkDerivation rec {
pname = "entr";
- version = "5.1";
+ version = "5.2";
src = fetchurl {
url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz";
- hash = "sha256-D4f1d7zodkHFJa3bm8xgu6pXn+mB2rdZBD484VVtu5I=";
+ hash = "sha256-I34wnUawdSEMDky3ib/Qycd37d9sswNBw/49vMZYw4A=";
};
postPatch = ''
- substituteInPlace Makefile.bsd --replace /bin/echo echo
substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat
- substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear
substituteInPlace entr.1 --replace /bin/cat cat
- substituteInPlace entr.1 --replace /usr/bin/clear clear
'';
dontAddPrefix = true;
doCheck = true;
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
deleted file mode 100644
index 8f847df3d5d1..000000000000
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- version = "1.0.0";
- pname = "envdir";
-
- goPackagePath = "github.com/d10n/envdir";
-
- src = fetchFromGitHub {
- rev = "v${version}";
- owner = "d10n";
- repo = "envdir";
- sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc";
- };
-
- # TODO: is there a way to get the commit ref so we can set main.buildCommit?
- ldflags = [
- "-X main.buildDate=1970-01-01T00:00:00+0000" "-X main.buildVersion=${version}"
- ];
-
- meta = {
- description = "A go rewrite of envdir";
- homepage = "https://github.com/d10n/envdir";
- maintainers = with lib.maintainers; [ edude03 ];
- };
-}
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index b4439363d4ad..e48e02694052 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec {
description = "ESP8266 and ESP32 serial bootloader utility";
homepage = "https://github.com/espressif/esptool";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ dezgeg dotlambda ];
+ maintainers = with maintainers; [ dezgeg dotlambda ] ++ teams.lumiguide.members;
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 632eb4590586..40fcc8b01c21 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -18,6 +18,10 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM=";
+ # FIXME: LTO is broken with rustc 1.61, see https://github.com/rust-lang/rust/issues/97255
+ # remove this with rustc 1.61.1+
+ CARGO_PROFILE_RELEASE_LTO = "false";
+
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index 09ace554d7be..1f7bab8cb969 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "fclones";
- version = "0.24.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yiOoknhKGRGUgZShz9gGOsaX1+IOr23UFviIx/Uva6M=";
+ sha256 = "sha256-7MNVLfBH6hWoNy+UQzK6gwZuPbBPMfG660my+E6FT5Q=";
};
- cargoSha256 = "sha256-CEfFCYUmFv1cG2DEAfgK+wr3UTgFMZlEQVqUaWnqzdk=";
+ cargoSha256 = "sha256-8Ur3KwGuIY8QAGNTcyTpFg2C1CBcIpZJp6EO9g8XuE8=";
buildInputs = lib.optionals stdenv.isDarwin [
AppKit
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index e8d77f0e612c..554eb5aad3ce 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
- version = "8.3.2";
+ version = "8.4.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
- sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg=";
+ sha256 = "sha256-Vy5ERc4GZVEjNP0z2zZJeNwfhoL0nnOeii+TjRszrFw=";
};
- cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4=";
+ cargoSha256 = "sha256-Iz8QP9NdjbBL8j/iUV6iS3U1ErPHuC5NYFHUMtR8MZg=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f2f66beffea2..6454bb4eac28 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8=";
};
+ strictDeps = true;
+ enableParallelBuilding = true;
+
nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
buildInputs = [ zlib ]
++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix
index 507fbb7dcc71..4438d9d637ba 100644
--- a/pkgs/tools/misc/flexoptix-app/default.nix
+++ b/pkgs/tools/misc/flexoptix-app/default.nix
@@ -6,12 +6,12 @@
src = fetchurl {
name = "${name}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
- sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin";
+ hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM=";
};
udevRules = fetchurl {
url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules";
- sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr";
+ hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc=";
};
appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: {
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index d860fe8cf365..ea9cad45139d 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -1,35 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd, openssl }:
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.8.11";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8=";
+ sha256 = "sha256-CMkVIWaD4Zt6SJ/4PLGrFDhirqeLbXcVa+96wsAYN/k=";
};
- patches = lib.optionals stdenv.isDarwin [
- # Fix compilations errors on darwin
- (fetchpatch {
- url = "https://github.com/calyptia/cmetrics/commit/4f0f7ae2eeec148a69156f9fcc05d64bf249d11e.patch";
- sha256 = "sha256-M1+28mHxpMvcFkOoKxkMMo1VCQsG33ncFZkFalOq2FQ=";
- stripLen = 1;
- extraPrefix = "lib/cmetrics/";
- })
- (fetchpatch {
- url = "https://github.com/calyptia/cmetrics/commit/a97999cb6d7299ef230d216b7a1c584b43c64de9.patch";
- sha256 = "sha256-RuyPEeILc86n/klPIb334XpX0F71nskQ8s/ya0rE2zI=";
- stripLen = 1;
- extraPrefix = "lib/cmetrics/";
- })
-
- # Fix bundled luajit compilation args
- ./fix-luajit-darwin.patch
- ];
-
nativeBuildInputs = [ cmake flex bison ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
deleted file mode 100644
index ef6be0f5ad35..000000000000
--- a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake
---- fluent-bit.old/cmake/luajit.cmake
-+++ fluent-bit.new/cmake/luajit.cmake
-@@ -12,15 +12,7 @@
- set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
-
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -fno-stack-check")
-- if (CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20
-- AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 21)
-- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=11.0")
-- else()
-- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.15")
-- endif()
--else()
-- set(DEPLOYMENT_TARGET "")
-+ set(CFLAGS "${CFLAGS} -fno-stack-check")
- endif()
-
- # luajit (UNIX)
-@@ -30,7 +22,7 @@
- EXCLUDE_FROM_ALL TRUE
- SOURCE_DIR ${LUAJIT_SRC}
- CONFIGURE_COMMAND ./configure
-- BUILD_COMMAND $(MAKE) CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC" ${DEPLOYMENT_TARGET}
-+ BUILD_COMMAND $(MAKE) DEFAULT_CC=cc CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC"
- INSTALL_COMMAND cp src/libluajit.a "${LUAJIT_DEST}/lib/libluajit.a")
-
- # luajit (Windows)
diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/tools/misc/foma/default.nix
index e75aaca50f6e..ea229b20445f 100644
--- a/pkgs/tools/misc/foma/default.nix
+++ b/pkgs/tools/misc/foma/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "foma";
- version = "0.9.18alpha";
+ version = "0.10.0alpha";
src = fetchFromGitHub {
owner = "mhulden";
repo = "foma";
- rev = "4456a40e81f46e3fe909c5a97a15fcf1d2a3b6c1";
- sha256 = "188yxj8wahlj2yf93rj1vx549j5cq0085d2jmj3vwzbfjq1mi1f0";
+ rev = "82f9acdef234eae8b7619ccc3a386cc0d7df62bc";
+ sha256 = "1vf01l18j8cksnavbabcckp9gg692w6v5lg81xrzv6f5v14zp4nr";
};
sourceRoot = "source/foma";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
deleted file mode 100644
index bd102e868aeb..000000000000
--- a/pkgs/tools/misc/gawp/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "gawp";
- version = "unstable-2016-01-21";
-
- goPackagePath = "github.com/martingallagher/gawp";
-
- src = fetchFromGitHub {
- owner = "martingallagher";
- repo = "gawp";
- rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
- sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0=";
- };
-
- goDeps = ./deps.nix;
-
- meta = {
- homepage = "https://github.com/martingallagher/gawp";
- description = "A simple, configurable, file watching, job execution tool";
- license = lib.licenses.asl20;
- };
-}
diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix
deleted file mode 100644
index cf577a30354c..000000000000
--- a/pkgs/tools/misc/gawp/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
- sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0";
- sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
- sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
- };
- }
-]
diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix
new file mode 100644
index 000000000000..3e38cdf9d752
--- /dev/null
+++ b/pkgs/tools/misc/gh-cal/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, fetchCrate
+, rustPlatform
+, pkg-config
+, openssl
+, Security
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "gh-cal";
+ version = "0.1.3";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
+ };
+
+ cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+
+ meta = with lib; {
+ description = "GitHub contributions calender terminal viewer";
+ homepage = "https://github.com/mrshmllow/gh-cal";
+ license = licenses.mit;
+ maintainers = with maintainers; [ loicreynier ];
+ };
+}
diff --git a/pkgs/tools/misc/gh-eco/default.nix b/pkgs/tools/misc/gh-eco/default.nix
new file mode 100644
index 000000000000..327d510f8211
--- /dev/null
+++ b/pkgs/tools/misc/gh-eco/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+ pname = "gh-eco";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "coloradocolby";
+ repo = "gh-eco";
+ rev = "v${version}";
+ sha256 = "sha256-rJG1k8lOyXQSP3FgyyHZvVrQkn2yEtAcgg9CpbPvCwY=";
+ };
+
+ vendorSha256 = "sha256-Qx/QGIurjKGFcIdCot1MFPatbGHfum48JOoHlvqA64c=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.Version=${version}"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/coloradocolby/gh-eco";
+ description = "gh extension to explore the ecosystem";
+ license = licenses.mit;
+ maintainers = with maintainers; [ helium ];
+ };
+}
+
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index b0eea8778938..c23005e96d77 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -10,14 +10,14 @@
}:
stdenv.mkDerivation rec {
- version = "1.5.6";
+ version = "1.5.7";
pname = "goaccess";
src = fetchFromGitHub {
owner = "allinurl";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s=";
+ sha256 = "sha256-ElDsQliB2+4X/psiavGr/bHQ1tMw7VMJroqCPMkOGOs=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 9b9505c9beb0..a5f1f21e0204 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.9.0";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-R20mzPpbFDUw/wrif3ZJCt2wgmV+yqSkGaxyuw/9z0E=";
+ sha256 = "sha256-lr/yTxtWjTZoiZjfqstl53V1CBf16IRkSo7+YkZ6Yxc=";
};
- vendorSha256 = "sha256-+Rj2hb9Sul5ntVGfuWf7JibKdG03zALiMWaaNTJFC8k=";
+ vendorSha256 = "sha256-MyhrFXg/A3zb2p/OlJ//lkqjFjNiEP0B0/vO0iuHDRo=";
ldflags = [
"-s"
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 8d6de0bbeb81..f6b5d9f5041b 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
})
];
+ enableParallelBuilding = true;
+
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ];
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 5db9e8f00fb2..99f130b3e5df 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Open source log management solution";
homepage = "https://www.graylog.org/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
maintainers = [ maintainers.fadenb ];
mainProgram = "graylogctl";
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 45c4441ea2d6..756484234d6e 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -19,6 +19,7 @@ let
meta = a.meta // {
platforms = graylog.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
};
});
in {
diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix
index a793ed7ebedd..04f88360fed7 100644
--- a/pkgs/tools/misc/grit/default.nix
+++ b/pkgs/tools/misc/grit/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "grit";
@@ -14,6 +14,7 @@ buildGoModule rec {
vendorSha256 = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg=";
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A multitree-based personal task manager";
homepage = "https://github.com/climech/grit";
license = licenses.mit;
diff --git a/pkgs/tools/misc/gtklp/default.nix b/pkgs/tools/misc/gtklp/default.nix
index 43f67b6b7956..8eafd98e267f 100644
--- a/pkgs/tools/misc/gtklp/default.nix
+++ b/pkgs/tools/misc/gtklp/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
./patches/autoconf.patch
];
+ # Workaround build failure on -fno-common toolchains:
+ # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar';
+ # file.o:libgtklp/libgtklp.h:83: first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
preConfigure = ''
substituteInPlace include/defaults.h --replace "netscape" "firefox"
substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 19bc90779d83..810413a7b09a 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -44,6 +44,7 @@ mkDerivation rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "http://www.glassechidna.com.au/products/heimdall/";
description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";
license = licenses.mit;
diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index dcab5f249fe5..b426c7c117a6 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hexyl";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hLDx5OzCE5iA492V3+dhaav2l8/rOVWyskrU4Gz1hf4=";
+ sha256 = "sha256-LskDHUm45OlWbzlumaIXPXCZEBA5dXanhzgAvenJgVk=";
};
- cargoSha256 = "sha256-CGaCMrShagK4dAdwJtaeUMJlYOlG/cH+6E1QDYGrqL0=";
+ cargoSha256 = "sha256-qKk95hGcThu0y3ND9z3mXw1TBaVkwAOrznaqj2k3SEk=";
meta = with lib; {
changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
deleted file mode 100644
index 79e93847932f..000000000000
--- a/pkgs/tools/misc/i3cat/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "i3cat";
- version = "1.0";
-
- goPackagePath = "github.com/vincent-petithory/i3cat";
-
- src = fetchFromGitHub {
- owner = "vincent-petithory";
- repo = "i3cat";
- rev = "v${version}";
- sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q=";
- };
-
- goDeps = ./deps.nix;
-
- meta = with lib; {
- description = "combine multiple i3bar JSON inputs into one to forward to i3bar";
- homepage = "https://vincent-petithory.github.io/i3cat/";
- license = licenses.mit;
- maintainers = with maintainers; [ ];
- };
-}
diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix
deleted file mode 100644
index 01e85cbd824d..000000000000
--- a/pkgs/tools/misc/i3cat/deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
- goPackagePath = "github.com/vincent-petithory/structfield";
- fetch = {
- type = "git";
- url = "https://github.com/vincent-petithory/structfield";
- rev = "01a738558a47fbf16712994d1737fb31c77e7d11";
- sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw";
- };
- }
-]
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
deleted file mode 100644
index 78f40974ace4..000000000000
--- a/pkgs/tools/misc/ical2org/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, fetchFromGitHub, buildGoPackage}:
-
-buildGoPackage rec {
- pname = "ical2org";
- version="1.1.5";
-
- goPackagePath = "github.com/rjhorniii/ical2org";
-
- src = fetchFromGitHub {
- owner = "rjhorniii";
- repo = "ical2org";
- rev = "v.${version}";
- sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm";
- fetchSubmodules = true;
- };
-
- goDeps = ./deps.nix;
-
- meta = with lib; {
- description = "Convert an iCal file to org agenda format, optionally deduplicating entries";
- homepage = "https://github.com/rjhorniii/ical2org";
- license = licenses.gpl3;
- maintainers = with maintainers; [ swflint ];
- platforms = platforms.unix;
- };
-
-}
diff --git a/pkgs/tools/misc/ical2org/deps.nix b/pkgs/tools/misc/ical2org/deps.nix
deleted file mode 100644
index b948fac3d116..000000000000
--- a/pkgs/tools/misc/ical2org/deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
- goPackagePath = "github.com/rjhorniii/ics-golang";
- fetch = {
- type = "git";
- url = "https://github.com/rjhorniii/ics-golang";
- rev = "da66d6f502fac65073773ea3779cae2959545cb2";
- sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px";
- };
- }
-]
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
index f25c2eb62f6b..13cb6584f0a3 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -1,17 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, libzip, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, usbmuxd
+, libimobiledevice
+, libzip
+}:
stdenv.mkDerivation rec {
pname = "ideviceinstaller";
- version = "1.1.1";
+ version = "1.1.1+date=2022-05-09";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1xp0sjgfx2z19x9mxihn18ybsmrnrcfc55zbh5a44g3vrmagmlzz";
+ rev = "3909271599917bc4a3a996f99bdd3f88c49577fa";
+ hash = "sha256-dw3nda2PNddSFPzcx2lv0Nh1KLFXwPBbDBhhwEaB6d0=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config usbmuxd libimobiledevice libzip ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ usbmuxd
+ libimobiledevice
+ libzip
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/ideviceinstaller";
@@ -21,8 +38,8 @@ stdenv.mkDerivation rec {
of an iOS device allowing to install, upgrade, uninstall, archive, restore
and enumerate installed or archived apps.
'';
- license = licenses.gpl2;
- platforms = platforms.linux ++ platforms.darwin;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
maintainers = with maintainers; [ aristid infinisil ];
};
}
diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix
index 3e4739ee032a..d874d72ec65d 100644
--- a/pkgs/tools/misc/idevicerestore/default.nix
+++ b/pkgs/tools/misc/idevicerestore/default.nix
@@ -1,23 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
, curl
, libimobiledevice
, libirecovery
, libzip
, libusbmuxd
-, IOKit
}:
stdenv.mkDerivation rec {
pname = "idevicerestore";
- version = "1.0.0";
+ version = "1.0.0+date=2022-05-22";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1w7ywp77xc6v4hifi3j9ywrj447vv7fkwg2w26w0lq95f3bkblqr";
+ rev = "f80a876b3598de4eb551bafcb279947c527fae33";
+ hash = "sha256-I9zZQcZFd0hfeEJM7jltJtVJ6V5C5rA/S8gINiCnJdY=";
};
+ postPatch = ''
+ echo '${version}' > .tarball-version
+ '';
+
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -32,7 +39,7 @@ stdenv.mkDerivation rec {
# Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`.
- ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore";
@@ -52,8 +59,7 @@ stdenv.mkDerivation rec {
This will download and restore a device to the latest firmware available.
'';
license = licenses.lgpl21Plus;
- # configure.ac suggests it should work for mingw as well but not tried yet
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
maintainers = with maintainers; [ nh2 ];
};
}
diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix
index 93b61ec12dd3..8e748efe7b4e 100644
--- a/pkgs/tools/misc/ili2c/default.nix
+++ b/pkgs/tools/misc/ili2c/default.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
Checks the syntactical correctness of an INTERLIS data model.
'';
homepage = "https://www.interlis.ch/downloads/ili2c";
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # source bundles dependencies as jars
+ ];
license = licenses.lgpl21Plus;
maintainers = [ maintainers.das-g ];
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index cfdc8cba5df5..57441e645df2 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.jgoodies.com/freeware/jdiskreport/";
description = "A graphical utility to visualize disk usage";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ kylesferrazza ];
diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
index ac3c6bcf1ad0..d93a9aeb562a 100644
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }:
+{ stdenv, fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }:
rustPlatform.buildRustPackage rec {
pname = "Lighthouse";
@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ dbus ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "VR Lighthouse power state management";
homepage = "https://github.com/ShayBox/Lighthouse";
license = licenses.mit;
diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix
index bba9db383907..f72cdc422be0 100644
--- a/pkgs/tools/misc/lilo/default.nix
+++ b/pkgs/tools/misc/lilo/default.nix
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE=";
};
nativeBuildInputs = [ dev86 sharutils ];
+
+ # Workaround build failure on -fno-common toolchains:
+ # ld: identify.o:(.bss+0x0): multiple definition of `identify';
+ # common.o:(.bss+0x160): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
makeFlags = [
"DESTDIR=${placeholder "out"}"
"SBIN_DIR=/bin"
diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix
index eb684f16417d..e245a05182da 100644
--- a/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/pkgs/tools/misc/lockfile-progs/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
'';
meta = {
+ broken = stdenv.isDarwin;
description = "Programs for locking and unlocking files and mailboxes";
homepage = "http://packages.debian.org/sid/lockfile-progs";
license = lib.licenses.gpl2Only;
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index 6cf64691efb6..69729b3f9578 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -17,14 +17,14 @@ let
shas =
if enableUnfree
then {
- x86_64-linux = "1vm53alq9q1qy2jcsjg9z339xrkac5r9qqpdafp53ny4zsv1n7vj";
- x86_64-darwin = "0hhjyl04h3gd66rdk22272rj419br4v2i59lyrmaj6hmnsqbv968";
- aarch64-linux = "0yjaki7gjffrz86hvqgn1gzhd9dc9llcj50g2x1sgpyn88zk0z0p";
+ x86_64-linux = "698b6000788e123b647c988993f710c6d9bc44eb8c8e6f97d6b18a695a61f0a6";
+ x86_64-darwin = "35e50e05fba0240aa5b138bc1c81f67addaf557701f8df41c682b5bc708f7455";
+ aarch64-linux = "69694856fde11836eb1613bf3a2ba31fbdc933f58c8527b6180f6122c8bb528b";
}
else {
- x86_64-linux = "1f3659vcgczm7v03q3fvsmp1ndp6wm3i7r2b2vbl4xq7hf9v7azk";
- x86_64-darwin = "10zw9qc0lc0x9in0nkxc1aiazhyd69l8sya2ni46ivyyjwf0sqsn";
- aarch64-linux = "1czhgmky2zf3mqykn5ww4257yfhd36mi4x6dq569ymly83pivf8v";
+ x86_64-linux = "3a2da2e63bc08ee1886db29c80103c669d3ed6960290b8b97d771232769f282e";
+ x86_64-darwin = "655ab873e16257827f884f67b66d62c4da40a895d06206faa435615ad0a56796";
+ aarch64-linux = "235cf57afb619801808d5fe1bff7e01a4a9b29f77723566e5371b5f3b2bf8fad";
};
this = stdenv.mkDerivation rec {
version = elk7Version;
diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/tools/misc/map/default.nix
new file mode 100644
index 000000000000..b6049904dc62
--- /dev/null
+++ b/pkgs/tools/misc/map/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "map";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "soveran";
+ repo = "map";
+ rev = version;
+ sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA=";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ postInstall = ''
+ mkdir -p "$out/share/doc/${pname}"
+ cp README* LICENSE "$out/share/doc/${pname}"
+ '';
+
+ doCheck = true;
+
+ checkPhase = "./test/tests.sh";
+
+ meta = with lib; {
+ description = "Map lines from stdin to commands";
+ homepage = "https://github.com/soveran/map";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ pogobanane ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index 0db6f9f72872..95985eb29956 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -1,25 +1,29 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "memtest86+";
- version = "5.01-coreboot-002";
+ version = "6.00-beta2";
- src = fetchgit {
- url = "https://review.coreboot.org/memtest86plus.git";
- rev = "v002";
- sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk";
+ src = fetchFromGitHub {
+ owner = "memtest86plus";
+ repo = "memtest86plus";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-U3++iJa0Zj3g2SZTJ0jom7raAu+LGqiOKZEputs/YfM=";
};
- NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
+ # Binaries are booted directly by BIOS/UEFI or bootloader
+ # and should not be patched/stripped
+ dontPatchELF = true;
+ dontStrip = true;
- hardeningDisable = [ "all" ];
+ passthru.efi = "${finalAttrs.finalPackage}/memtest.efi";
- buildFlags = [ "memtest.bin" ];
-
- doCheck = false; # fails
+ preBuild = ''
+ cd ${if stdenv.isi686 then "build32" else "build64"}
+ '';
installPhase = ''
- install -Dm0444 -t $out/ memtest.bin
+ install -Dm0444 -t $out/ memtest.bin memtest.efi
'';
meta = {
@@ -27,5 +31,6 @@ stdenv.mkDerivation {
description = "A tool to detect memory errors";
license = lib.licenses.gpl2;
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 d237c3b7fdd5..f5d0e5e32264 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,15 +1,16 @@
-{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkg-config
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, makeWrapper, pkg-config
, lrzsz, ncurses, libiconv }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "minicom";
- version = "2.7.1";
+ version = "2.8";
- # The repository isn't tagged properly, so we need to use commit refs
- src = fetchgit {
- url = "https://salsa.debian.org/minicom-team/minicom.git";
- rev = "6ea8033b6864aa35d14fb8b87e104e4f783635ce";
- sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb";
+ src = fetchFromGitLab {
+ domain = "salsa.debian.org";
+ owner = "minicom-team";
+ repo = pname;
+ rev = version;
+ sha256 = "165zhi88swvkhl3v17223r0f27hb3y0qzrgl51jkk0my2m4xscgg";
};
buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv;
diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix
index 374d6ba05186..a28cc1d6b901 100644
--- a/pkgs/tools/misc/mutagen-compose/default.nix
+++ b/pkgs/tools/misc/mutagen-compose/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGo118Module, fetchFromGitHub, fetchzip }:
+{ stdenv, lib, buildGo118Module, fetchFromGitHub, fetchzip }:
buildGo118Module rec {
pname = "mutagen-compose";
@@ -18,6 +18,7 @@ buildGo118Module rec {
subPackages = [ "cmd/mutagen-compose" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Compose with Mutagen integration";
homepage = "https://mutagen.io/";
changelog = "https://github.com/mutagen-io/mutagen-compose/releases/tag/v${version}";
diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index aff3843e2ae7..f853ec39f60b 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGo118Module, fetchFromGitHub, fetchzip }:
+{ stdenv, lib, buildGo118Module, fetchFromGitHub, fetchzip }:
buildGo118Module rec {
pname = "mutagen";
@@ -34,6 +34,7 @@ buildGo118Module rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Make remote development work with your local tools";
homepage = "https://mutagen.io/";
changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";
diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix
index 744ce314ec4e..0ce1d66cf214 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/pkgs/tools/misc/nbench/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = lib.optionals stdenv.hostPlatform.isGnu [
- stdenv.glibc.static
+ stdenv.cc.libc.static
];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix
index 68275f4c7014..29e09c25b43e 100644
--- a/pkgs/tools/misc/ntfy-sh/default.nix
+++ b/pkgs/tools/misc/ntfy-sh/default.nix
@@ -2,21 +2,21 @@
buildGoModule rec {
pname = "ntfy-sh";
- version = "1.22.0";
+ version = "1.25.2";
src = fetchFromGitHub {
owner = "binwiederhier";
repo = "ntfy";
rev = "v${version}";
- sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU=";
+ sha256 = "sha256-xf0hk2GpBbjovZ1DIG6unnKQ297p8fjKZmgk/23IKdY=";
};
- vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8=";
+ vendorSha256 = "sha256-ZZdGve6+g0bhE+iqemWl9XtLRfUn4V3hbdVz/UhrxCA=";
doCheck = false;
preBuild = ''
- make server-deps-static-sites
+ make cli-deps-static-sites
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix
index 2a6415067d48..41a0e517ee40 100644
--- a/pkgs/tools/misc/nvimpager/default.nix
+++ b/pkgs/tools/misc/nvimpager/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Use neovim as pager";
longDescription = ''
Use neovim as a pager to view manpages, diffs, etc with nvim's syntax
diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
index e0cf9d98d651..3d2d2919aa56 100644
--- a/pkgs/tools/misc/octofetch/default.nix
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -1,9 +1,9 @@
{ lib
, stdenv
, fetchFromGitHub
-, rustPlatform
-, pkg-config
, openssl
+, pkg-config
+, rustPlatform
, Security
}:
@@ -18,15 +18,16 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
};
- cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a";
+ cargoSha256 = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
nativeBuildInputs = [ pkg-config ];
+
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
- description = "Github user information on terminal";
homepage = "https://github.com/azur1s/octofetch";
+ description = "Github user information on terminal";
license = licenses.mit;
maintainers = with maintainers; [ jyooru ];
};
diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix
new file mode 100644
index 000000000000..2eb76c08317b
--- /dev/null
+++ b/pkgs/tools/misc/panoply/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenvNoCC, fetchurl, makeWrapper, jre } :
+
+stdenvNoCC.mkDerivation rec {
+ pname = "panoply";
+ version = "5.0.6";
+
+ src = fetchurl {
+ url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
+ sha256 = "0nbr22sxfmk48ngk9gb1vcwv3fkd5m0v208xx6vl00nlnbh4kms4";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ jarbase=$out/share/panoply
+ mkdir -p $out/bin $jarbase/jars
+
+ sed -i "s:^SCRIPTDIR.*:SCRIPTDIR=$jarbase:" panoply.sh
+
+ cp panoply.sh $out/bin/panoply
+ cp -r jars $jarbase
+
+ wrapProgram "$out/bin/panoply" --prefix PATH : "${jre}/bin"
+
+ runHook postHook
+ '';
+
+ meta = with lib; {
+ description = "netCDF, HDF and GRIB Data Viewer";
+ homepage = "https://www.giss.nasa.gov/tools/panoply";
+ platforms = platforms.linux;
+ maintainers = [ maintainers.markuskowa ];
+ license = licenses.unfree; # Package does not state a license
+ };
+}
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index c1abe01be565..851179c8d874 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, fetchurl, lib, makeWrapper
-, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kcrash, kinit, kpmcore, polkit-qt
, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
@@ -48,13 +48,16 @@ in mkDerivation rec {
hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];
- postFixup = ''
- wrapProgram $out/bin/partitionmanager \
+ dontWrapGApps = true;
+ preFixup = ''
+ qtWrapperArgs+=(
+ "''${gappsWrapperArgs[@]}"
--prefix PATH : "${runtimeDeps}"
+ )
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index b6cc6e4acc35..41e6694267fc 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pgmetrics";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
- sha256 = "1fwc4qc17fqmzx08kiyfx5iwgzr14dxk9i8zjd9bq5gk281v0ybd";
+ sha256 = "sha256-VDobaU+zY1ubVBrb/pdKKfSWCYTRDz1ssqZ0Fsv0KBc=";
};
- vendorSha256 = "18da45axjl8l3qb6f3w5v2c7clz4bjhdz2bck20j729k7693hpsl";
+ vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY=";
doCheck = false;
diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix
index 6f40c08dd163..8059038327bb 100644
--- a/pkgs/tools/misc/piston-cli/default.nix
+++ b/pkgs/tools/misc/piston-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ stdenv, lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "piston-cli";
@@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Piston api tool";
homepage = "https://github.com/Shivansh-007/piston-cli";
license = licenses.mit;
diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix
index 8be9c0eecee4..bf81a4ad902a 100644
--- a/pkgs/tools/misc/plantuml-server/default.nix
+++ b/pkgs/tools/misc/plantuml-server/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A web application to generate UML diagrams on-the-fly.";
homepage = "https://plantuml.com/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ truh ];
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 3bfaf99d74e5..14ef1b335820 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2022.3";
+ version = "1.2022.5";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
- sha256 = "sha256-6ad6CUz1UAvNkhdUJhOME7OsLpIXiBoERfTmowzTz64=";
+ sha256 = "sha256-Mi5aH5tlbo8qDj91ZTglFCKETcbXPfTQsBnhYOHrXpQ=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Draw UML diagrams using a simple and human readable text description";
homepage = "http://plantuml.sourceforge.net/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
# "plantuml -license" says GPLv3 or later
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bjornfor Mogria ];
diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix
index c9cb7e98bc02..0e67641103f5 100644
--- a/pkgs/tools/misc/pls/default.nix
+++ b/pkgs/tools/misc/pls/default.nix
@@ -2,20 +2,21 @@
python3.pkgs.buildPythonApplication rec {
pname = "pls";
- version = "4.0.3";
+ version = "5.1.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "dhruvkb";
repo = "pls";
rev = version;
- sha256 = "sha256-cVTIWSOx3FwF3QPak3eIIIgQ1O9JF5e5ILpcHQ4qI6k=";
+ sha256 = "sha256-xJvAAlRVKQHEOz8wbErHCUTcb8Y1otcPEUwTw2lgddo=";
};
nativeBuildInputs = [ python3.pkgs.poetry-core ];
propagatedBuildInputs = with python3.pkgs; [
pyyaml
+ requests
rich
];
diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix
index 7605f49b1535..be6e7f0a9bb6 100644
--- a/pkgs/tools/misc/precice-config-visualizer/default.nix
+++ b/pkgs/tools/misc/precice-config-visualizer/default.nix
@@ -1,4 +1,7 @@
-{ lib, python3Packages, fetchFromGitHub}:
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
python3Packages.buildPythonApplication rec {
pname = "config-visualizer";
@@ -8,15 +11,16 @@ python3Packages.buildPythonApplication rec {
owner = "precice";
repo = pname;
rev = "60f2165f25352c8261f370dc4ceb64a8b422d4ec";
- sha256 = "sha256:0mqzp2qdvbqbxaczlvc9xxxdz6hclraznbmc08ldx11xwy8yknfr";
+ hash = "sha256-2dnpkec9hN4oAqwu+1WmDJrfeu+JbfqZ6guv3bC4H1c=";
};
propagatedBuildInputs = with python3Packages; [ lxml pydot ];
+
doCheck = false;
meta = with lib; {
- description = "Small python tool for visualizing the preCICE xml configuration ";
homepage = "https://github.com/precice/config-visualizer";
+ description = "Small python tool for visualizing the preCICE xml configuration ";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Scriptkiddi ];
};
diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix
new file mode 100644
index 000000000000..9a93c6770e81
--- /dev/null
+++ b/pkgs/tools/misc/pridefetch/default.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub, python3, zip }: let
+ version = "1.0.0";
+ sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg=";
+
+ pname = "pridefetch";
+ src = fetchFromGitHub {
+ owner = "SpyHoodle";
+ repo = pname;
+ rev = "v" + version;
+ inherit sha256;
+ };
+in stdenv.mkDerivation {
+ inherit pname version src;
+ nativeBuildInputs = [
+ zip
+ ];
+ buildInputs = [
+ (python3.withPackages (pythonPackages: with pythonPackages; [
+ distro
+ ]))
+ ];
+ buildPhase = ''
+ runHook preBuild
+ pushd src
+ zip -r ../pridefetch.zip ./*
+ popd
+ echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch
+ rm pridefetch.zip
+ runHook postBuild
+ '';
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ mv pridefetch $out/bin/pridefetch
+ chmod +x $out/bin/pridefetch
+ runHook postInstall
+ '';
+ meta = with lib; {
+ description = "Print out system statistics with pride flags";
+ longDescription = ''
+ Pridefetch prints your system statistics (similarly to neofetch, screenfetch or pfetch) along with a pride flag.
+ The flag which is printed is configurable, as well as the width of the output.
+ '';
+ homepage = "https://github.com/SpyHoodle/pridefetch";
+ license = licenses.mit;
+ maintainers = [
+ maintainers.minion3665
+ ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/tools/misc/procyon/default.nix
index c217f25c1e19..4d5fb120943f 100644
--- a/pkgs/tools/misc/procyon/default.nix
+++ b/pkgs/tools/misc/procyon/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Procyon is a suite of Java metaprogramming tools including a Java decompiler";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
homepage = "https://github.com/mstrobel/procyon/";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index 1db9dc2e2103..4f6338d09f42 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -102,6 +102,7 @@ mkDerivation {
};
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Cross-platform desktop tool to manage your flipper device";
homepage = "https://flipperzero.one/";
license = licenses.gpl3Only;
diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix
index 21eb7bdab292..510e1e457744 100644
--- a/pkgs/tools/misc/qmk/default.nix
+++ b/pkgs/tools/misc/qmk/default.nix
@@ -10,11 +10,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "qmk";
- version = "1.0.0";
+ version = "1.1.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co=";
+ sha256 = "sha256-dxV3yeaOt/4IlpurNq60IHE6UlBi3OUqBu2kDajNpeE=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
milc
pygments
pyusb
+ pillow
] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs
avrdude
dfu-programmer
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index bf191beca3fe..2ca7478b742f 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
lrelease rbutilqt.pro
'';
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: libmkimxboot.a(elf.c.o):utils/imxtools/sbtools/misc.h:43: multiple definition of `g_nr_keys';
+ # libmkimxboot.a(mkimxboot.c.o):utils/imxtools/sbtools/misc.h:43: first defined here
+ # TODO: try to remove with 1.5.1 update.
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
installPhase = ''
runHook preInstall
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix
index c3c88a6baf00..93f67bd2defb 100644
--- a/pkgs/tools/misc/shallot/default.nix
+++ b/pkgs/tools/misc/shallot/default.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
})
];
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: src/shallot.o:(.bss+0x8): multiple definition of `lucky_thread'; src/error.o:(.bss+0x8): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
installPhase = ''
mkdir -p $out/bin
cp ./shallot $out/bin/
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index 4c1156a83663..d58ff3fa8ed9 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
SMC can also generate GraphViz state diagrams from the input file.
'';
homepage = "http://smc.sourceforge.net/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mpl11;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index bfddaa722fda..cf6051d7bdde 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "steampipe";
@@ -30,6 +30,7 @@ buildGoModule rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://steampipe.io/";
description = "select * from cloud;";
license = licenses.agpl3;
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 0d1538664190..0d9ef7cd21d1 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
-, fetchpatch
, autoreconfHook
-, pkg-config
, bison
-, ncurses
, libevent
+, ncurses
+, pkg-config
+, systemd
, utf8proc
}:
@@ -22,7 +23,7 @@ in
stdenv.mkDerivation rec {
pname = "tmux";
- version = "3.2a";
+ version = "3.3";
outputs = [ "out" "man" ];
@@ -30,17 +31,9 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
- sha256 = "0143ylfk7zsl3xmiasb768238gr582cfhsgv3p0h0f13bp8d6q09";
+ sha256 = "sha256-Sxj2vXkbbPNRrqJKeIYwI7xdBtwRbl6a6a3yZr7UWW0=";
};
- patches = [
- # See https://github.com/tmux/tmux/pull/2755
- (fetchpatch {
- url = "https://github.com/tmux/tmux/commit/d0a2683120ec5a33163a14b0e1b39d208745968f.patch";
- sha256 = "070knpncxfxi6k4q64jwi14ns5vm3606cf402h1c11cwnaa84n1g";
- })
- ];
-
nativeBuildInputs = [
pkg-config
autoreconfHook
@@ -50,12 +43,14 @@ stdenv.mkDerivation rec {
buildInputs = [
ncurses
libevent
- ] ++ lib.optionals stdenv.isDarwin [ utf8proc ];
+ ] ++ lib.optionals stdenv.isLinux [ systemd ]
+ ++ lib.optionals stdenv.isDarwin [ utf8proc ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
- ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ];
+ ] ++ lib.optionals stdenv.isLinux [ "--enable-systemd" ]
+ ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ];
enableParallelBuilding = true;
@@ -67,24 +62,21 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://tmux.github.io/";
description = "Terminal multiplexer";
-
- longDescription =
- '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
-
- * A powerful, consistent, well-documented and easily scriptable command interface.
- * A window may be split horizontally and vertically into panes.
- * Panes can be freely moved and resized, or arranged into preset layouts.
- * Support for UTF-8 and 256-colour terminals.
- * Copy and paste with multiple buffers.
- * Interactive menus to select windows, sessions or clients.
- * Change the current window by searching for text in the target.
- * Terminal locking, manually or after a timeout.
- * A clean, easily extended, BSD-licensed codebase, under active development.
- '';
+ longDescription = ''
+ tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
+ * A powerful, consistent, well-documented and easily scriptable command interface.
+ * A window may be split horizontally and vertically into panes.
+ * Panes can be freely moved and resized, or arranged into preset layouts.
+ * Support for UTF-8 and 256-colour terminals.
+ * Copy and paste with multiple buffers.
+ * Interactive menus to select windows, sessions or clients.
+ * Change the current window by searching for text in the target.
+ * Terminal locking, manually or after a timeout.
+ * A clean, easily extended, BSD-licensed codebase, under active development.
+ '';
changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES";
license = lib.licenses.bsd3;
-
platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ thammers fpletz ];
+ maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 ];
};
}
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 78e2dc219b73..98f13bc7524a 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "8.3.1";
+ version = "9.0.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EsC17VUQDgrhCU26fsqf2zXOTKa/WeKHiWG0Zn1Qao4=";
+ sha256 = "sha256-9zP+rWhaK4fC2Qhd0oq9WVvCkvryooYo09k7016Rbxw=";
};
- cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk=";
+ cargoSha256 = "sha256-otn0XvZ0wufD+4mCGSM0hevKM+wWSvFVCKtTu/5m1uA=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ];
diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix
index c88fca0aebcb..3277036d068b 100644
--- a/pkgs/tools/misc/tremor-rs/default.nix
+++ b/pkgs/tools/misc/tremor-rs/default.nix
@@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p tremor-cli" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
homepage = "https://www.tremor.rs/";
license = licenses.asl20;
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index dc802a6fe0f8..03be10bf10b6 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://github.com/xorg62/tty-clock";
license = licenses.free;
description = "Digital clock in ncurses";
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index aca04546fd2a..41da294d19a5 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -46,6 +46,7 @@ in stdenv.mkDerivation rec {
Linux.
'';
homepage = "https://www.umlet.com";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
maintainers = with maintainers; [ oxzi ];
platforms = platforms.all;
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index 96b82a8a20a2..624c818c1f72 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -1,23 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libimobiledevice
+, libusb1
+}:
stdenv.mkDerivation rec {
pname = "usbmuxd";
- version = "unstable-2021-05-08";
+ version = "1.1.1+date=2022-04-04";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = "5e484e18f1383b5a0bd6c353ab1d668b03e4ffab";
- sha256 = "sha256-hhbfRmLEhVVuJNnw65PakPnvjSCrN3oSMK6D7Zwnw60=";
+ rev = "2839789bdb581ede7c331b9b4e07e0d5a89d7d18";
+ hash = "sha256-wYW6hI0Ti9gKtk/wxIbdY5KaPMs/p+Ve9ceeRqXihQI=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- propagatedBuildInputs = [ libimobiledevice libusb1 ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
- preConfigure = ''
- configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d"
- configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system"
- '';
+ propagatedBuildInputs = [
+ libimobiledevice
+ libusb1
+ ];
+
+ configureFlags = [
+ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/usbmuxd";
@@ -32,7 +46,7 @@ stdenv.mkDerivation rec {
in parallel. The higher-level layers are handled by libimobiledevice.
'';
license = licenses.gpl2Plus;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];
};
}
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 3375f4507bd2..f36542ad7d23 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -30,7 +30,7 @@
let
pname = "vector";
- version = "0.21.2";
+ version = "0.22.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -39,10 +39,10 @@ rustPlatform.buildRustPackage {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2iMD3QpVm1YmiEH17PdjgiNoD2Gt9BRJ5soMDB//b3Y=";
+ sha256 = "sha256-47tT17XS+bymwm82hbyCykmviGUByfFIxjNaq6OQWn8=";
};
- cargoSha256 = "sha256-OkK0COSHdZ6fHWUrZ90ltuFSCtVZ14QZiIWVwkHOvq8=";
+ cargoSha256 = "sha256-91rXbHVpdupd14XsC7GjkZd0cUhxhVMYXlRdsyUx3L0=";
nativeBuildInputs = [ pkg-config cmake perl ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage {
buildFeatures = features;
# TODO investigate compilation failure for tests
- # there are about 100 tests failing (out of 1100) for version 0.21.2
+ # there are about 100 tests failing (out of 1100) for version 0.22.0
doCheck = false;
checkFlags = [
diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix
index 81979c0903f5..6834a53bb6ec 100644
--- a/pkgs/tools/misc/vial/default.nix
+++ b/pkgs/tools/misc/vial/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchurl, appimageTools }:
let
name = "vial-${version}";
- version = "0.5.2";
+ version = "0.6";
pname = "Vial";
src = fetchurl {
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
- sha256 = "sha256-wKgkEn2BoJfk3kMXOAKlFvXgCcnwHlgu2VgwL2QM06Q=";
+ sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index f3fdc7e2227f..e850e347b29a 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation {
sh autogen.sh
'';
+ # Workaround build failure on -fno-common toolchains:
+ # mipsel-unknown-linux-uclibc-ld: boothandler.o:(.bss+0x8): multiple definition of
+ # `start_addr'; main.o:(.bss+0x8): first defined here
+ NIX_CFLAGS_COMPILE_FOR_TARGET = "-fcommon";
+
configureFlags = lib.optionals (gccCross != null) [
"--enable-firmware"
"CROSS_COMPILE=${gccCross.targetPrefix}"
@@ -34,6 +39,7 @@ stdenv.mkDerivation {
lib.optional (gccCross != null) gccCross;
meta = {
+ broken = stdenv.isDarwin;
description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
license = lib.licenses.gpl3;
homepage = "http://www.linux-mtd.infradead.org/";
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
index fadeec41031b..81199e986217 100644
--- a/pkgs/tools/misc/xprite-editor/default.nix
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--bin" "xprite-native" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://github.com/rickyhan/xprite-editor";
description = "Pixel art editor";
license = licenses.gpl3;
diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix
index a605dcf911b2..b57b546f947a 100644
--- a/pkgs/tools/misc/xstow/default.nix
+++ b/pkgs/tools/misc/xstow/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A replacement of GNU Stow written in C++";
homepage = "http://xstow.sourceforge.net";
license = licenses.gpl2Only;
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 13868bf2940e..8a976ae7831f 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://aajanki.github.io/yle-dl/";
changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
+ maintainers = with maintainers; [ dezgeg ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 90b29d80ac18..32d5b5712da8 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -1,18 +1,32 @@
-{ lib, buildPythonApplication, fetchPypi, installShellFiles }:
+{ lib
+, python3
+, substituteAll
+, ffmpeg
+, installShellFiles
+}:
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1602";
+ version = "0.4.1612";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
doCheck = false;
- src = fetchPypi {
+ src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "sha256-RwbAbMS5CA6pO08TuaTb67YM/hLRkceOF7D6iV0XcI8=";
+ sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w=";
};
+ patches = [
+ (substituteAll {
+ src = ./ffmpeg-path.patch;
+ ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
+ ffprobe = "${lib.getBin ffmpeg}/bin/ffmpeg";
+ version = lib.getVersion ffmpeg;
+ })
+ ];
+
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
@@ -25,7 +39,6 @@ buildPythonApplication rec {
meta = with lib; {
description = "A tiny command line utility to download media contents from the web";
homepage = "https://you-get.org";
- changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ ryneeverett ];
};
diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/tools/misc/you-get/ffmpeg-path.patch
new file mode 100644
index 000000000000..abbd0be9d3e1
--- /dev/null
+++ b/pkgs/tools/misc/you-get/ffmpeg-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
+index 50e2c9f..46e7f61 100755
+--- a/src/you_get/processor/ffmpeg.py
++++ b/src/you_get/processor/ffmpeg.py
+@@ -31,7 +31,7 @@ def get_usable_ffmpeg(cmd):
+ except:
+ return None
+
+-FFMPEG, FFPROBE, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None, None)
++FFMPEG, FFPROBE, FFMPEG_VERSION = ('@ffmpeg@', '@ffprobe@', '@version@')
+ if logging.getLogger().isEnabledFor(logging.DEBUG):
+ LOGLEVEL = ['-loglevel', 'info']
+ STDIN = None
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 7e311b6ea23f..3d489a13c6ea 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick
+{ stdenv, lib, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick
, libyubikey, yubikey-personalization }:
mkDerivation rec {
@@ -34,6 +34,7 @@ mkDerivation rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://developers.yubico.com/yubikey-personalization-gui";
description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey";
license = licenses.bsd2;
diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix
new file mode 100644
index 000000000000..3d60bad0a4cc
--- /dev/null
+++ b/pkgs/tools/misc/yutto/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pythonOlder
+, poetry-core
+, aiohttp
+, aiofiles
+, biliass
+, dicttoxml
+, colorama
+, ffmpeg
+, makeWrapper
+}:
+
+buildPythonApplication rec {
+ pname = "yutto";
+ version = "2.0.0b13";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-XqfbvlaJoRPpwnaUA52KloOsEOIt3YM0cq36DZN6lR8=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ aiofiles
+ biliass
+ dicttoxml
+ colorama
+ ];
+
+ preFixup = ''
+ makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})
+ '';
+
+ pythonImportsCheck = [ "yutto" ];
+
+ meta = with lib; {
+ description = "A Bilibili downloader";
+ homepage = "https://github.com/yutto-dev/yutto";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ linsui ];
+ };
+}
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index f20d4eefb479..427bcd622332 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -1,31 +1,39 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, libbsd
, libressl
, pkg-config
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "acme-client";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz";
- sha256 = "sha256-fRSYwQmyV0WapjUJNG0UGO/tUDNTGUraj/BWq/a1QTo=";
+ url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz";
+ hash = "sha256-rIeWZSOT+nPzLf2mDtOkN/wmCGffG4H6PCQb2Vxbxxk=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libbsd libressl ];
+ nativeBuildInputs = [
+ pkg-config
+ ];
- makeFlags = [ "PREFIX=${placeholder "out"}" ];
+ buildInputs = [
+ libbsd
+ libressl
+ ];
- meta = {
- homepage = "https://sr.ht/~graywolf/acme-client-portable/";
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ meta = with lib; {
description = "Secure ACME/Let's Encrypt client";
+ homepage = "https://sr.ht/~graywolf/acme-client-portable/";
platforms = platforms.unix;
license = licenses.isc;
maintainers = with maintainers; [ pmahoney ];
};
}
+
diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix
new file mode 100644
index 000000000000..2effd5508522
--- /dev/null
+++ b/pkgs/tools/networking/airgeddon/default.nix
@@ -0,0 +1,166 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+ # Required
+, aircrack-ng
+, bash
+, coreutils-full
+, gawk
+, gnugrep
+, gnused
+, iproute2
+, iw
+, pciutils
+, procps
+, tmux
+ # X11 Front
+, xterm
+, xorg
+ # what the author calls "Internals"
+, usbutils
+, wget
+, ethtool
+, util-linux
+, ccze
+ # Optionals
+ # Missing in nixpkgs: beef, hostapd-wpe, asleap
+, bettercap
+, bully
+, crunch
+, dhcp
+, dnsmasq
+, ettercap
+, hashcat
+, hcxdumptool
+, hcxtools
+, hostapd
+, john
+, lighttpd
+, mdk4
+, nftables
+, openssl
+, pixiewps
+, reaverwps-t6x # Could be the upstream version too
+, wireshark-cli
+ # Undocumented requirements (there is also ping)
+, apparmor-bin-utils
+, curl
+, glibc
+, ncurses
+, networkmanager
+, systemd
+ # Support groups
+, supportWpaWps ? true # Most common use-case
+, supportHashCracking ? false
+, supportEvilTwin ? false
+, supportX11 ? false # Allow using xterm instead of tmux, hard to test
+}:
+let
+ deps = [
+ aircrack-ng
+ bash
+ coreutils-full
+ curl
+ gawk
+ glibc
+ gnugrep
+ gnused
+ iproute2
+ iw
+ networkmanager
+ ncurses
+ pciutils
+ procps
+ tmux
+ usbutils
+ wget
+ ethtool
+ util-linux
+ ccze
+ systemd
+ ] ++ lib.optionals supportWpaWps [
+ bully
+ pixiewps
+ reaverwps-t6x
+ ] ++ lib.optionals supportHashCracking [
+ crunch
+ hashcat
+ hcxdumptool
+ hcxtools
+ john
+ wireshark-cli
+ ] ++ lib.optionals supportEvilTwin [
+ bettercap
+ dhcp
+ dnsmasq
+ ettercap
+ hostapd
+ lighttpd
+ openssl
+ mdk4
+ nftables
+ apparmor-bin-utils
+ ] ++ lib.optionals supportX11 [
+ xterm
+ xorg.xset
+ xorg.xdpyinfo
+ ];
+in
+stdenv.mkDerivation rec {
+ pname = "airgeddon";
+ version = "11.01";
+
+ src = fetchFromGitHub {
+ owner = "v1s1t0r1sh3r3";
+ repo = "airgeddon";
+ rev = "v${version}";
+ sha256 = "3TjaLEcerRk69Ys4kj7vOMCRUd0ifFJzL4MB5ifoK68=";
+ };
+
+ strictDeps = true;
+ nativeBuildInputs = [ makeWrapper ];
+
+ # What these replacings do?
+ # - Disable the auto-updates (we'll run from a read-only directory);
+ # - Silence the checks (NixOS will enforce the PATH, it will only see the tools as we listed);
+ # - Use "tmux", we're not patching XTerm commands;
+ # - Remove PWD and $0 references, forcing it to use the paths from store;
+ # - Force our PATH to all tmux sessions.
+ postPatch = ''
+ patchShebangs airgeddon.sh
+ sed -i '
+ s|AIRGEDDON_AUTO_UPDATE=true|AIRGEDDON_AUTO_UPDATE=false|
+ s|AIRGEDDON_SILENT_CHECKS=false|AIRGEDDON_SILENT_CHECKS=true|
+ s|AIRGEDDON_WINDOWS_HANDLING=xterm|AIRGEDDON_WINDOWS_HANDLING=tmux|
+ ' .airgeddonrc
+
+ sed -Ei '
+ s|\$\(pwd\)|${placeholder "out"}/share/airgeddon;scriptfolder=${placeholder "out"}/share/airgeddon/|
+ s|\$\{0\}|${placeholder "out"}/bin/airgeddon|
+ s|tmux send-keys -t "([^"]+)" "|tmux send-keys -t "\1" "export PATH=\\"$PATH\\"; |
+ ' airgeddon.sh
+ '';
+
+ # ATTENTION: No need to chdir around, we're removing the occurrences of "$(pwd)"
+ postInstall = ''
+ wrapProgram $out/bin/airgeddon --prefix PATH : ${lib.makeBinPath deps}
+ '';
+
+ # Install only the interesting files
+ installPhase = ''
+ runHook preInstall
+ install -Dm 755 airgeddon.sh "$out/bin/airgeddon"
+ install -dm 755 "$out/share/airgeddon"
+ cp -dr .airgeddonrc known_pins.db language_strings.sh plugins/ "$out/share/airgeddon/"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Multi-use TUI to audit wireless networks. ";
+ homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ pedrohlc ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index b04ddf8f597a..846c966d00c4 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://portswigger.net/burp/";
downloadPage = "https://portswigger.net/burp/freedownload";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
platforms = jdk11.meta.platforms;
hydraPlatforms = [];
diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix
index 1ae0f0036026..35bdcf7e4a24 100644
--- a/pkgs/tools/networking/checkip/default.nix
+++ b/pkgs/tools/networking/checkip/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "checkip";
- version = "0.35.2";
+ version = "0.38.0";
src = fetchFromGitHub {
owner = "jreisinger";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-O6jVedVwzC575s7LS0gx1t6mUizQGv4Gcqra57vXX+w=";
+ sha256 = "sha256-F+Sc3t1GYpGR+EEP+9GpzfaiWNQVpDivzpS66E7Li3A=";
};
- vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc=";
+ vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0=";
# Requires network
doCheck = false;
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
deleted file mode 100644
index 3366001042d7..000000000000
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ buildGoPackage, lib, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "curl-unix-socket";
- version = "unstable-2015-04-10";
-
- src = fetchFromGitHub {
- owner = "Soulou";
- repo = "curl-unix-socket";
- rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307";
- sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d";
- };
-
- goPackagePath = "github.com/Soulou/curl-unix-socket";
-
- buildPhase = ''
- runHook preBuild
- (
- cd go/src/${goPackagePath}
- go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket
- )
- runHook postBuild
- '';
-
- meta = with lib; {
- description = "Run HTTP requests over UNIX socket";
- license = licenses.mit;
- homepage = "https://github.com/Soulou/curl-unix-socket";
- maintainers = with maintainers; [offline];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index e961fa152f78..a909db97fa07 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -177,8 +177,6 @@ stdenv.mkDerivation rec {
'';
passthru = {
- # Additional checking with support http3 protocol.
- tests.nginx-http3 = nixosTests.nginx-http3;
inherit opensslSupport openssl;
tests = {
inherit curlpp coeurl;
@@ -186,6 +184,8 @@ stdenv.mkDerivation rec {
ocaml-curly = ocamlPackages.curly;
php-curl = phpExtensions.curl;
pycurl = python3.pkgs.pycurl;
+ # Additional checking with support http3 protocol.
+ inherit (nixosTests) nginx-http3;
};
};
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 63fc1cffd9a5..7120e76821d6 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Toolkit for Http-based file management";
longDescription = "Davix is a toolkit designed for file
diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix
index bad1b9ee1c5a..f606c3f6cd6a 100644
--- a/pkgs/tools/networking/dcap/default.nix
+++ b/pkgs/tools/networking/dcap/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "dCache access protocol client library";
homepage = "https://github.com/dCache/dcap";
changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog";
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 744fd482ab18..57ab6ed97b90 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -18,7 +18,6 @@ let
six
requests
websocket-client
- ipaddress
docker_pycreds
uptime
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index ac35da0bbd3b..b37572d30b79 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -10,15 +10,15 @@ let
in buildGoModule rec {
pname = "datadog-agent";
- version = "7.35.1";
+ version = "7.36.0";
src = fetchFromGitHub {
inherit owner repo;
rev = version;
- sha256 = "sha256-TvkPw67HBeRkKbbA3O/JVBkEUds36eW4UwKnRvPwAXc=";
+ sha256 = "sha256-pkbgYE58T9QzV7nCzvfBoTt6Ue8cCMUBSuCBeDtdkzo=";
};
- vendorSha256 = "sha256-RmHxjJAMS+2MVoBJMD6FTQLhxDgzH3jtp87474i9ho8=";
+ vendorSha256 = "sha256-SxdSoZtRAdl3evCpb+3BHWf/uPYJJKgw0CL9scwNfGA=";
subPackages = [
"cmd/agent"
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
index 4175de2e23cc..b6e5229a2f20 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
"--enable-resolvconf"
];
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1";
+ # -fcommon: Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: ./Port-linux/libLowLevel.a(libLowLevel_a-interface.o):(.bss+0x4): multiple definition of `interface_auto_up';
+ # ./Port-linux/libLowLevel.a(libLowLevel_a-lowlevel-linux-link-state.o):(.bss+0x74): first defined here
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1" + " -fcommon";
meta = with lib; {
description = "Portable DHCPv6 implementation";
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix
index 09f1fbc2f9f9..e8826ee6454b 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/pkgs/tools/networking/dirb/default.nix
@@ -25,6 +25,12 @@ in stdenv.mkDerivation rec {
sed -i "s#/usr#$out#" src/dirb.c
'';
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: resume.o:/build/dirb222/src/variables.h:15: multiple definition of `curl';
+ # crea_wordlist.o:/build/dirb222/src/variables.h:15: first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
postInstall = ''
mkdir -p $out/share/dirb/
cp -r wordlists/ $out/share/dirb/
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index c9044cb92ac4..7fd740a9035b 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.42.1";
+ version = "0.43.0";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-m4Xc5ZorsO6WcbHmJGROJ8SsPCm/KmFapQRQZTZIQKw=";
+ sha256 = "sha256-rhhfXdtPxNnHqMgkLfm9ZMXWbKHMAPnFzeyMxt3LbeA=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 0fb559afc990..05e3152bec19 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -12,19 +12,15 @@
stdenv.mkDerivation rec {
pname = "eternal-terminal";
- version = "6.1.11";
+ version = "6.2.1";
src = fetchFromGitHub {
owner = "MisterTea";
repo = "EternalTerminal";
rev = "et-v${version}";
- hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo=";
+ hash = "sha256-YQ8Qx6RTmDoNWY8AQlnBJJendQl+tF1QA+Z6h/ar9qs=";
};
- preBuild = ''
- cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp
- '';
-
nativeBuildInputs = [
cmake
];
@@ -37,6 +33,10 @@ stdenv.mkDerivation rec {
zlib
];
+ preBuild = ''
+ cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp
+ '';
+
cmakeFlags = [
"-DDISABLE_VCPKG=TRUE"
"-DDISABLE_SENTRY=TRUE"
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Remote shell that automatically reconnects without interrupting the session";
homepage = "https://eternalterminal.dev/";
license = licenses.asl20;
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 324b220857e9..36623c021f6d 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoModule rec {
pname = "flannel";
- version = "0.17.0";
+ version = "0.18.0";
rev = "v${version}";
vendorSha256 = null;
@@ -13,7 +13,7 @@ buildGoModule rec {
inherit rev;
owner = "flannel-io";
repo = "flannel";
- sha256 = "sha256-YM/cGmtHDTzgu6Bfy52oP8E1HmLNuBHNgEpz/qTj7rg=";
+ sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g=";
};
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];
diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix
index 43cfe4812909..f6986a1516b3 100644
--- a/pkgs/tools/networking/ghostunnel/default.nix
+++ b/pkgs/tools/networking/ghostunnel/default.nix
@@ -1,4 +1,5 @@
-{ buildGoModule
+{ stdenv
+, buildGoModule
, fetchFromGitHub
, lib
, nixosTests
@@ -32,6 +33,7 @@ buildGoModule rec {
};
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications";
homepage = "https://github.com/ghostunnel/ghostunnel#readme";
license = licenses.asl20;
diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix
index 29f017c81d3f..acda428875e7 100644
--- a/pkgs/tools/networking/globalprotect-openconnect/default.nix
+++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "globalprotect-openconnect";
- version = "1.4.1";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "yuezk";
repo = "GlobalProtect-openconnect";
fetchSubmodules = true;
rev = "v${version}";
- sha256 = "sha256-J4f+DJuKQUGK49muAtPU1aL/KI9mofIjyCcIztNVyr4=";
+ sha256 = "sha256-9wRe7pJiosk2b0FKhHKpG6P2QPuBo8bVi6rnUMIkG6I=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace GPService/gpservice.h \
--replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect;
+ substituteInPlace GPClient/settingsdialog.ui \
+ --replace /etc/gpservice/gp.conf $out/etc/gpservice/gp.conf;
+ substituteInPlace GPService/gpservice.cpp \
+ --replace /etc/gpservice/gp.conf $out/etc/gpservice/gp.conf;
+ substituteInPlace GPService/CMakeLists.txt \
+ --replace /etc/gpservice $out/etc/gpservice;
'';
meta = with lib; {
diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix
index 44cac245927f..bd60b2adc45d 100644
--- a/pkgs/tools/networking/godspeed/default.nix
+++ b/pkgs/tools/networking/godspeed/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildGoModule
, fetchFromGitHub
, libpcap
@@ -26,6 +27,7 @@ buildGoModule rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Manager for reverse shells";
homepage = "https://github.com/redcode-labs/GodSpeed";
license = with licenses; [ mit ];
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix
deleted file mode 100644
index 10c5c8ea64fe..000000000000
--- a/pkgs/tools/networking/goklp/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "goklp";
- version = "1.6";
-
- goPackagePath = "github.com/AppliedTrust/goklp";
-
- src = fetchFromGitHub {
- owner = "AppliedTrust";
- repo = "goklp";
- rev = "v${version}";
- sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c";
- };
-
- goDeps = ./deps.nix;
-
- meta = with lib; {
- description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand";
- homepage = "https://github.com/AppliedTrust/goklp";
- maintainers = with maintainers; [ disassembler ];
- license = licenses.bsd2;
- };
-}
diff --git a/pkgs/tools/networking/goklp/deps.nix b/pkgs/tools/networking/goklp/deps.nix
deleted file mode 100644
index 2f6481f237f8..000000000000
--- a/pkgs/tools/networking/goklp/deps.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-[
- {
- goPackagePath = "github.com/asaskevich/govalidator";
- fetch = {
- type = "git";
- url = "https://github.com/asaskevich/govalidator";
- rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7";
- sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w";
- };
- }
- {
- goPackagePath = "github.com/docopt/docopt-go";
- fetch = {
- type = "git";
- url = "https://github.com/docopt/docopt-go";
- rev = "784ddc588536785e7299f7272f39101f7faccc3f";
- sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
- sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
- };
- }
- {
- goPackagePath = "github.com/vaughan0/go-ini";
- fetch = {
- type = "git";
- url = "https://github.com/vaughan0/go-ini";
- rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
- sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
- };
- }
- {
- goPackagePath = "gopkg.in/asn1-ber.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/asn1-ber.v1";
- rev = "379148ca0225df7a432012b8df0355c2a2063ac0";
- sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx";
- };
- }
- {
- goPackagePath = "gopkg.in/ldap.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/ldap.v2";
- rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
- sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
- };
- }
-]
diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix
index c8f42b3ad4a7..0c12652586be 100644
--- a/pkgs/tools/networking/gost/default.nix
+++ b/pkgs/tools/networking/gost/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "gost";
@@ -42,6 +42,7 @@ buildGoModule rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A simple tunnel written in golang";
homepage = "https://github.com/ginuerzh/gost";
license = licenses.mit;
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index de332843c04e..66a26ee98de1 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Applications and router for I2P, anonymity over the Internet";
homepage = "https://geti2p.net";
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # source bundles dependencies as jars
+ ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ joelmo ];
diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix
index 940c7d58904c..26f4f68c778f 100644
--- a/pkgs/tools/networking/ipinfo/default.nix
+++ b/pkgs/tools/networking/ipinfo/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ipinfo";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = "${pname}-${version}";
- sha256 = "sha256-hvn50sn1UHkC2K0U5beRAYkAe8y/5sYH7Xed3atXzDo=";
+ hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix
index 58b35f2f53fa..39002f128159 100644
--- a/pkgs/tools/networking/junkie/default.nix
+++ b/pkgs/tools/networking/junkie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libpcap, guile, openssl }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libpcap, guile, openssl }:
stdenv.mkDerivation rec {
pname = "junkie";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
};
+ patches = [
+ # Pull upstream patch for -fno-common toolchains:
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/rixed/junkie/commit/52209c5b0c9a09981739ede9701cd73e82a88ea5.patch";
+ sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr";
+ })
+ ];
buildInputs = [ libpcap guile openssl ];
nativeBuildInputs = [ pkg-config ];
configureFlags = [
diff --git a/pkgs/tools/networking/magic-wormhole-rs/Cargo.toml.patch b/pkgs/tools/networking/magic-wormhole-rs/Cargo.toml.patch
deleted file mode 100644
index debb1e264390..000000000000
--- a/pkgs/tools/networking/magic-wormhole-rs/Cargo.toml.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index d33b5d6..ddde8ed 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -150,33 +150,6 @@ dependencies = [
- "winapi 0.3.9",
- ]
-
--[[package]]
--name = "async-std"
--version = "1.10.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952"
--dependencies = [
-- "async-channel",
-- "async-global-executor",
-- "async-io",
-- "async-lock",
-- "crossbeam-utils",
-- "futures-channel",
-- "futures-core",
-- "futures-io",
-- "futures-lite",
-- "gloo-timers",
-- "kv-log-macro",
-- "log",
-- "memchr",
-- "num_cpus",
-- "once_cell",
-- "pin-project-lite",
-- "pin-utils",
-- "slab",
-- "wasm-bindgen-futures",
--]
--
- [[package]]
- name = "async-std"
- version = "1.10.0"
-@@ -230,7 +203,7 @@ version = "0.16.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd"
- dependencies = [
-- "async-std 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "async-std",
- "async-tls",
- "futures-io",
- "futures-util",
-@@ -1154,7 +1127,7 @@ name = "magic-wormhole"
- version = "0.3.0"
- dependencies = [
- "async-io",
-- "async-std 1.10.0 (git+https://github.com/async-rs/async-std)",
-+ "async-std",
- "async-tungstenite",
- "base64",
- "bytecodec",
-diff --git a/Cargo.toml b/Cargo.toml
-index b4ff2c0..d4094af 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -82,3 +82,6 @@ required-features = ["bin"]
-
- [profile.release]
- overflow-checks = true
-+
-+[patch.crates-io]
-+async-std = { version = "1.9.0", features = ["attributes", "unstable"], git = "https://github.com/async-rs/async-std" }
diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix
index 3d9e20d14dce..742292e168bb 100644
--- a/pkgs/tools/networking/magic-wormhole-rs/default.nix
+++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix
@@ -2,31 +2,36 @@
, stdenv
, fetchFromGitHub
, rustPlatform
+, libxcb
+, Security
+, AppKit
}:
rustPlatform.buildRustPackage rec {
pname = "magic-wormhole-rs";
- version = "0.3.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "magic-wormhole";
repo = "magic-wormhole.rs";
rev = version;
- sha256 = "sha256-i4vJ6HmtM42m1x1UtOq9xlmhYIa5ZKXUm1rGFNRprmY=";
+ sha256 = "sha256-+H/IzMxiGz7UVVkEWpmyBepGET9doQFNDvOCZEMF0p4=";
};
- # this patch serves as a workaround for the problems of cargo-vendor described in
- # https://github.com/NixOS/nixpkgs/issues/30742
- # and can probably be removed once the issue is resolved
- cargoPatches = [ ./Cargo.toml.patch ];
- cargoSha256 = "sha256-ujwvwr4GR/rQWnXFfL8sqPyz4QvGeOxwBrT+gf+vjsI=";
+ cargoSha256 = "sha256-pRdb5NSqueHmK5vbZfmbDGOz7NQvmUI/pj9KgShiIn0=";
+
+ buildInputs = [ libxcb ]
+ ++ lib.optionals stdenv.isDarwin [ Security AppKit ];
# all tests involve networking and are bound fail
doCheck = false;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Rust implementation of Magic Wormhole, with new features and enhancements";
homepage = "https://github.com/magic-wormhole/magic-wormhole.rs";
+ changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md";
license = licenses.eupl12;
maintainers = with maintainers; [ zeri piegames ];
+ mainProgram = "wormhole-rs";
};
}
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
deleted file mode 100644
index bef421a7ab4c..000000000000
--- a/pkgs/tools/networking/maxscale/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc
-, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient
-, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
-, libaio, libedit, libtool, libui, libuuid, zlib
-}:
-
-stdenv.mkDerivation rec {
- pname = "maxscale";
- version = "2.1.17";
-
- src = fetchFromGitHub {
- owner = "mariadb-corporation";
- repo = "MaxScale";
- rev = "${pname}-${version}";
- sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
- };
-
- nativeBuildInputs = [ cmake pkg-config ];
-
- buildInputs = [
- bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient
- ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
- libaio libedit libtool libui libuuid zlib
- ];
-
- patches = [ ./getopt.patch ];
-
- preConfigure = ''
- for i in `grep -l -R '#include ' .`; do
- substituteInPlace $i --replace "#include " "#include <${glibc.dev}/include/getopt.h>"
- done
- '';
-
- cmakeFlags = [
- "-DUSE_C99=YES"
- "-DDEFAULT_ADMIN_USER=root"
- "-DWITH_MAXSCALE_CNF=YES"
- "-DSTATIC_EMBEDDED=YES"
- "-DBUILD_RABBITMQ=YES"
- "-DBUILD_BINLOG=YES"
- "-DBUILD_CDC=NO"
- "-DBUILD_MMMON=YES"
- "-DBUILD_LUAFILTER=YES"
- "-DLUA_LIBRARIES=${lua}/lib"
- "-DLUA_INCLUDE_DIR=${lua}/include"
- "-DGCOV=NO"
- "-DWITH_SCRIPTS=OFF"
- "-DBUILD_TESTS=NO"
- "-DBUILD_TOOLS=NO"
- "-DPROFILE=NO"
- "-DWITH_TCMALLOC=YES"
- "-DWITH_JEMALLOC=YES"
- "-DINSTALL_EXPERIMENTAL=YES"
- "-DTARGET_COMPONENT=all"
- ];
-
- CFLAGS = "-std=gnu99";
-
- enableParallelBuilding = false;
-
- dontStrip = true;
-
- postInstall = ''
- find $out/bin -type f -perm -0100 | while read f1; do
- patchelf \
- --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \
- --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
- && patchelf --shrink-rpath $f1
- done
-
- find $out/lib/maxscale -type f -perm -0100 | while read f2; do
- patchelf \
- --set-rpath "$(patchelf --print-rpath $f2)":$out/lib/maxscale $f2
- done
-
- mv $out/share/maxscale/create_grants $out/bin
- rm -rf $out/{etc,var}
- '';
-
- meta = with lib; {
- description = "MaxScale database proxy extends MariaDB Server's high availability";
- homepage = "https://mariadb.com/products/technology/maxscale";
- license = licenses.bsl11;
- platforms = platforms.linux;
- maintainers = with maintainers; [ izorkin ];
- broken = true;
- };
-}
diff --git a/pkgs/tools/networking/maxscale/getopt.patch b/pkgs/tools/networking/maxscale/getopt.patch
deleted file mode 100644
index db09a8e8f1ec..000000000000
--- a/pkgs/tools/networking/maxscale/getopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/server/core/maxpasswd.c 2018-01-12 05:06:49.000000000 -0500
-+++ b/server/core/maxpasswd.c 2018-01-12 06:50:18.518000000 -0500
-@@ -25,6 +25,7 @@
-
- #include
-
-+#include
- #include
- #include
- #include
-
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index ac37e93c7360..b4d420ea22da 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,24 +1,45 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking
-, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }:
+{ lib
+, stdenv
+, fetchgit
+, asciidoc
+, docbook_xml_dtd_45
+, docbook2x
+, libxml2
+, meson
+, ninja
+, pkg-config
+, curl
+, glib
+, fuse
+}:
stdenv.mkDerivation rec {
pname = "megatools";
- version = "1.10.3";
+ version = "1.11.0";
src = fetchgit {
url = "https://megous.com/git/megatools";
- rev = "5581d06e447b84d0101d36dc96ab72920eec1017";
- sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4";
+ rev = version;
+ sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
};
nativeBuildInputs = [
- autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2
- docbook_xsl docbook_xml_dtd_45 libxslt
+ asciidoc
+ docbook_xml_dtd_45
+ docbook2x
+ libxml2
+ meson
+ ninja
+ pkg-config
];
- buildInputs = [ glib glib-networking curl ]
- ++ lib.optionals stdenv.isLinux [ fuse ];
+
+ buildInputs = [
+ curl
+ glib
+ ] ++ lib.optionals stdenv.isLinux [ fuse ];
enableParallelBuilding = true;
+ strictDeps = true;
meta = with lib; {
description = "Command line client for Mega.co.nz";
diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix
index 8fe6e6169fd6..3a652cca24fe 100644
--- a/pkgs/tools/networking/mozillavpn/default.nix
+++ b/pkgs/tools/networking/mozillavpn/default.nix
@@ -47,19 +47,19 @@ let
};
pname = "mozillavpn";
- version = "2.8.0";
+ version = "2.8.3";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-UmLYs/J6syfMrjA66K33h8ubYqzvmcGf5spIilVVdVk=";
+ hash = "sha256-eKgoRE/JDEQEFp7xYY60ARDgw/n5VoZpD/Gb/CWzHuo=";
};
patches = [
# Rust bridge: Add Cargo.lock file
(fetchpatch {
- url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3341/commits/718c7f52756b5a88511da91dafad7af312bb2473.patch";
+ url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/05c9a366cf9dc4e378485c8e9d494f77c35dbb8c.patch";
hash = "sha256-fG+SATbJpGqpCFXSWEiBo4dYx6RLtJYR0yTdBqN6Fww=";
})
];
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
inherit src patches;
name = "${pname}-${version}";
preBuild = "cd ${cargoRoot}";
- hash = "sha256-dnbF1hfm3qoZaPrIimhY2bUzlrYaNVUZ+nyp6NbgP3Y=";
+ hash = "sha256-C0wPmGVXbhUs0IzeIMZD6724P0XTOzeK1bzrnUMPlWo=";
};
postPatch = ''
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 47d0dffda007..fd140bfe55ed 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.6.10";
+ version = "1.6.11";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
- sha256 = "1uJB8QdR0JgWlogb1cdUicz+LLtYQpAvYJjwcRjXt+E=";
+ sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c=";
};
postPatch = lib.optionalString (batchSize != null) ''
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index d302e6250950..e0679c089bcd 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests }:
+{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders }:
stdenv.mkDerivation rec {
pname = "nbd";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aHcVbSOnsz917uidL1wskcVCr8PNy2Nt6lqIU5pY0Qw=";
};
- buildInputs = [ glib ]
- ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
+ buildInputs = [ glib linuxHeaders ];
nativeBuildInputs = [ pkg-config which bison ];
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
deleted file mode 100644
index d33b749399ff..000000000000
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ buildGoPackage, go-bindata, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "ngrok";
- version = "1.7.1";
- rev = version;
-
- goPackagePath = "ngrok";
-
- src = fetchFromGitHub {
- inherit rev;
- owner = "inconshreveable";
- repo = "ngrok";
- sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
- };
-
- goDeps = ./deps.nix;
-
- nativeBuildInputs = [ go-bindata ];
-
- preConfigure = ''
- sed -e '/jteeuwen\/go-bindata/d' \
- -e '/export GOPATH/d' \
- -e 's/go get/#go get/' \
- -e 's|bin/go-bindata|go-bindata|' -i Makefile
- make assets BUILDTAGS=release
- export sourceRoot=$sourceRoot/src/ngrok
- '';
-
- tags = [ "release" ];
-
- meta = {
- homepage = "https://ngrok.com/";
- };
-}
diff --git a/pkgs/tools/networking/ngrok-1/deps.nix b/pkgs/tools/networking/ngrok-1/deps.nix
deleted file mode 100644
index 1db3c3e65191..000000000000
--- a/pkgs/tools/networking/ngrok-1/deps.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-[
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "a622679ebd7a3b813862379232f645f8e690e43f";
- sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
- };
- }
- {
- goPackagePath = "github.com/rcrowley/go-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/rcrowley/go-metrics";
- rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3";
- sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/go-vhost";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/go-vhost";
- rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
- sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
- };
- }
- {
- goPackagePath = "code.google.com/p/log4go";
- fetch = {
- type = "git";
- url = "https://github.com/ccpaging/log4go";
- rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8";
- sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2";
- };
- }
- {
- goPackagePath = "github.com/daviddengcn/go-colortext";
- fetch = {
- type = "git";
- url = "https://github.com/daviddengcn/go-colortext";
- rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
- sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v1";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
- sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
- sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
- };
- }
- {
- goPackagePath = "github.com/nsf/termbox-go";
- fetch = {
- type = "git";
- url = "https://github.com/nsf/termbox-go";
- rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
- sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh";
- };
- }
- {
- goPackagePath = "gopkg.in/inconshreveable/go-update.v0";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/go-update";
- rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066";
- sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
- sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
- };
- }
- {
- goPackagePath = "github.com/kr/binarydist";
- fetch = {
- type = "git";
- url = "https://github.com/kr/binarydist";
- rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
- sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
- };
- }
-]
diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix
index 5fc03c19c902..c9e58174f85e 100644
--- a/pkgs/tools/networking/ookla-speedtest/default.nix
+++ b/pkgs/tools/networking/ookla-speedtest/default.nix
@@ -4,7 +4,7 @@ let
pname = "ookla-speedtest";
version = "1.1.1";
- srcs = {
+ srcs = rec {
x86_64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz";
sha256 = "sha256-lwR3/f7k10HnXwiPr2SPm1HHvgQxP7iP+13gfrGjBAw=";
@@ -13,6 +13,11 @@ let
url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz";
sha256 = "sha256-J2pAhz/hw8okohWAwvxkqpLtNY/8bbYHGhPQOo1DH9k=";
};
+ x86_64-darwin = fetchurl {
+ url = "https://install.speedtest.net/app/cli/${pname}-${version}.84-macosx-x86_64.tgz";
+ sha256 = "sha256-FT925OUCortHDH98O0uK+qUOuYuxHoYhb8sai5JnbpQ=";
+ };
+ aarch64-darwin = x86_64-darwin;
};
in
diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix
index 01c5b6376765..c1161ea8d475 100644
--- a/pkgs/tools/networking/ooniprobe-cli/default.nix
+++ b/pkgs/tools/networking/ooniprobe-cli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
- version = "3.14.2";
+ version = "3.15.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
- hash = "sha256-9n/Ozyy1QzjFum/R/X2DChzTHl70e+JQuo09nToAIcE=";
+ hash = "sha256-lIRU6TM76/uX2LA4hdWbF4fbbcfGMUzmGz4e1PTyH3c=";
};
- vendorSha256 = "/fN9nRYOy00EeI8zZQFkCgTMGLZ0pFbYmRdTr2NLIsc=";
+ vendorSha256 = "h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU=";
subPackages = [ "cmd/ooniprobe" ];
diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 1ff0299a6bff..7f6923da822b 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -31,6 +31,7 @@ let this = stdenv.mkDerivation rec {
meta = with lib; {
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
homepage = "https://github.com/OpenAPITools/openapi-generator";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = [ maintainers.shou ];
};
diff --git a/pkgs/tools/networking/openapi-generator-cli/example.nix b/pkgs/tools/networking/openapi-generator-cli/example.nix
index f59173b9744a..047c02a9a912 100644
--- a/pkgs/tools/networking/openapi-generator-cli/example.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/example.nix
@@ -4,7 +4,7 @@ runCommand "openapi-generator-cli-test" {
nativeBuildInputs = [ openapi-generator-cli ];
petstore = fetchurl {
url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/14c0908becbccd78252be49bd92be8c53cd2b9e3/examples/v3.0/petstore.yaml";
- sha256 = "sha256:1mgdbzv42alv0b1a18dqbabqyvyhrg3brynr5hqsrm3qljfzaq5b";
+ hash = "sha256-q2D1naR41KwxLNn6vMbL0G+Pl1q4oaDCApsqQfZf7dU=";
};
config = builtins.toJSON {
elmVersion = "0.19";
diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix
index 6d3d7fd3058e..3650792e1819 100644
--- a/pkgs/tools/networking/opensnitch/ui.nix
+++ b/pkgs/tools/networking/opensnitch/ui.nix
@@ -15,6 +15,11 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-8IfupmQb1romGEvv/xqFkYhp0gGoY4ZEllX6rZYIkqw=";
};
+ postPatch = ''
+ substituteInPlace ui/opensnitch/utils.py \
+ --replace /usr/lib/python3/dist-packages/data ${python3Packages.pyasn}/${python3Packages.python.sitePackages}/pyasn/data
+ '';
+
nativeBuildInputs = [
python3Packages.pyqt5
wrapQtAppsHook
@@ -32,7 +37,9 @@ python3Packages.buildPythonApplication rec {
preBuild = ''
make -C ../proto ../ui/opensnitch/ui_pb2.py
+ # sourced from ui/Makefile
pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc
+ sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2*
'';
preConfigure = ''
@@ -44,7 +51,7 @@ python3Packages.buildPythonApplication rec {
'';
postInstall = ''
- mv $out/lib/python3.9/site-packages/usr/* $out/
+ mv $out/${python3Packages.python.sitePackages}/usr/* $out/
'';
dontWrapQtApps = true;
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index c6107086fde5..f50920186dfe 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -31,6 +31,9 @@ python3Packages.buildPythonApplication rec {
sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py
sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py
+
+ # incompatible with latest autobahn
+ rm src/allmydata/test/web/test_logs.py
'';
# Remove broken and expensive tests.
@@ -95,6 +98,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://tahoe-lafs.org/";
license = [ licenses.gpl2Plus /* or */ "TGPPLv1+" ];
maintainers = with lib.maintainers; [ MostAwesomeDude ];
- platforms = platforms.gnu ++ platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix
index 529e80ebade6..91cb5489f029 100644
--- a/pkgs/tools/networking/pathvector/default.nix
+++ b/pkgs/tools/networking/pathvector/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pathvector";
- version = "5.11.1";
+ version = "5.12.0";
src = fetchFromGitHub {
owner = "natesales";
repo = "pathvector";
rev = "v${version}";
- sha256 = "sha256-OgIDk+05bG2KrBQOyyMPaH0OJXU3gLM9OBab9lI+yXw=";
+ sha256 = "sha256-RdUZkkALEdyq+YKtgGE/P8eTX2v3fdYHF1wpZEyfkgY=";
};
- vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0=";
+ vendorSha256 = "sha256-oxLMfmHLaOQwpRYwnHRQY0mIV5/fZ65RDgKVs0Kzd2Q=";
CGO_ENABLED = 0;
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 8d227e1fbba1..e9fa828af533 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Very simple, yet secure VPN software";
homepage = "http://wiki.ucis.nl/QuickTun";
maintainers = [ maintainers.fpletz ];
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 50ac8c7a8afe..0b203ba2caae 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.14.2";
+ version = "1.14.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- sha256 = "sha256-zWiC1GhrI3gcXhr8JpAbFF6t7N6aBSho33FMu8bhF2o=";
+ sha256 = "sha256-tRiziyCw1Qpm22RtZHeKt4VFReJidFHsPxPSjxIA3hA=";
};
- cargoSha256 = "sha256-nSKeFLWTHhtmlvA9MV6NpupKJo3d1jKpTBI5H8cHJ9s=";
+ cargoSha256 = "sha256-snnzNb1yJ8L5pMvNNEIf5hZOpFV6DKOWGtGP1T3YTWg=";
RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
index a55a32c21a9a..668dc18f8ace 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
c-ares
];
- NIX_CFLAGS_COMPILE = "--std=gnu89";
+ # -fcommon: workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: transport.o:/build/source/sipsak.h:323: multiple definition of
+ # `address'; auth.o:/build/source/sipsak.h:323: first defined here
+ NIX_CFLAGS_COMPILE = "-std=gnu89 -fcommon";
src = fetchFromGitHub {
owner = "sipwise";
diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix
index dc98d95828f5..44963b739107 100644
--- a/pkgs/tools/networking/slowlorust/default.nix
+++ b/pkgs/tools/networking/slowlorust/default.nix
@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM=";
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Lightweight slowloris (HTTP DoS) tool";
homepage = "https://github.com/MJVL/slowlorust";
license = licenses.mit;
diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix
index 8535f18567da..fb343fac5a57 100644
--- a/pkgs/tools/networking/snowflake/default.nix
+++ b/pkgs/tools/networking/snowflake/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "snowflake";
- version = "2.0.1";
+ version = "2.2.0";
src = fetchgit {
url = "https://git.torproject.org/pluggable-transports/${pname}";
rev = "v${version}";
- hash = "sha256-ULkqsh0DeFI1GsaVaHGSjoEY38EktvDVC52Sx6cQLOE=";
+ sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70";
};
- vendorSha256 = "D5A19UHL1WEE1ODT80jKT+PJ5CTXPjc9Eg6v2Nfm4aw=";
+ vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1";
meta = with lib; {
description = "System to defeat internet censorship";
diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix
index 48eea919b14e..31ded651b89e 100644
--- a/pkgs/tools/networking/sockperf/default.nix
+++ b/pkgs/tools/networking/sockperf/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Network Benchmarking Utility";
homepage = "https://github.com/Mellanox/sockperf";
license = licenses.bsd3;
diff --git a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix
index 05e518371262..beb61502ec7f 100644
--- a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix
+++ b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A small SSH askpass GUI using GTK+2";
homepage = "https://github.com/atj/ssh-askpass-fullscreen";
license = licenses.gpl2;
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index dd01bf504404..766c9a095021 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ssldump";
- version = "1.4";
+ version = "1.5";
src = fetchFromGitHub {
owner = "adulau";
repo = "ssldump";
rev = "v${version}";
- sha256 = "1xnlfqsl93nxbcv4x4xsgxa6mnhcx37hijrpdb7vzla6q7xvg8qr";
+ sha256 = "sha256-nk1sXQN9cPIZD7Xlg8CHmKySfvfWl2j0CGxmIyvA6z4=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 4895c95bba19..b8737724cc0e 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stunnel";
- version = "5.63";
+ version = "5.64";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
- sha256 = "sha256-x0xOFRRKOuNLi4kLsxyQkgcwFJC9HlG/qqX/6wqZRhc=";
+ sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM=";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
index 37e35e95e7f4..e8f6364de85e 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
homepage = "https://github.com/swagger-api/swagger-codegen";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = [ maintainers.jraygauthier ];
};
diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix
index 9aedd77aff7f..224b71f63d95 100644
--- a/pkgs/tools/networking/swagger-codegen3/default.nix
+++ b/pkgs/tools/networking/swagger-codegen3/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = [ maintainers._1000101 ];
};
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index f8e028dc616a..987315b8351c 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
};
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: main.o:/build/tftp-hpa-5.2/tftp/main.c:98: multiple definition of
+ # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here
+ NIX_CFLAGS_COMPILE="-fcommon";
+
meta = with lib; {
description = "TFTP tools - a lot of fixes on top of BSD TFTP";
maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index 34f093687605..85c981c5c105 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's|/usr/bin/||' doc/Makefile
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
- sed -i 's|/usr/include/sys/|${stdenv.glibc.dev}/include/sys/|' usr/Makefile
- sed -i 's|/usr/include/linux/|${stdenv.glibc.dev}/include/linux/|' usr/Makefile
+ sed -i 's|/usr/include/sys/|${stdenv.cc.libc.dev}/include/sys/|' usr/Makefile
+ sed -i 's|/usr/include/linux/|${stdenv.cc.libc.dev}/include/linux/|' usr/Makefile
'';
postInstall = ''
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index 6aa05738498b..b382aeaf7428 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods.
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://tinyproxy.github.io/";
description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems";
license = licenses.gpl2Only;
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 2bece5e30dd7..5f255ecb80f8 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0jchvgkkphhwp2z7vd4axxr9ns8b6vqc22b2z8a906qm8916wd8i";
};
+ # Apply upstream fix for -fno-common toolchains.
+ postPatch = ''
+ # TODO: remove the replace once upstream fix is released:
+ # https://sourceforge.net/p/urlget/uget2/ci/14890943c52e0a5cd2a87d8a1c51cbffebee7cf9/
+ substituteInPlace ui-gtk/UgtkBanner.h --replace "} banner;" "};"
+ '';
+
nativeBuildInputs = [
pkg-config
intltool
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index ba1fcb6d0362..630ea8ada8e6 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,16 +3,16 @@
}:
let
- version = "4.44.0";
+ version = "4.45.0";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
- sha256 = "1yk02n2lllbcwqkz4f3l3d2df1w3m768zxvdawgmafjgmbqf0gjf";
+ sha256 = "sha256-vVCWCppGeAc7dwY0fX+G0CU3Vy6OBPpDBUOBK3ykg60=";
};
- vendorSha256 = "sha256-kTwISKPIFpb/OPh9rIzLH8a6mqpyDBJo2stSu5bc02Q=";
+ vendorSha256 = "sha256-TbWMbIT578I8xbNsKgBeSP4MewuEKpfh62ZbJIeHgDs=";
assetsDrv = symlinkJoin {
name = "v2ray-assets";
diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix
new file mode 100644
index 000000000000..06639a5ef129
--- /dev/null
+++ b/pkgs/tools/networking/voms/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+ # Native build inputs
+, autoreconfHook
+, bison
+, flex
+, pkg-config
+ # Build inputs
+, expat
+, gsoap
+, openssl
+, zlib
+}:
+
+stdenv.mkDerivation rec{
+ pname = "voms-unstable";
+ version = "2021-05-04";
+
+ src = fetchFromGitHub {
+ owner = "italiangrid";
+ repo = "voms";
+ rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8";
+ sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y=";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ bison
+ flex
+ pkg-config
+ ];
+
+ buildInputs = [
+ expat
+ gsoap
+ openssl
+ zlib
+ ];
+
+ outputs = [ "bin" "out" "dev" "man" ];
+
+ preAutoreconf = ''
+ mkdir -p aux src/autogen
+ '';
+
+ postAutoreconf = ''
+ # FHS patching
+ substituteInPlace configure \
+ --replace "/usr/bin/soapcpp2" "${gsoap}/bin/soapcpp2"
+
+ # Tell gcc about the location of zlib
+ # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=voms
+ export GSOAP_SSL_PP_CFLAGS="$(pkg-config --cflags gsoapssl++ zlib)"
+ export GSOAP_SSL_PP_LIBS="$(pkg-config --libs gsoapssl++ zlib)"
+ '';
+
+ configureFlags = [
+ "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h"
+ ];
+
+ meta = with lib; {
+ description = "The VOMS native service and APIs";
+ homepage = "https://italiangrid.github.io/voms/";
+ changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
+ license = licenses.asl20;
+ platforms = platforms.linux; # gsoap is currently Linux-only in Nixpkgs
+ maintainers = with maintainers; [ ShamrockLee ];
+ };
+}
diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix
index f0d5991d34bc..a3b6b0f738ab 100644
--- a/pkgs/tools/networking/vpnc-scripts/default.nix
+++ b/pkgs/tools/networking/vpnc-scripts/default.nix
@@ -1,15 +1,24 @@
-{ lib, stdenv, fetchgit
+{ lib
+, stdenv
+, fetchgit
+, coreutils
+, gawk
+, gnugrep
+, iproute2
, makeWrapper
-, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2
+, nettools
+, openresolv
+, systemd
}:
stdenv.mkDerivation {
pname = "vpnc-scripts";
version = "unstable-2021-09-24";
+
src = fetchgit {
url = "https://gitlab.com/openconnect/vpnc-scripts.git";
rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f";
- sha256 = "sha256:19aj6mfkclbkx6ycyd4xm7id1bq78ismw0y6z23f6s016k3sjc8c";
+ sha256 = "sha256-DDGpxzQBaOOG+MYDXnVEB6/Q4qmdNM+86XNRNl01UqU=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -32,8 +41,8 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- description = "script for vpnc to configure the network routing and name service";
homepage = "https://www.infradead.org/openconnect/";
+ description = "Script for vpnc to configure the network routing and name service";
license = licenses.gpl2Only;
maintainers = with maintainers; [ jerith666 ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index 200202f9ae26..cf49ad0be3e2 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g";
};
+ # Workaround build failure on -fno-common toolchains:
+ # ld: dns_resolv.o:(.bss+0x20): multiple definition of `system_info'; webalizer.o:(.bss+0x76e0): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
preConfigure =
''
substituteInPlace ./configure \
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Web server log file analysis program";
- homepage = "http://www.webalizer.org";
+ homepage = "https://webalizer.net/";
platforms = platforms.unix;
license = licenses.gpl2;
};
diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix
index 8b2c77cd0ea1..0bc5c2942d1b 100644
--- a/pkgs/tools/networking/wget2/default.nix
+++ b/pkgs/tools/networking/wget2/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
-, fetchpatch
# build support
, autoreconfHook
, flex
@@ -27,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wget2";
- version = "2.0.0";
+ version = "2.0.1";
outputs = [ "out" "lib" "dev" ];
@@ -35,22 +34,9 @@ stdenv.mkDerivation rec {
owner = "gnuwget";
repo = pname;
rev = "v${version}";
- sha256 = "07zs2x2k62836l0arzc333j96yjpwal1v4mr8j99x6qxgmmssrbj";
+ sha256 = "sha256-9IOM8IA8Kezk3SP3YVenxQkm8UMZgD8/ztWoDNqM0vc=";
};
- patches = [
- (fetchpatch {
- name = "fix-bashism-in-configure-ac.patch";
- url = "https://gitlab.com/gnuwget/wget2/-/commit/da9788f5d62b89ba796393d9bc496b1d8d7a7b30.patch";
- sha256 = "0bn3vkgyknks7jzs5722s2c4qlx7k5lwfiyz204bi42v1m28s1a5";
- })
- (fetchpatch {
- name = "fix-double-quotes-in-configure-ac.patch";
- url = "https://gitlab.com/gnuwget/wget2/-/commit/574c8ae08dfd8949da039879d85899123d31ab1d.patch";
- sha256 = "14rfmij5w3bvj0fnkkkrxg0lfw3vgwiyvbkal3nqhgb0mlhlmd47";
- })
- ];
-
# wget2_noinstall contains forbidden reference to /build/
postPatch = ''
substituteInPlace src/Makefile.am \
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
index 13f470c327a0..086dea7301ab 100644
--- a/pkgs/tools/networking/xh/default.nix
+++ b/pkgs/tools/networking/xh/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "xh";
- version = "0.15.0";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
- sha256 = "sha256-+GiVehgU0g/rHeikSyACbTdCdpjHd8WxjkP+uxCylnY=";
+ sha256 = "sha256-y+Bixr+WRoTGjenkHSLbVmb9IHr9nicrAWyvkg5ey8E=";
};
- cargoSha256 = "sha256-G3jaM6U7O+GLAiAbaWMIyh6Ksu4ypTK50s/RNe2wT3c=";
+ cargoSha256 = "sha256-wyK10D9MMyNF+JSacWW6GQcaMYMbDf1PHhuZ5LwZo+I=";
buildFeatures = lib.optional withNativeTls "native-tls";
diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix
index a4c90f95e90d..0dc5c7a5eb04 100644
--- a/pkgs/tools/networking/xrootd/default.nix
+++ b/pkgs/tools/networking/xrootd/default.nix
@@ -4,15 +4,16 @@
, fetchFromGitHub
, cmake
, cppunit
+, pkg-config
, curl
, fuse
, libkrb5
, libuuid
, libxml2
, openssl
-, pkg-config
, readline
, systemd
+, voms
, zlib
, enableTests ? true
}:
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [
fuse
systemd
+ voms
]
++ lib.optionals enableTests [
cppunit
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix
index 620a0b05a95c..3118b784334b 100644
--- a/pkgs/tools/package-management/appimagekit/default.nix
+++ b/pkgs/tools/package-management/appimagekit/default.nix
@@ -37,6 +37,11 @@ let
cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] .
'';
+ # Workaround build failure on -fno-common toolchains:
+ # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8):
+ # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
preConfigure = ''
sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure
sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h
diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/tools/package-management/auditwheel/default.nix
index ccb85080824c..b53ebff9c55c 100644
--- a/pkgs/tools/package-management/auditwheel/default.nix
+++ b/pkgs/tools/package-management/auditwheel/default.nix
@@ -8,13 +8,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "auditwheel";
- version = "4.0.0";
-
- disabled = python3.pkgs.pythonOlder "3.6";
+ version = "5.1.2";
+ format = "setuptools";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "03a079fe273f42336acdb5953ff5ce7578f93ca6a832b16c835fe337a1e2bd4a";
+ hash = "sha256-PuWDABSTHqhK9c0GXGN7ZhTvoD2biL2Pv8kk5+0B1ro=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -26,15 +25,17 @@ python3.pkgs.buildPythonApplication rec {
setuptools
];
- # integration tests require docker and networking
- disabledTestPaths = [ "tests/integration" ];
-
checkInputs = with python3.pkgs; [
pretend
pytestCheckHook
];
- # ensure that there are no undeclared deps
+ # Integration tests require docker and networking
+ disabledTestPaths = [
+ "tests/integration"
+ ];
+
+ # Ensure that there are no undeclared deps
postCheck = ''
PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null
'';
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 5a1e621d12a0..2eb2ddd2d984 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -35,6 +35,15 @@ rustPlatform.buildRustPackage rec {
description = "Generate Debian packages from information in Cargo.toml";
homepage = "https://github.com/mmstick/cargo-deb";
license = licenses.mit;
+ # test failures:
+ # control::tests::generate_scripts_generates_maintainer_scripts_for_unit
+ # dh_installsystemd::tests::find_units_in_empty_dir_finds_nothing
+ # dh_lib::tests::apply_with_no_matching_files
+ # dh_lib::tests::debhelper_script_subst_with_generated_file_only
+ # dh_lib::tests::debhelper_script_subst_with_no_matching_files
+ # dh_lib::tests::pkgfile_finds_most_specific_match_without_pkg_file
+ # dh_lib::tests::pkgfile_finds_most_specific_match_without_unit_file
+ broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 469eecde99fc..965c94742ec5 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
- version = "0.20.5";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
rev = "v${version}";
- sha256 = "sha256-3UuDo6lW+SG4XhqEKvpe/JeJXwEeYTA0i65yJAjDVHk=";
+ sha256 = "sha256-QTHevbEifYsf/nCmkarbrHgijjlHragLieCpVZBfKGQ=";
};
- cargoSha256 = "sha256-/3gh3NdIuWl0xtbLahNRGBl/BGpVUmR7sHUIX3bttpQ=";
+ cargoSha256 = "sha256-hEHEcB42mRn6pO5413wQbEWfJNBbiOSUuy9PGjP5EYw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 28ba43e9d662..383eeac432d9 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
- version = "8.1.2";
+ version = "8.1.4";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-9/4HQbf6wPNzsYqXbtrWoe9n2iKQoNILhjhwrbOY3Z0=";
+ sha256 = "sha256-Q8Cd//QDQ6kWgp+QEn9/h69jfaUNE1/+oqQne/2wvAg=";
};
- cargoSha256 = "sha256-iUJBhBKWYRpzwMcOvMIP8smmw5OnsTv1olv61pel5dY=";
+ cargoSha256 = "sha256-khJ6EZVJ96geD1VzvR8E2ZgHfxhX/NTPVoVIMhCh+c4=";
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index 4987c05f8762..f4bbe75aafc3 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -1,6 +1,4 @@
-{lib, stdenv, fetchurl, gettext}:
-
-assert stdenv.isLinux && stdenv ? glibc;
+{lib, stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec {
pname = "checkinstall";
@@ -54,7 +52,7 @@ stdenv.mkDerivation rec {
substituteInPlace checkinstallrc-dist --replace /usr/local $out
substituteInPlace installwatch/create-localdecls \
- --replace /usr/include/unistd.h ${stdenv.glibc.dev}/include/unistd.h
+ --replace /usr/include/unistd.h ${stdenv.cc.libc.dev}/include/unistd.h
'';
postInstall =
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 60fbdd4941f7..0384cbce7721 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -1,20 +1,19 @@
-# This file was generated by go2nix.
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "gx";
- version = "0.14.1";
-
- goPackagePath = "github.com/whyrusleeping/gx";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "whyrusleeping";
repo = pname;
- rev = "refs/tags/v${version}";
- sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
+ rev = "v${version}";
+ sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo=";
};
- goDeps = ./deps.nix;
+ vendorSha256 = "sha256-6tdVpMztaBjoQRVG2vaUWuvnPq05zjbNAX9HBiC50t0=";
+
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A packaging tool built around IPFS";
diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix
deleted file mode 100644
index 766e58775b42..000000000000
--- a/pkgs/tools/package-management/gx/deps.nix
+++ /dev/null
@@ -1,246 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
- {
- goPackagePath = "github.com/blang/semver";
- fetch = {
- type = "git";
- url = "https://github.com/blang/semver";
- rev = "3c1074078d32d767e08ab2c8564867292da86926";
- sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx";
- };
- }
- {
- goPackagePath = "github.com/btcsuite/btcd";
- fetch = {
- type = "git";
- url = "https://github.com/btcsuite/btcd";
- rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0";
- sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "07eab6a8298cf32fac45cceaac59424f98421bbc";
- sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7";
- };
- }
- {
- goPackagePath = "github.com/gxed/hashland";
- fetch = {
- type = "git";
- url = "https://github.com/gxed/hashland";
- rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8";
- sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-api";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-api";
- rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013";
- sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr";
- };
- }
- {
- goPackagePath = "github.com/ipfs/go-ipfs-files";
- fetch = {
- type = "git";
- url = "https://github.com/ipfs/go-ipfs-files";
- rev = "90d206a6f3947f904673ebffd376a2dcbbd84942";
- sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-flow-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-flow-metrics";
- rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43";
- sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-crypto";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-crypto";
- rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9";
- sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-metrics";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-metrics";
- rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a";
- sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-peer";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-peer";
- rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee";
- sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm";
- };
- }
- {
- goPackagePath = "github.com/libp2p/go-libp2p-protocol";
- fetch = {
- type = "git";
- url = "https://github.com/libp2p/go-libp2p-protocol";
- rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b";
- sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld";
- };
- }
- {
- goPackagePath = "github.com/minio/blake2b-simd";
- fetch = {
- type = "git";
- url = "https://github.com/minio/blake2b-simd";
- rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
- sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
- };
- }
- {
- goPackagePath = "github.com/minio/sha256-simd";
- fetch = {
- type = "git";
- url = "https://github.com/minio/sha256-simd";
- rev = "51976451ce1942acbb55707a983ed232fa027110";
- sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
- sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
- };
- }
- {
- goPackagePath = "github.com/mr-tron/base58";
- fetch = {
- type = "git";
- url = "https://github.com/mr-tron/base58";
- rev = "c8897612421d88a51012eaa53bf7267686173ae5";
- sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multiaddr";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multiaddr";
- rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2";
- sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multiaddr-net";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multiaddr-net";
- rev = "f0af4033635f1241179700537dacdc04f2803df8";
- sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5";
- };
- }
- {
- goPackagePath = "github.com/multiformats/go-multihash";
- fetch = {
- type = "git";
- url = "https://github.com/multiformats/go-multihash";
- rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8";
- sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm";
- };
- }
- {
- goPackagePath = "github.com/sabhiram/go-gitignore";
- fetch = {
- type = "git";
- url = "https://github.com/sabhiram/go-gitignore";
- rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e";
- sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l";
- };
- }
- {
- goPackagePath = "github.com/spaolacci/murmur3";
- fetch = {
- type = "git";
- url = "https://github.com/spaolacci/murmur3";
- rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc";
- sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
- sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/json-filter";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/json-filter";
- rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b";
- sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/progmeter";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/progmeter";
- rev = "f3e57218a75b913eff88d49a52c1debf9684ea04";
- sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/stump";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/stump";
- rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5";
- sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n";
- };
- }
- {
- goPackagePath = "github.com/whyrusleeping/tar-utils";
- fetch = {
- type = "git";
- url = "https://github.com/whyrusleeping/tar-utils";
- rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc";
- sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2";
- sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
- sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
- };
- }
-]
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index ad4435c9e2d3..bc5b90993a68 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -1,7 +1,5 @@
# This file was generated by go2nix.
-{ lib, buildGoPackage, fetchFromGitHub
-, gx
-}:
+{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gx-go";
@@ -18,13 +16,6 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- extraSrcs = [
- {
- goPackagePath = gx.goPackagePath;
- src = gx.src;
- }
- ];
-
meta = with lib; {
description = "A tool for importing go packages into gx";
homepage = "https://github.com/whyrusleeping/gx-go";
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index 882275eca44d..defbcdf6e1bb 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
- sha256 = "sha256-H8FNOOjHMUW2wIUfoDhS3eH2AgxxD0LAuX4J9SJyJhg=";
+ sha256 = "sha256-bijcLIRBfoqirwz98Q3uQjHXSOaaqZECfav4TUvCuxg=";
};
doCheck = true;
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "sha256-BTMFoZ8HqbgUXkVyydOkcQZ10TLE8KsGRdt+xhBKJVc=";
+ cargoSha256 = "sha256-LpcAMsBeNa2GDGN7+9rTtkQluPfHSnAxanRtDtRahzc=";
meta = with lib; {
description = "An interactive Nix documentation tool";
diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 2fb514cf2932..7e3f489b084a 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -11,12 +11,12 @@
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
- version = "0.0.6";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
- hash = "sha256-NCUVRiZqg9JgS+hlAczvPDb0M5uIwyyqhdKe5K1P360=";
+ hash = "sha256-fN9D1rqJ4UFmCykTK8cU0oPWqN3wR8m9/zQ6fwVdBcY=";
};
buildInputs = [
boost
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7b6d872860e3..b91ee5c9ee60 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -85,16 +85,30 @@ in lib.makeExtensible (self: {
sha256 = "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=";
};
- stable = self.nix_2_8;
+ nix_2_9 = common {
+ version = "2.9.0";
+ sha256 = "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=";
+ patches = [
+ # can be removed when updated to 2.9.1
+ (fetchpatch {
+ name = "fix-segfault-in-git-fetcher";
+ url = "https://github.com/NixOS/nix/commit/bc4759345538c89e1f045aaabcc0cafe4ecca12a.patch";
+ sha256 = "sha256-UrfH4M7a02yfE9X3tA1Pwhw4RacBW+rShYkl7ybG64I=";
+ })
+ ];
+ };
+ stable = self.nix_2_9;
+
+ # remember to backport updates to the stable branch!
unstable = lib.lowPrio (common rec {
version = "2.8";
- suffix = "pre20220512_${lib.substring 0 7 src.rev}";
+ suffix = "pre20220530_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "d354fc30b9768ea3dc737a88b57bf5e26d98135b";
- sha256 = "sha256-wwhezwy3HKeHKJX48ps2qD46f6bL9GDxsFE2QJ+qPHQ=";
+ rev = "af23d38019a47e5bb4cd6585a1678b37c957130c";
+ sha256 = "sha256-RH77Y4IhbTofNYlLQSGKLL0fJAG9iHSwRNvMEZ4M0VQ=";
};
});
})
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 2ec98b82c690..21118870bfaf 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -6,6 +6,18 @@ let
inherit (poetry2nix.mkPoetryPackages {
projectDir = ./python-env;
python = python2;
+ overrides = [
+ poetry2nix.defaultPoetryOverrides
+ (self: super: {
+ pyjwt = super.pyjwt.overridePythonAttrs (old: {
+ meta = old.meta // {
+ knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [
+ "CVE-2022-29217"
+ ];
+ };
+ });
+ })
+ ];
}) python;
pythonPackages = python.pkgs;
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
deleted file mode 100644
index c5aef5c1754d..000000000000
--- a/pkgs/tools/package-management/nixui/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem
-, writeScript }:
-let
- nixui = (import ./nixui.nix {
- inherit pkgs;
- inherit (stdenv.hostPlatform) system;
- })."nixui-git+https://github.com/matejc/nixui.git#0.2.1";
- script = writeScript "nixui" ''
- #! ${stdenv.shell}
- export PATH="${nix}/bin:\$PATH"
- ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/
- '';
- desktop = makeDesktopItem {
- name = "nixui";
- exec = script;
- icon = "${nixui}/lib/node_modules/nixui/img/128.png";
- desktopName = "NixUI";
- genericName = "NixUI";
- };
-in
-stdenv.mkDerivation rec {
- pname = "nixui";
- version = "0.2.1";
- src = fetchFromGitHub {
- owner = "matejc";
- repo = "nixui";
- rev = version;
- sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s=";
- };
- installPhase = ''
- mkdir -p $out/bin
- ln -s ${script} $out/bin/nixui
-
- mkdir -p $out/share/applications
- ln -s ${desktop}/share/applications/* $out/share/applications/
- '';
- meta = {
- description = "NodeWebkit user interface for Nix";
- homepage = "https://github.com/matejc/nixui";
- license = lib.licenses.asl20;
- maintainers = [ lib.maintainers.matejc ];
- platforms = lib.platforms.unix;
- };
-}
diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh
deleted file mode 100755
index fcb610c9d3b1..000000000000
--- a/pkgs/tools/package-management/nixui/generate.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-
-exec node2nix --nodejs-10 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
deleted file mode 100644
index e6ff9b78d386..000000000000
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
-
-let
- nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
- inherit pkgs nodejs;
- libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
- };
-in
-import ./node-packages.nix {
- inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
- inherit nodeEnv;
-}
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
deleted file mode 100644
index 89362dbec092..000000000000
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
-
-let
- sources = {
- "async-0.2.10" = {
- name = "async";
- packageName = "async";
- version = "0.2.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
- sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
- };
- };
- "binary-search-tree-0.2.4" = {
- name = "binary-search-tree";
- packageName = "binary-search-tree";
- version = "0.2.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz";
- sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510";
- };
- };
- "isnumber-1.0.0" = {
- name = "isnumber";
- packageName = "isnumber";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz";
- sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01";
- };
- };
- "mkdirp-0.3.5" = {
- name = "mkdirp";
- packageName = "mkdirp";
- version = "0.3.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
- sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
- };
- };
- "nedb-1.0.2" = {
- name = "nedb";
- packageName = "nedb";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz";
- sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
- };
- };
- "underscore-1.12.0" = {
- name = "underscore";
- packageName = "underscore";
- version = "1.12.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
- sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
- };
- };
- "underscore-1.4.4" = {
- name = "underscore";
- packageName = "underscore";
- version = "1.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
- sha1 = "61a6a32010622afa07963bf325203cf12239d604";
- };
- };
- };
-in
-{
- "nixui-git+https://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage {
- name = "nixui";
- packageName = "nixui";
- version = "0.2.1";
- src = fetchgit {
- url = "https://github.com/matejc/nixui.git";
- rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";
- sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab";
- };
- dependencies = [
- sources."async-0.2.10"
- (sources."binary-search-tree-0.2.4" // {
- dependencies = [
- sources."underscore-1.4.4"
- ];
- })
- sources."isnumber-1.0.0"
- sources."mkdirp-0.3.5"
- (sources."nedb-1.0.2" // {
- dependencies = [
- sources."underscore-1.4.4"
- ];
- })
- sources."underscore-1.12.0"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "nix-env frontend written with Polymer";
- homepage = "https://github.com/matejc/nixui";
- license = "Apache-2.0";
- };
- production = true;
- bypassCache = true;
- reconstructLock = true;
- };
-}
diff --git a/pkgs/tools/package-management/nixui/pkg.json b/pkgs/tools/package-management/nixui/pkg.json
deleted file mode 100644
index 39aceb5b0e1f..000000000000
--- a/pkgs/tools/package-management/nixui/pkg.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- { "nixui": "git+https://github.com/matejc/nixui.git#0.2.1" }
-]
diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix
index 572a9e888fd3..61ba2136d794 100644
--- a/pkgs/tools/security/boofuzz/default.nix
+++ b/pkgs/tools/security/boofuzz/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, fetchFromGitHub
, python3
}:
@@ -50,5 +51,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/jtpereyda/boofuzz";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ fab ];
+ # FAILED unit_tests/test_monitors.py::TestProcessMonitor::test_set_options_persistent
+ broken = (stdenv.isDarwin && stdenv.isx86_64);
};
}
diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix
index 74e9b05b2370..03e32faef9ea 100644
--- a/pkgs/tools/security/cariddi/default.nix
+++ b/pkgs/tools/security/cariddi/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cariddi";
- version = "1.1.6";
+ version = "1.1.7";
src = fetchFromGitHub {
owner = "edoardottt";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/ez2biYU8NnVny8v5Mu9pLq0oqzcIenpyEb3qkPd9v8=";
+ sha256 = "sha256-OiGVdRgTaoMinwYh5vTPgOUAffX6RlawAaVtBvpWN8I=";
};
vendorSha256 = "sha256-zJ39tAq+ooROMHG1vC2m2rbq+wttxqYxAd2hLg5GtJM=";
diff --git a/pkgs/tools/security/certgraph/default.nix b/pkgs/tools/security/certgraph/default.nix
index f15ec8f89e03..f18f0ca3b2cb 100644
--- a/pkgs/tools/security/certgraph/default.nix
+++ b/pkgs/tools/security/certgraph/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "certgraph";
- version = "20210224";
+ version = "20220513";
src = fetchFromGitHub {
owner = "lanrat";
repo = pname;
rev = version;
- sha256 = "14l2bls25xwd8gnsmshc588br72rwz1s0gjnsnqksri4ksqkdqlz";
+ sha256 = "sha256-7tvPiJHZE9X7I79DFNF1ZAQiaAkrtrXiD2fY7AkbWMk=";
};
- vendorSha256 = "1vih64z0zwmaflc0pwvnwyj5fhrc8qfp0kvrz73nnfpcrcan2693";
+ vendorSha256 = "sha256-ErTn7pUCtz6ip2kL8FCe+3Rhs876xtqto+z5nZqQ6cI=";
meta = with lib; {
description = "Intelligence tool to crawl the graph of certificate alternate names";
diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix
index 499f2d477b47..7646e1e8999f 100644
--- a/pkgs/tools/security/cfripper/default.nix
+++ b/pkgs/tools/security/cfripper/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
- version = "1.10.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-xDLzxe8lelHMU58SaThQ2NSfWDZ0DCYSHkiLPifxQGw=";
+ hash = "sha256-qrZlCxNLO+q5n/FS/5b51QZVg4ZDwrgWpcKVp/JLTws=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index b4d33a172916..99f8c728935b 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9zA50tnUWR8dglPvMagiGcJDkPHs7yXuqYV2jnRdWqA=";
+ sha256 = "sha256-l+jM0GCjaqbaoIcjUgnIZJqSGIsirWMwJWPrilBdps8=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
- vendorSha256 = "sha256-buOdutDZUFu+GbjyF0Ql8QAXpNEv2ej0mwjSZMHDmdA=";
+ vendorSha256 = "sha256-mZeCQOnAVZrJmi9F+y7QPPXXl48f7HAjJCmri01hYew=";
subPackages = [
"cmd/cosign"
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 456ea0890cac..f3c1745321eb 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, openssl, libgsf, gmp }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoconf, automake, openssl, libgsf, gmp }:
stdenv.mkDerivation rec {
@@ -12,9 +12,22 @@ stdenv.mkDerivation rec {
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
};
+ patches = [
+ # Pull patch pending upstream inclusion for -fno-common support:
+ # https://github.com/GavinSmith0123/crackxls2003/pull/3
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/GavinSmith0123/crackxls2003/commit/613d6c1844f76c7b67671aaa265375fed56c2a56.patch";
+ sha256 = "1pk67x67d9wji576mc57z5bzqlf9ygvn9m1z47w12mad7qmj9h1n";
+ })
+ ];
+
nativeBuildInputs = [ pkg-config autoconf automake ];
buildInputs = [ openssl libgsf gmp ];
+ # Avoid "-O5 -march=native"
+ makeFlags = [ "OPTIM_FLAGS=" ];
+
installPhase =
''
mkdir -p $out/bin
diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix
index ccd5318ffb60..7e8d8ca4bf88 100644
--- a/pkgs/tools/security/cryptomator/default.nix
+++ b/pkgs/tools/security/cryptomator/default.nix
@@ -110,6 +110,10 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Free client-side encryption for your cloud files";
homepage = "https://cryptomator.org";
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bachp ];
platforms = platforms.linux;
diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix
index 02c7fa01962f..84eccdad312f 100644
--- a/pkgs/tools/security/dalfox/default.nix
+++ b/pkgs/tools/security/dalfox/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dalfox";
- version = "2.7.4";
+ version = "2.7.5";
src = fetchFromGitHub {
owner = "hahwul";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wNoZ8bXPnYO3qQO+Is5IRGukLj+QfA+xalKC6NVc5+0=";
+ sha256 = "sha256-MCKXhDhpFLZTf0CYS3W4+4FykTuBu7q3Dy+R7RNp11s=";
};
- vendorSha256 = "sha256-qaRUlgxGqZu5T3GHONT4MyHfHr/L6cqP7o0dV4OCOLY=";
+ vendorSha256 = "sha256-GW2DgfHEKKWBfW5A7DYqhV2jP3FLDjzpYOMWSTNCN0Q=";
meta = with lib; {
description = "Tool for analysing parameter and XSS scanning";
diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix
index fc78f7c21374..aa363a24a771 100644
--- a/pkgs/tools/security/dieharder/default.nix
+++ b/pkgs/tools/security/dieharder/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
./stdint.patch
];
+ # Workaround build failure on -fno-common toolchains:
+ # ld: include/dieharder/parse.h:21: multiple definition of `splitbuf';
+ # include/dieharder/parse.h:21: first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
buildInputs = [ gsl ];
passthru = {
@@ -22,6 +27,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A Random Number Generator test suite";
homepage = "https://webhome.phy.duke.edu/~rgb/General/dieharder.php";
license = licenses.gpl2Plus;
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
index b79dba7c325f..29c23bbef279 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/pkgs/tools/security/doas/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
sed -i '/\(chown\|chmod\)/d' GNUmakefile
'';
- buildInputs = [ bison pam ];
+ nativeBuildInputs = [ bison ];
+ buildInputs = [ pam ];
meta = with lib; {
description = "Executes the given command as another user";
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 40bab69b763a..8847f5aeca43 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+}:
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2022-05-26";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-yLbPgU8BAAcXZtG4fIo6oVtD1tRBlGgNeFglyGJ8Uhk=";
+ hash = "sha256-FJg87YWGKZxGgwr14Z+FAIWzgiZR63sFBn4+CpMyQUs=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
installPhase = ''
runHook preInstall
@@ -25,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/offensive-security/exploitdb";
description = "Archive of public exploits and corresponding vulnerable software";
license = with licenses; [ gpl2Plus gpl3Plus mit ];
- maintainers = with maintainers; [ applePrincess ];
+ maintainers = with maintainers; [ applePrincess fab ];
mainProgram = "searchsploit";
};
}
diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index bb53a1958e00..17889f3214fe 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -171,6 +171,10 @@ in stdenv.mkDerivation rec {
description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission";
homepage = "https://ghidra-sre.org/";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ ];
license = licenses.asl20;
maintainers = [ "roblabla" ];
};
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index a359258f3227..a382eecce3fe 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -72,6 +72,7 @@ in stdenv.mkDerivation rec {
description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission";
homepage = "https://github.com/NationalSecurityAgency/ghidra";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = with maintainers; [ ck3d govanify mic92 ];
};
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index d03a0ce1cac8..b48dec714926 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
- version = "8.8.4";
+ version = "8.8.7";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EW5skmSnnQiMCMqyh51t1q4F5JVYWLSuj1qTqfWp/ok=";
+ sha256 = "sha256-C4AbxE37kqO3FJR/J7wP7WcV/mzzLZxPLBku5qgCxV4=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/tools/security/gitsign/default.nix
new file mode 100644
index 000000000000..8914420ca63c
--- /dev/null
+++ b/pkgs/tools/security/gitsign/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub, stdenv }:
+
+buildGoModule rec {
+ pname = "gitsign";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "sigstore";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-tcWq+WZJLyO8lJKxV0QSDH1JKgW+9FaC9FxrSotLQag=";
+ };
+ vendorSha256 = "sha256-34pyHAUU1+K9qNAi7rPZIvaGAen+LrwEqLyrrzUaLbk=";
+
+ ldflags = [ "-s" "-w" ];
+
+ meta = {
+ homepage = "https://github.com/sigstore/gitsign";
+ changelog = "https://github.com/sigstore/gitsign/releases/tag/v${version}";
+ description = "Keyless Git signing using Sigstore";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ lesuisse ];
+ # Need updated macOS SDK
+ # https://github.com/NixOS/nixpkgs/issues/101229
+ broken = (stdenv.isDarwin && stdenv.isx86_64);
+ };
+}
diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 8e0fb95c7c43..7e4d6f672f7e 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
- version = "0.8.3";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
- hash = "sha256-lqV09FEZAw1ir2cJr8ABhbgSoZoWnxhbxyA1HAufLQA=";
+ hash = "sha256-iIMpAAIw6djLNP9lnrHV7D198VcHspQP4OHcr2LNKOA=";
};
- cargoHash = "sha256-RMF4/WJRcpHuXKMvDYAGaJxUazcpkQCpv//u5XOd9Dg=";
+ cargoHash = "sha256-xrv1tFzPReHDA+gr/RPCvSM7Sa7v8OKAEY+fSUjPT50=";
nativeBuildInputs = [
gpgme # for gpgme-config
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Terminal user interface for GnuPG";
homepage = "https://github.com/orhun/gpg-tui";
+ changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix
index 7333c20fd7b8..300e41750bab 100644
--- a/pkgs/tools/security/honggfuzz/default.nix
+++ b/pkgs/tools/security/honggfuzz/default.nix
@@ -1,51 +1,49 @@
{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, clang, llvm, libbfd
, libopcodes, libunwind, libblocksruntime }:
-let
- honggfuzz = stdenv.mkDerivation rec {
- pname = "honggfuzz";
- version = "2.5";
+stdenv.mkDerivation rec {
+ pname = "honggfuzz";
+ version = "2.5";
- src = fetchFromGitHub {
- owner = "google";
- repo = pname;
- rev = version;
- sha256 = "sha256-TkyUKmiiSAfCnfQhSOUxuce6+dRyMmHy7vFK59jPIxM=";
- };
-
- postPatch = ''
- substituteInPlace hfuzz_cc/hfuzz-cc.c \
- --replace '"clang' '"${clang}/bin/clang'
- '';
-
- enableParallelBuilding = true;
-
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ llvm ];
- propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ];
-
- makeFlags = [ "PREFIX=$(out)" ];
-
- meta = {
- description =
- "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer";
- longDescription = ''
- Honggfuzz is a security oriented, feedback-driven, evolutionary,
- easy-to-use fuzzer with interesting analysis options. It is
- multi-process and multi-threaded, blazingly fast when the persistent
- fuzzing mode is used and has a solid track record of uncovered security
- bugs.
-
- Honggfuzz uses low-level interfaces to monitor processes and it will
- discover and report hijacked/ignored signals from crashes. Feed it
- a simple corpus directory (can even be empty for the feedback-driven
- fuzzing), and it will work its way up, expanding it by utilizing
- feedback-based coverage metrics.
- '';
- homepage = "https://honggfuzz.dev/";
- license = lib.licenses.asl20;
- platforms = [ "x86_64-linux" ];
- maintainers = with lib.maintainers; [ cpu ];
- };
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-TkyUKmiiSAfCnfQhSOUxuce6+dRyMmHy7vFK59jPIxM=";
};
-in honggfuzz
+
+ postPatch = ''
+ substituteInPlace hfuzz_cc/hfuzz-cc.c \
+ --replace '"clang' '"${clang}/bin/clang'
+ '';
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ llvm ];
+ propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+ description =
+ "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer";
+ longDescription = ''
+ Honggfuzz is a security oriented, feedback-driven, evolutionary,
+ easy-to-use fuzzer with interesting analysis options. It is
+ multi-process and multi-threaded, blazingly fast when the persistent
+ fuzzing mode is used and has a solid track record of uncovered security
+ bugs.
+
+ Honggfuzz uses low-level interfaces to monitor processes and it will
+ discover and report hijacked/ignored signals from crashes. Feed it
+ a simple corpus directory (can even be empty for the feedback-driven
+ fuzzing), and it will work its way up, expanding it by utilizing
+ feedback-based coverage metrics.
+ '';
+ homepage = "https://honggfuzz.dev/";
+ license = lib.licenses.asl20;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with lib.maintainers; [ cpu chivay ];
+ };
+}
diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
index 1d1d4797a9bb..24e8470182bf 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast and friendly network scanner";
homepage = "https://angryip.org";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kylesferrazza ];
diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix
index 1358d9f3198e..654104ada73e 100644
--- a/pkgs/tools/security/jadx/default.nix
+++ b/pkgs/tools/security/jadx/default.nix
@@ -103,6 +103,10 @@ in stdenv.mkDerivation {
Command line and GUI tools for produce Java source code from Android Dex
and Apk files.
'';
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ ];
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ delroth ];
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index 4e7a62374040..bfa4132ac025 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -102,6 +102,10 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast Java Decompiler with powerful GUI";
homepage = "https://java-decompiler.github.io/";
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ ];
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.thoughtpolice ];
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index 9b4500019982..e1d05a632dc3 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubescape";
- version = "2.0.155";
+ version = "2.0.156";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0=";
+ hash = "sha256-bbTafsHllJQZ9Qn+qFnlr/AdU7NgB/vAvQGIgt/XDNQ=";
};
vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A=";
@@ -45,9 +45,9 @@ buildGoModule rec {
--replace "TestScanRepository" "SkipScanRepository" \
--replace "TestGit" "SkipGit"
- # without networking the branch context can't be fetched and is empty
+ # remove test that requires networking
substituteInPlace core/cautils/scaninfo_test.go \
- --replace 'assert.Equal(t, "master", ctx.RepoContextMetadata.Branch)' 'assert.Equal(t, "", ctx.RepoContextMetadata.Branch)'
+ --replace "TestSetContextMetadata" "SkipSetContextMetadata"
'';
postInstall = ''
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 3c198e9b7010..17e70a3113c7 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
- sha256 = "sha256-tO9/egY4eNwQpCZU0zx8G3k4UYsf7S3tUdr6pCMTAWU=";
+ sha256 = "sha256-fPQX/Iz+dc3nF3xMPt0bek4JC2XSHe4aC4O0tZwLf6Y=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index eefa52e57b96..10ba01253e27 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.43"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.1"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 1ee626e7772c..8df40a01cc2e 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: c9fe91b3cd4e8738a0da5a23bf8f485d16961751
- ref: refs/tags/6.1.43
+ revision: 4acd1765f0d11144fd01b7812dd66a4c94efa610
+ ref: refs/tags/6.2.1
specs:
- metasploit-framework (6.1.43)
+ metasploit-framework (6.2.1)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -129,13 +129,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
- aws-partitions (1.589.0)
+ aws-partitions (1.595.0)
aws-sdk-core (3.131.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-ec2 (1.315.0)
+ aws-sdk-ec2 (1.317.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.68.0)
@@ -177,29 +177,10 @@ GEM
eventmachine (1.2.7)
faker (2.21.0)
i18n (>= 1.8.11, < 2)
- faraday (1.10.0)
- faraday-em_http (~> 1.0)
- faraday-em_synchrony (~> 1.0)
- faraday-excon (~> 1.1)
- faraday-httpclient (~> 1.0)
- faraday-multipart (~> 1.0)
- faraday-net_http (~> 1.0)
- faraday-net_http_persistent (~> 1.0)
- faraday-patron (~> 1.0)
- faraday-rack (~> 1.0)
- faraday-retry (~> 1.0)
+ faraday (2.3.0)
+ faraday-net_http (~> 2.0)
ruby2_keywords (>= 0.0.4)
- faraday-em_http (1.0.0)
- faraday-em_synchrony (1.0.0)
- faraday-excon (1.1.0)
- faraday-httpclient (1.0.1)
- faraday-multipart (1.0.3)
- multipart-post (>= 1.2, < 3)
- faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.2.0)
- faraday-patron (1.0.0)
- faraday-rack (1.0.0)
- faraday-retry (1.0.3)
+ faraday-net_http (2.0.3)
faye-websocket (0.11.1)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
@@ -215,7 +196,7 @@ GEM
hrr_rb_ssh-ed25519 (0.4.2)
ed25519 (~> 1.2)
hrr_rb_ssh (>= 0.4)
- http-cookie (1.0.4)
+ http-cookie (1.0.5)
domain_name (~> 0.5)
http_parser.rb (0.8.0)
httpclient (2.8.3)
@@ -229,7 +210,7 @@ GEM
rkelly-remix
json (2.6.2)
little-plugger (1.1.4)
- logging (2.3.0)
+ logging (2.3.1)
little-plugger (~> 1.1)
multi_json (~> 1.14)
loofah (2.18.0)
@@ -270,9 +251,8 @@ GEM
mini_portile2 (2.8.0)
minitest (5.15.0)
mqtt (0.5.0)
- msgpack (1.5.1)
+ msgpack (1.5.2)
multi_json (1.15.0)
- multipart-post (2.1.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6)
@@ -291,9 +271,9 @@ GEM
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nori (2.6.0)
- octokit (4.22.0)
- faraday (>= 0.9)
- sawyer (~> 0.8.0, >= 0.5.3)
+ octokit (4.23.0)
+ faraday (>= 1, < 3)
+ sawyer (~> 0.9)
openssl-ccm (1.2.2)
openssl-cmac (2.0.1)
openvas-omp (0.0.4)
@@ -312,7 +292,7 @@ GEM
puma (5.6.4)
nio4r (~> 2.0)
racc (1.6.0)
- rack (2.2.3)
+ rack (2.2.3.1)
rack-protection (2.2.0)
rack
rack-test (1.1.0)
@@ -388,7 +368,7 @@ GEM
ruby-macho (3.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
- ruby_smb (3.1.2)
+ ruby_smb (3.1.3)
bindata
openssl-ccm
openssl-cmac
@@ -396,9 +376,9 @@ GEM
windows_error (>= 0.1.4)
rubyntlm (0.6.3)
rubyzip (2.3.2)
- sawyer (0.8.2)
+ sawyer (0.9.1)
addressable (>= 2.3.5)
- faraday (> 0.8, < 2.0)
+ faraday (>= 0.17.3, < 3)
simpleidn (0.2.1)
unf (~> 0.1.4)
sinatra (2.2.0)
@@ -415,7 +395,7 @@ GEM
rack (>= 1, < 3)
thor (1.2.1)
tilt (2.0.10)
- timeout (0.2.0)
+ timeout (0.3.0)
ttfunk (1.7.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
@@ -423,7 +403,7 @@ GEM
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.8.1)
+ unf_ext (0.0.8.2)
unix-crypt (1.3.0)
warden (1.2.9)
rack (>= 2.0.9)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 805ae4839dd0..c72972433ea5 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.1.43";
+ version = "6.2.1";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-tw7WuBFSYWDh2saddei6xCQuhKX1O6EiuoKf4sfTYpo=";
+ sha256 = "sha256-0BskBkQjj3qvNtaTj4tR4BStVYvyiZ58IICPnP7yhBI=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index c86fbbf05f6e..3cbdacc33fec 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1blp6b22w54y7a969pzzsdrkqqfa57h0b9qj79l6l9ywylkx49qq";
+ sha256 = "0vgm7l4nyj23sif850mfsh170jbkhm7j34686ygc0nfyzzm90c08";
type = "gem";
};
- version = "1.589.0";
+ version = "1.595.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -124,10 +124,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s87d49r43nwq696ga0n155f8fm96lhhv3vjdc9qsh82li21nwcf";
+ sha256 = "0ihv5bbyphpbifviw57nfw733d1mcaf8qy7ws7hfbb462cizgxl0";
type = "gem";
};
- version = "1.315.0";
+ version = "1.317.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -354,110 +354,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
+ sha256 = "1rvxs99wvrcw65v8ykppih323kw1qr5pnzgw3daxch1sfj828f2k";
type = "gem";
};
- version = "1.10.0";
- };
- faraday-em_http = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-em_synchrony = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-excon = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
- type = "gem";
- };
- version = "1.1.0";
- };
- faraday-httpclient = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
- type = "gem";
- };
- version = "1.0.1";
- };
- faraday-multipart = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
- type = "gem";
- };
- version = "1.0.3";
+ version = "2.3.0";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ sha256 = "1mbgcnjikbqa5d0pyn6cv30f33p2vaj3rgzkx45gwxw2gmx4wlb6";
type = "gem";
};
- version = "1.0.1";
- };
- faraday-net_http_persistent = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
- type = "gem";
- };
- version = "1.2.0";
- };
- faraday-patron = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-rack = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-retry = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
- type = "gem";
- };
- version = "1.0.3";
+ version = "2.0.3";
};
faye-websocket = {
groups = ["default"];
@@ -544,10 +454,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
+ sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.5";
};
"http_parser.rb" = {
groups = ["default"];
@@ -644,10 +554,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9";
+ sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
loofah = {
groups = ["default"];
@@ -694,12 +604,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "c9fe91b3cd4e8738a0da5a23bf8f485d16961751";
- sha256 = "16k2sg3y57w2p8ia2fzmln22w964pbl7b7f6vbhn0qaj26wdc3mp";
+ rev = "4acd1765f0d11144fd01b7812dd66a4c94efa610";
+ sha256 = "04l4ybz9r3w041y9x2gjidass570a65qz4yn6sppm3r38h3286yh";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.1.43";
+ version = "6.2.1";
};
metasploit-model = {
groups = ["default"];
@@ -786,10 +696,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";
+ sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy";
type = "gem";
};
- version = "1.5.1";
+ version = "1.5.2";
};
multi_json = {
groups = ["default"];
@@ -801,16 +711,6 @@
};
version = "1.15.0";
};
- multipart-post = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
- type = "gem";
- };
- version = "2.1.1";
- };
mustermann = {
groups = ["default"];
platforms = [];
@@ -927,10 +827,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj";
+ sha256 = "1h34b0jcvzkivx1n9vgpmys4rzwgsvmd4zij4xhbzc3pi05602zf";
type = "gem";
};
- version = "4.22.0";
+ version = "4.23.0";
};
openssl-ccm = {
groups = ["default"];
@@ -1047,10 +947,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
+ sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc";
type = "gem";
};
- version = "2.2.3";
+ version = "2.2.3.1";
};
rack-protection = {
groups = ["default"];
@@ -1387,10 +1287,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c0qdi787hvf3d8p3ivjlfwnj2cz70cgj656x26wnn0rhrgbad1n";
+ sha256 = "0vqj4lb41vkpv0dl65caw7w9h804vzbdw5q6wvkzqv1q0k8nbqbd";
type = "gem";
};
- version = "3.1.2";
+ version = "3.1.3";
};
rubyntlm = {
groups = ["default"];
@@ -1417,10 +1317,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
+ sha256 = "054913a0v0jwparf4ajk3k7lhbsrq906f2m10429hr7lkhxfxx2a";
type = "gem";
};
- version = "0.8.2";
+ version = "0.9.1";
};
simpleidn = {
groups = ["default"];
@@ -1507,10 +1407,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10bx1hcyrjqgq6a848fc1i0cgrvx42gcy8hk4vp90y6zc7k8xzbk";
+ sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.0";
};
ttfunk = {
groups = ["default"];
@@ -1557,10 +1457,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz";
+ sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
type = "gem";
};
- version = "0.0.8.1";
+ version = "0.0.8.2";
};
unix-crypt = {
groups = ["default"];
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 0186accc24a8..329de10ff6bb 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }:
+{ stdenv, lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }:
python3.pkgs.buildPythonApplication rec {
pname = "onioncircuits";
@@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://tails.boum.org";
description = "GTK application to display Tor circuits and streams";
license = licenses.gpl3;
diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix
index e7e21aec7c8e..e8afdf6bf8c0 100644
--- a/pkgs/tools/security/open-ecard/default.nix
+++ b/pkgs/tools/security/open-ecard/default.nix
@@ -56,6 +56,7 @@ in stdenv.mkDerivation rec {
description = "Client side implementation of the eCard-API-Framework (BSI
TR-03112) and related international standards, such as ISO/IEC 24727";
homepage = "https://www.openecard.org/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
maintainers = with maintainers; [ sephalon ];
platforms = platforms.linux;
diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix
new file mode 100644
index 000000000000..033b5e2028d1
--- /dev/null
+++ b/pkgs/tools/security/passage/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper, bash, age, git ? null
+, xclip ? null }:
+
+stdenv.mkDerivation {
+ pname = "passage";
+ version = "unstable-2022-05-01";
+
+ src = fetchFromGitHub {
+ owner = "FiloSottile";
+ repo = "passage";
+ rev = "1262d308f09db9b243513a428ab4b8fb1c30d31d";
+ sha256 = "1val8wl9kzlxj4i1rrh2iiyf97w9akffvr0idvbkdb09hfzz4lz8";
+ };
+
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ extraPath = lib.makeBinPath [ age git xclip ];
+
+ # Using $0 is bad, it causes --help to mention ".passage-wrapped".
+ postInstall = ''
+ substituteInPlace $out/bin/passage --replace 'PROGRAM="''${0##*/}"' 'PROGRAM=passage'
+ wrapProgram $out/bin/passage --prefix PATH : $extraPath --argv0 $pname
+ '';
+
+ installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
+
+ meta = with lib; {
+ description = "Stores, retrieves, generates, and synchronizes passwords securely";
+ homepage = "https://github.com/FiloSottile/passage";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ kaction ];
+ platforms = platforms.unix;
+
+ longDescription = ''
+ passage is a fork of password-store (https://www.passwordstore.org) that uses
+ age (https://age-encryption.org) as a backend instead of GnuPG.
+
+ It keeps passwords inside age(1) encrypted files inside a simple
+ directory tree and provides a series of commands for manipulating the
+ password store, allowing the user to add, remove, edit and synchronize
+ passwords.
+ '';
+ };
+}
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index db3ddd167a60..bcc7163bec2f 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2";
- sha256 = "sha256:024x0hadn0kc0m9yz3l2pqzc5mdqyza9lmckg0bn4xak6frzkqwy";
+ hash = "sha256-nuP5szNTdWIXeJNVmtT3uNXCPr6Cju9TBWwC2xQEnQg=";
};
patches = [ ./no-dropdir-literals.patch ];
diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix
index 0cc3f9bcf047..e7a21fdef443 100644
--- a/pkgs/tools/security/pinentry-bemenu/default.nix
+++ b/pkgs/tools/security/pinentry-bemenu/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "pinentry-bemenu";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "t-8ch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2Q8hN7AbuGqm7pfNHlJlSi1Op/OpJBun/AIDhUDnGvU=";
+ sha256 = "sha256-jt7G/OuXqJdnkW7sMNH0o+CI3noDK6EcbOLXq0JoDTk=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix
index 7dc7e3a7a903..9463e0851898 100644
--- a/pkgs/tools/security/pomerium-cli/default.nix
+++ b/pkgs/tools/security/pomerium-cli/default.nix
@@ -9,15 +9,17 @@ let
in
buildGoModule rec {
pname = "pomerium-cli";
- version = pomerium.version;
+ inherit (pomerium) version;
+
src = fetchFromGitHub {
owner = "pomerium";
repo = "cli";
rev = "v${version}";
- hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1";
+ hash = "sha256-AZeBtHy2MEPE8uZVJv4wLdOt6f9QNbaQnP5a2YVYYAg=";
};
- vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b";
+ vendorSha256 = "sha256-K0Vdsl6wD0eJeJRsUjiNPuGx1KPkZrlCCzdyAysVonc=";
+
subPackages = [
"cmd/pomerium-cli"
];
@@ -45,7 +47,11 @@ buildGoModule rec {
];
installPhase = ''
+ runHook preInstall
+
install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index b47a2455b672..f76349c3dcf2 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -1,15 +1,15 @@
-{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper
+{ lib, mkDerivation, fetchurl, cmake, gettext
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }:
mkDerivation rec {
pname = "qdigidoc";
- version = "4.2.9";
+ version = "4.2.11";
src = fetchurl {
url =
- "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
- sha256 = "1rhd3mvj6ld16zgfscj81f1vhs2nvifsizky509l1av7dsjfbbzr";
+ "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4_${version}.110-1804.tar.xz";
+ sha256 = "sha256-Sg6lFZeIJn3T/suDc5Z/kNqBf/sIV9c6EJJ0Nr0dwTM=";
};
tsl = fetchurl {
@@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
};
- nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
+ nativeBuildInputs = [ cmake gettext pkg-config ];
postPatch = ''
substituteInPlace client/CMakeLists.txt \
@@ -35,10 +35,11 @@ mkDerivation rec {
qttranslations
];
- postInstall = ''
- wrapProgram $out/bin/qdigidoc4 \
- --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
- '';
+ # replace this hack with a proper cmake variable or environment variable
+ # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
+ qtWrapperArgs = [
+ "--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/"
+ ];
meta = with lib; {
description = "Qt-based UI for signing and verifying DigiDoc documents";
diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index 69e0f0a2e931..096455f84f14 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -4,13 +4,13 @@ let
generic = { pname, packageToBuild, description }:
buildGoModule rec {
inherit pname;
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = "rekor";
rev = "v${version}";
- sha256 = "sha256-cihue4DMqHLFVz5kLZf17EcwbkfBxlxtqmto5K11sIo=";
+ sha256 = "sha256-JKEo9sm3NiUiIA9eM21FLNdpa/9zg5YdvduW6MASBxA=";
# 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;
@@ -23,7 +23,7 @@ let
'';
};
- vendorSha256 = "sha256-bJOWSf2MHeLdI1smFXCjN3PIFRcO76cDnxks+FgqZdY=";
+ vendorSha256 = "sha256-QUiQcbzNou3EUpuajJ5AE+g8wZ0XNh+WQ6DaSvfX1fM=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 873cfdbbb056..b218a3241f9f 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
- hash = "sha256:1wkmyi6n3z2pak1cj5yk6v6bv9w0m24skycya48iikab0mrr8931";
+ hash = "sha256-YSSUcwVLzRgRUZ75qYmogKe9zDbTF8nCVFf8YU30dfI=";
};
configureFlags = [
diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/tools/security/spectre-cli/default.nix
new file mode 100644
index 000000000000..f06365de90b5
--- /dev/null
+++ b/pkgs/tools/security/spectre-cli/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+, libsodium
+, json_c
+, ncurses
+, libxml2
+, jq
+}:
+
+stdenv.mkDerivation rec {
+ pname = "spectre-cli";
+ version = "unstable-2022-02-05";
+
+ src = fetchFromGitLab {
+ owner = "spectre.app";
+ repo = "cli";
+ rev = "a5e7aab28f44b90e5bd1204126339a81f64942d2";
+ sha256 = "1hp4l1rhg7bzgx0hcai08rvcy6l9645sfngy2cr96l1bpypcld5i";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ libxml2
+ jq
+ ];
+
+ buildInputs = [
+ libsodium
+ json_c
+ ncurses
+ ];
+
+ cmakeFlags = [
+ "-DBUILD_SPECTRE_TESTS=ON"
+ ];
+
+ preConfigure = ''
+ echo "${version}" > VERSION
+
+ # The default buildPhase wants to create a ´build´ dir so we rename the build script to stop conflicts.
+ mv build build.sh
+ '';
+
+ # Some tests are expected to fail on ARM64
+ # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844
+ doCheck = !(stdenv.isLinux && stdenv.isAarch64);
+
+ checkPhase = ''
+ mv ../spectre-cli-tests ../spectre_tests.xml ./
+ patchShebangs spectre-cli-tests
+ export HOME=$(mktemp -d)
+
+ ./spectre-tests
+ ./spectre-cli-tests
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv spectre $out/bin
+ '';
+
+ meta = with lib; {
+ description = "A stateless cryptographic identity algorithm";
+ homepage = "https://spectre.app";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ emmabastas ];
+ mainProgram = "spectre";
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix
index dc09e8476bf3..f371168aa7b3 100644
--- a/pkgs/tools/security/step-cli/default.nix
+++ b/pkgs/tools/security/step-cli/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "step-cli";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-ZH3OrJGh7TekODW5rh8JShNHKfuxPr5HhVD7wsvi8M0=";
+ sha256 = "sha256-CCtK7FuOOO6Ht4WjBpFVcfCL4XE3XR52WDahP4JDJ7M=";
};
ldflags = [
@@ -25,7 +25,7 @@ buildGoModule rec {
rm command/certificate/remote_test.go
'';
- vendorSha256 = "sha256-hJEL6kUc6aXKq7X23dRWhAni5oRDJ3CuNTx6JL049gA=";
+ vendorSha256 = "sha256-O2B8NMsFxyRLsOi8Zznr2NaqktX9k8ZtWPeaFlkNUnE=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index d87580975f19..eba7def957ce 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
})
];
- NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
+ # -fcommon: workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: pam.o:/build/super-3.30.0/super.h:293: multiple definition of
+ # `Method'; super.o:/build/super-3.30.0/super.h:293: first defined here
+ NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -fcommon";
configureFlags = [
"--sysconfdir=/etc"
diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix
index c9dbb6559857..d69b28880d80 100644
--- a/pkgs/tools/security/sx-go/default.nix
+++ b/pkgs/tools/security/sx-go/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildGoModule
, fetchFromGitHub
, libpcap
@@ -27,6 +28,7 @@ buildGoModule rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Command-line network scanner";
homepage = "https://github.com/v-byte-cpu/sx";
license = licenses.mit;
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index eb889cfef165..2ad7fe3e9099 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
+ broken = stdenv.isDarwin;
homepage = "http://tcpcrypt.org/";
description = "Fast TCP encryption";
platforms = platforms.all;
diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix
index 3401fe4f31e6..fd767ca55857 100644
--- a/pkgs/tools/security/traitor/default.nix
+++ b/pkgs/tools/security/traitor/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildGoModule
, fetchFromGitHub
}:
@@ -17,6 +18,7 @@ buildGoModule rec {
vendorSha256 = null;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Automatic Linux privilege escalation";
longDescription = ''
Automatically exploit low-hanging fruit to pop a root shell. Traitor packages
diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix
index 40d0ba213fb9..e90eed4d6612 100644
--- a/pkgs/tools/security/truecrack/default.nix
+++ b/pkgs/tools/security/truecrack/default.nix
@@ -27,6 +27,14 @@ gccStdenv.mkDerivation rec {
cudatoolkit
];
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: CpuAes.o:/build/source/src/Crypto/CpuAes.h:1233: multiple definition of
+ # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here
+ # TODO: remove on upstream fixes it:
+ # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
installFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock
index 9fd526674365..1fd8ff1bc144 100644
--- a/pkgs/tools/security/wpscan/Gemfile.lock
+++ b/pkgs/tools/security/wpscan/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.1.4.1)
+ activesupport (6.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -9,10 +9,10 @@ GEM
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
- cms_scanner (0.13.6)
- ethon (~> 0.14.0)
+ cms_scanner (0.13.8)
+ ethon (>= 0.14, < 0.16)
get_process_mem (~> 0.2.5)
- nokogiri (>= 1.11.4, < 1.13.0)
+ nokogiri (>= 1.11.4, < 1.14.0)
opt_parse_validator (~> 1.9.5)
public_suffix (~> 4.0.3)
ruby-progressbar (>= 1.10, < 1.12)
@@ -20,21 +20,23 @@ GEM
typhoeus (>= 1.3, < 1.5)
xmlrpc (~> 0.3)
yajl-ruby (~> 1.4.1)
- concurrent-ruby (1.1.9)
- ethon (0.14.0)
+ concurrent-ruby (1.1.10)
+ ethon (0.15.0)
ffi (>= 1.15.0)
- ffi (1.15.4)
+ ffi (1.15.5)
get_process_mem (0.2.7)
ffi (~> 1.0)
- i18n (1.8.11)
+ i18n (1.10.0)
concurrent-ruby (~> 1.0)
- minitest (5.14.4)
- nokogiri (1.12.5-x86_64-linux)
+ mini_portile2 (2.8.0)
+ minitest (5.15.0)
+ nokogiri (1.13.6)
+ mini_portile2 (~> 2.8.0)
racc (~> 1.4)
opt_parse_validator (1.9.5)
activesupport (>= 5.2, < 6.2.0)
addressable (>= 2.5, < 2.9)
- public_suffix (4.0.6)
+ public_suffix (4.0.7)
racc (1.6.0)
ruby-progressbar (1.11.0)
sys-proctable (1.2.6)
@@ -44,18 +46,18 @@ GEM
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
webrick (1.7.0)
- wpscan (3.8.20)
- cms_scanner (~> 0.13.6)
+ wpscan (3.8.22)
+ cms_scanner (~> 0.13.8)
xmlrpc (0.3.2)
webrick
- yajl-ruby (1.4.1)
- zeitwerk (2.5.1)
+ yajl-ruby (1.4.3)
+ zeitwerk (2.5.4)
PLATFORMS
- x86_64-linux
+ ruby
DEPENDENCIES
wpscan
BUNDLED WITH
- 2.2.24
+ 2.3.9
diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix
index 0c882a313312..af6c94edac6b 100644
--- a/pkgs/tools/security/wpscan/gemset.nix
+++ b/pkgs/tools/security/wpscan/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
+ sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
type = "gem";
};
- version = "6.1.4.1";
+ version = "6.1.6";
};
addressable = {
dependencies = ["public_suffix"];
@@ -27,20 +27,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kpp3598xs79irb9g2wkcxjwlszj37sb7lp3xmvf6s5s40p0ccwf";
+ sha256 = "15d7djrrkrcwznglgkr4y80jbsbxaf071qhjnn4i1c4n7nszwwfj";
type = "gem";
};
- version = "0.13.6";
+ version = "0.13.8";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
- version = "1.1.9";
+ version = "1.1.10";
};
ethon = {
dependencies = ["ffi"];
@@ -48,20 +48,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
+ sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
- version = "1.15.4";
+ version = "1.15.5";
};
get_process_mem = {
dependencies = ["ffi"];
@@ -80,30 +80,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
+ sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
- version = "1.8.11";
+ version = "1.10.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
+ sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
type = "gem";
};
- version = "2.6.1";
+ version = "2.8.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+ sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
- version = "5.14.4";
+ version = "5.15.0";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -111,10 +111,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
+ sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
type = "gem";
};
- version = "1.12.5";
+ version = "1.13.6";
};
opt_parse_validator = {
dependencies = ["activesupport" "addressable"];
@@ -132,10 +132,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
- version = "4.0.6";
+ version = "4.0.7";
};
racc = {
groups = ["default"];
@@ -206,10 +206,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07mzbds1j0a1y6jw4swgc4d7kcflkycdk3ivdw3lxaqaqvbfs35p";
+ sha256 = "0c89shx0qv2yanyn3k6z3sjszq12vak27j33akz0lkgpfpk2sngi";
type = "gem";
};
- version = "3.8.20";
+ version = "3.8.22";
};
xmlrpc = {
dependencies = ["webrick"];
@@ -227,19 +227,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
+ sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc";
type = "gem";
};
- version = "1.4.1";
+ version = "1.4.3";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.4";
};
}
diff --git a/pkgs/tools/security/wpscan/update.sh b/pkgs/tools/security/wpscan/update.sh
index 4e55a770fd4e..c30cc62e5296 100755
--- a/pkgs/tools/security/wpscan/update.sh
+++ b/pkgs/tools/security/wpscan/update.sh
@@ -6,6 +6,11 @@ set -e
cd "$(dirname "${BASH_SOURCE[0]}")"
rm -f Gemfile.lock Gemfile.lock
+
+# Otherwise nokogiri will fail to build.
+# https://github.com/nix-community/bundix/issues/88
+bundler config set --local force_ruby_platform true
+
bundler lock
BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock
bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix
diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix
index 390ed880ca1e..4a12d679d3c7 100644
--- a/pkgs/tools/security/yersinia/default.nix
+++ b/pkgs/tools/security/yersinia/default.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch";
sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI=";
})
+
+ # Pull upstream fix for -fno-common toolchain support:
+ # https://github.com/tomac/yersinia/pull/66
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/tomac/yersinia/commit/36247225dc7a6f38c4ba70537e20351f04762749.patch";
+ sha256 = "KHaN8gfgNROEico27gWnYiP9ZVhpWz0KjFYy2t5tPBo=";
+ })
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix
index 5ea91c3012fd..e728b1b62c41 100644
--- a/pkgs/tools/security/yubikey-touch-detector/default.nix
+++ b/pkgs/tools/security/yubikey-touch-detector/default.nix
@@ -16,6 +16,15 @@ buildGoModule rec {
buildInputs = [ libnotify ];
+ postInstall = ''
+ install -Dm444 -t $out/share/doc/${pname} *.md
+
+ install -Dm444 -t $out/lib/systemd/user *.{service,socket}
+
+ substituteInPlace $out/lib/systemd/user/*.service \
+ --replace /usr/bin/yubikey-touch-detector "$out/bin/yubikey-touch-detector --libnotify"
+ '';
+
meta = with lib; {
description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen).";
homepage = "https://github.com/maximbaz/yubikey-touch-detector";
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index 24f207e95f14..1d0a2fa3188f 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
patches = [ ./makefile.patch ];
+ # -fcommon: Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/tools/system/gkraken/default.nix
index 9cd30e83c325..cd5e02d9a048 100644
--- a/pkgs/tools/system/gkraken/default.nix
+++ b/pkgs/tools/system/gkraken/default.nix
@@ -15,13 +15,13 @@
python3Packages.buildPythonApplication rec {
pname = "gkraken";
- version = "1.1.6";
+ version = "1.2.0";
src = fetchFromGitLab {
owner = "leinardi";
repo = "gkraken";
rev = version;
- sha256 = "085zz6m7c3xzsrvkw50gbbz8l9fmswxj2hjya2f52dvgs8daijdy";
+ sha256 = "0hxlh0319rl28iba02917z3n6d5cq2qcgpj2ng31bkjjhlvvfm2g";
};
format = "other";
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index fc6bf89e4498..3cb8f758eb2a 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
license = licenses.gpl2;
homepage = "https://www.rodsbooks.com/gdisk/";
diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
index 15c8cbd12f06..66669b5e850c 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in
substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo
- substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.glibc.out}/lib/libc.so.6
+ substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.cc.libc}/lib/libc.so
'';
# Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/).
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 47ebee52fe16..7e1d64942d57 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -9,13 +9,13 @@ assert systemdSupport -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "htop";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "htop-dev";
repo = pname;
rev = version;
- sha256 = "sha256-p/lc7G/XFllulXrM47mPE6W5vVuoi4uXB8To36PIgZo=";
+ sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix
index 05af41ae0ce4..c2ec5b9ddffb 100644
--- a/pkgs/tools/system/htop/htop-vim.nix
+++ b/pkgs/tools/system/htop/htop-vim.nix
@@ -2,20 +2,19 @@
htop.overrideAttrs (oldAttrs: rec {
pname = "htop-vim";
- version = "unstable-2021-10-11";
+ version = "unstable-2022-05-24";
src = fetchFromGitHub {
owner = "KoffeinFlummi";
repo = pname;
- rev = "ba6fd3891e9af60b41bd092524cc05f2469fec4b";
- sha256 = "sha256-G83+5GgEz41begDkdK8zNx48UleufFCJ9pOQ9nbtFNs=";
+ rev = "830ef7144940875d9d9716e33aff8651d164026e";
+ sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA=";
};
meta = with lib; {
+ inherit (htop.meta) platforms license;
description = "An interactive process viewer for Linux, with vim-style keybindings";
homepage = "https://github.com/KoffeinFlummi/htop-vim";
- license = licenses.gpl2Only;
- platforms = platforms.all;
maintainers = with maintainers; [ thiagokokada ];
mainProgram = "htop";
};
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 943651fa2497..b8f2b4605289 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -1,27 +1,21 @@
{ buildGoModule
, fetchFromGitHub
-, geoclue2-with-demo-agent
, lib
, m4
}:
buildGoModule {
pname = "localtime";
- version = "unstable-2021-11-23";
+ version = "unstable-2022-02-20";
src = fetchFromGitHub {
owner = "Stebalien";
repo = "localtime";
- rev = "3e5d6cd64444b2164e87cea03448bfb8eefd6ccd";
- sha256 = "sha256-6uxxPq6abtRqM/R2Fw46ynP9PEkHggTSUymLYlQXQRU=";
+ rev = "c1e10aa4141ed2bb01986b48e0e942e618993c06";
+ hash = "sha256-bPQ1c2KUTkxx2g7IvLmrKgJKfRHTLlTXLR/QQ0O4CrI=";
};
- vendorSha256 = "sha256-sf3sL6aO5jSytT2NtBkA3lhg77RIzbYkSC4fkH+cwwk=";
-
- postPatch = ''
- demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"
- sed -i localtimed.go -e "s#/usr/lib/geoclue-2.0/demos/agent#$demoPath#"
- '';
+ vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU=";
nativeBuildInputs = [ m4 ];
diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix
index 949ad31a0185..4b9b31349579 100644
--- a/pkgs/tools/system/natscli/default.nix
+++ b/pkgs/tools/system/natscli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
- version = "0.0.32";
+ version = "0.0.33";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/bK7eQaH5VpYm0lfL43DtVxEeoo4z0Ns1ykuA0osPAs=";
+ sha256 = "sha256-x1alZ+184dXXL2GeDSnvRjTW5P6GlJCrWL50663/pDo=";
};
- vendorSha256 = "sha256-qg3fmFBHeKujNQr7WFhkdvMQeR/PCBzqTHHeNsCrrMc=";
+ vendorSha256 = "sha256-f5ozwXpryB7+alJ/ydfpZowJGowcOn6dOHK9pmUSf5c=";
meta = with lib; {
description = "NATS Command Line Interface";
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 0d396893d11b..24c791bed4a4 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -49,8 +49,19 @@ in stdenv.mkDerivation rec {
# Therefore we put it into `/run/netdata`, which is owned
# by netdata only.
./ipc-socket-in-run.patch
+
+ # Avoid build-only inputs in closure leaked by configure command:
+ # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162
+ ./skip-CONFIGURE_COMMAND.patch
];
+ # Guard against unused buld-time development inputs in closure. Without
+ # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up
+ # to bootstrap tools:
+ # https://github.com/NixOS/nixpkgs/pull/175719
+ # We pick zlib.dev as a simple canary package with pkg-config input.
+ disallowedReferences = [ zlib.dev ];
+
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
postInstall = ''
@@ -96,6 +107,7 @@ in stdenv.mkDerivation rec {
};
meta = {
+ broken = stdenv.isDarwin;
description = "Real-time performance monitoring tool";
homepage = "https://www.netdata.cloud/";
license = licenses.gpl3Plus;
diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch
new file mode 100644
index 000000000000..fa7a0e7ad9c2
--- /dev/null
+++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch
@@ -0,0 +1,16 @@
+Shrink closure size by avoiding paths embedded from configure call.
+
+https://github.com/NixOS/nixpkgs/issues/175693
+--- a/daemon/buildinfo.c
++++ b/daemon/buildinfo.c
+@@ -248,7 +248,9 @@ void print_build_info(void) {
+ char *prebuilt_distro = NULL;
+ get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);
+
+- printf("Configure options: %s\n", CONFIGURE_COMMAND);
++ // To minimize closure size do not persist configure options
++ // with build-time inputs.
++ printf("Configure options: REMOVED\n");
+
+ if (install_type == NULL) {
+ printf("Install type: unknown\n");
diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix
index 48125d2df37e..2dcd1aa37660 100644
--- a/pkgs/tools/system/retry/default.nix
+++ b/pkgs/tools/system/retry/default.nix
@@ -1,23 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, txt2man }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, txt2man
+, which
+}:
+
stdenv.mkDerivation rec {
pname = "retry";
version = "1.0.4";
- nativeBuildInputs = [ autoreconfHook which txt2man ];
-
src = fetchFromGitHub {
owner = "minfrin";
repo = "retry";
rev = "${pname}-${version}";
- sha256 = "sha256:0jrx4yrwlf4fn3309kxraj7zgwk7gq6rz5ibswq3w3b3jfvxi8qb";
+ hash = "sha256-C6PYt5NjDT4w1yuWnw1+Z/L3j1S5zwTGsI44yrMnPUs=";
};
+ nativeBuildInputs = [ autoreconfHook txt2man which ];
+
meta = with lib; {
homepage = "https://github.com/minfrin/retry";
description = "Retry a command until the command succeeds";
- platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ gfrascadorio ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 5bb821afdaf1..965813f6e371 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, runitor }:
buildGoModule rec {
pname = "runitor";
- version = "0.9.2";
+ version = "0.10.0";
vendorSha256 = null;
src = fetchFromGitHub {
owner = "bdd";
repo = "runitor";
rev = "v${version}";
- sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";
+ sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
};
ldflags = [
- "-s" "-w" "-X main.Version=v${version}"
+ "-s" "-X main.Version=v${version}"
];
- # TODO(cole-h):
- # End-to-end tests requiring localhost networking currently under
- # OfBorg's Linux builders, while passing under Darwin.
- #
- # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891
- #
- # Temporarily disable tests.
- doCheck = false;
+ patches = [
+ (fetchpatch {
+ name = "backport_TestPostRetries-timeout-fix.patch";
+ url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
+ sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
+ })
+ ];
passthru.tests.version = testers.testVersion {
package = runitor;
diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/tools/system/rwc/default.nix
new file mode 100644
index 000000000000..7180c2554702
--- /dev/null
+++ b/pkgs/tools/system/rwc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, lib }:
+
+stdenv.mkDerivation rec {
+ pname = "rwc";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "leahneukirchen";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI=";
+ };
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with lib; {
+ description = "Report when files are changed";
+ license = licenses.publicDomain;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ somasis ];
+ };
+}
diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix
index bf1bacede8d0..56ee0e69aa19 100644
--- a/pkgs/tools/system/skeema/default.nix
+++ b/pkgs/tools/system/skeema/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skeema";
- version = "1.7.1";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "skeema";
repo = "skeema";
rev = "v${version}";
- sha256 = "sha256-DHdc6Le4WhL5QC/hqtbtq7rdBdLiRflDNnXQY2l2aJ8=";
+ sha256 = "sha256-hO8F3J8obi99dCT6L9OcbyVhch3z6JLeJHIvrNJemAE=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 692746e1f7ff..49fabf2856de 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -84,6 +84,10 @@ stdenv.mkDerivation rec {
homepage = "https://www.sleuthkit.org/";
maintainers = with maintainers; [ raskin gfrascadorio ];
platforms = platforms.linux;
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # dependencies
+ ];
license = licenses.ipl10;
};
}
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index a87beb14a84c..7c40a8f0caf6 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
+ broken = stdenv.isDarwin;
description = "System and kernel logging services";
homepage = "http://smarden.org/socklog/";
license = licenses.publicDomain;
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
deleted file mode 100644
index affb4bca6cec..000000000000
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
-, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq
-}:
-
-stdenv.mkDerivation rec {
- pname = "syslog-ng-incubator";
- version = "0.6.2";
-
- src = fetchFromGitHub {
- owner = "balabit";
- repo = "syslog-ng-incubator";
- rev = "${pname}-${version}";
- sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
- };
-
- nativeBuildInputs = [ pkg-config autoreconfHook bison ];
-
- buildInputs = [
- glib syslogng eventlog perl python2 protobufc libivykis libcap czmq
- ];
-
- configureFlags = [
- "--with-module-dir=$(out)/lib/syslog-ng"
- ];
-
- meta = with lib; {
- homepage = "https://github.com/balabit/syslog-ng-incubator";
- description = "A collection of tools and modules for syslog-ng";
- license = licenses.gpl2;
- maintainers = [];
- platforms = platforms.linux;
- broken = true; # 2018-05-12
- };
-}
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 03ffee077d9f..fc579a8c001f 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -1,44 +1,39 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitLab }:
let
# These settings are found in the Makefile, but there seems to be no
# way to select one ore the other setting other than editing the file
# manually, so we have to duplicate the know how here.
systemFlags = lib.optionalString stdenv.isDarwin ''
- CFLAGS="-O2 -Wall -fomit-frame-pointer"
+ CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
LDFLAGS=
- EXTRA_OBJS=strverscmp.o
'' + lib.optionalString stdenv.isCygwin ''
- CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN"
+ CFLAGS="-O2 -Wall -fomit-frame-pointer"
LDFLAGS=-s
TREE_DEST=tree.exe
- EXTRA_OBJS=strverscmp.o
'' + lib.optionalString (stdenv.isFreeBSD || stdenv.isOpenBSD) ''
CFLAGS="-O2 -Wall -fomit-frame-pointer"
LDFLAGS=-s
- EXTRA_OBJS=strverscmp.o
''; # use linux flags by default
in
stdenv.mkDerivation rec {
pname = "tree";
- version = "1.8.0";
+ version = "2.0.2";
- src = fetchurl {
- url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";
- sha256 = "1hmpz6k0mr6salv0nprvm1g0rdjva1kx03bdf1scw8a38d5mspbi";
+ src = fetchFromGitLab {
+ owner = "OldManProgrammer";
+ repo = "unix-tree";
+ rev = version;
+ sha256 = "sha256-ex4fD8dZJGplL3oMaSokMBn6PRJ8/s83CnWQaAjBcao=";
};
preConfigure = ''
- sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
- makeFlagsArray+=(
- ${systemFlags}
- "CC=$CC"
- )
+ makeFlagsArray+=(${systemFlags})
'';
makeFlags = [
- "prefix=${placeholder "out"}"
- "MANDIR=${placeholder "out"}/share/man/man1"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "PREFIX=${placeholder "out"}"
];
meta = with lib; {
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index b4b92b8f90fb..77e030eb086c 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -19,8 +19,16 @@ stdenv.mkDerivation rec {
patches = [ ./dont_static_link.patch ];
- # fix build with gcc9
- NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+ NIX_CFLAGS_COMPILE = [
+ # fix build with gcc9
+ "-Wno-error"
+ # workaround build failure on -fno-common toolchains:
+ # ld: /build/source/build/futility/vb2_helper.o:(.bss+0x0): multiple definition of
+ # `vboot_version'; /build/source/build/futility/futility.o:(.bss+0x0): first defined here
+ # TODO: remove it when next release contains:
+ # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/df4d2000a22db673a788b8e57e8e7c0cc3cee777
+ "-fcommon"
+ ];
postPatch = ''
substituteInPlace Makefile \
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index de823f98596a..aecf68e8c7fa 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl";
};
+ strictDeps = true;
+ enableParallelBuilding = true;
+
meta = with lib; {
homepage = "https://www.gnu.org/software/which/";
description = "Shows the full path of (shell) commands";
diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix
index 57d0f548f00e..78091d2d4ab0 100644
--- a/pkgs/tools/system/zenith/default.nix
+++ b/pkgs/tools/system/zenith/default.nix
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"
+ lib.optionalString nvidiaSupport ", and NVIDIA GPU usage";
homepage = "https://github.com/bvaisvil/zenith";
diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix
index 221f7c3d5528..d1bf36a744bc 100644
--- a/pkgs/tools/text/asciigraph/default.nix
+++ b/pkgs/tools/text/asciigraph/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "asciigraph";
- version = "0.5.3";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "guptarohit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM=";
+ sha256 = "sha256-7sobelRCDY8mC5FYyGZmNsvUsEMxRulqPnUucNRN5J8=";
};
- vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ vendorSha256 = null;
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix
index cfbfee48938a..c636eef3c46e 100644
--- a/pkgs/tools/text/cidrgrep/default.nix
+++ b/pkgs/tools/text/cidrgrep/default.nix
@@ -8,10 +8,10 @@ buildGoModule {
owner = "tomdoherty";
repo = "cidrgrep";
rev = "8ad5af533e8dc33ea18ff19b7c6a41550748fe0e";
- sha256 = "sha256:0jvwm9jq5jd270b6l9nkvc5pr3rgf158sw83lrprmwmz7r4mr786";
+ hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs=";
};
- vendorSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+ vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
postInstall = ''
mv $out/bin/cmd $out/bin/cidrgrep
@@ -19,7 +19,7 @@ buildGoModule {
meta = {
description = "Like grep but for IPv4 CIDRs";
- maintainers = with lib.maintainers; [ das_j ];
license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ das_j ];
};
}
diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
index 6111a6f1c8bd..f79f6670625a 100644
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
mainProgram = "crowdin";
homepage = "https://github.com/crowdin/crowdin-cli/";
description = "A command-line client for the Crowdin API";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
maintainers = with maintainers; [ DamienCassou ];
};
diff --git a/pkgs/tools/text/each/default.nix b/pkgs/tools/text/each/default.nix
index 0218cf5dde27..02974030b269 100644
--- a/pkgs/tools/text/each/default.nix
+++ b/pkgs/tools/text/each/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "each";
- version = "0.1.3";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "arraypad";
repo = pname;
rev = "v${version}";
- sha256 = "04rx8jf871l4darfx6029dhpnbpmzwjgzazayp1qcaadsk8207z5";
+ sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
};
- cargoSha256 = "1r7nzfh7v2mlp0wdrcpqfj68h3zmip2m3d4z2nwxyikmw7c80car";
+ cargoSha256 = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
meta = with lib; {
description = " A better way of working with structured data on the command line";
diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix
index 45196422ff54..796aa0da8f91 100644
--- a/pkgs/tools/text/epubcheck/default.nix
+++ b/pkgs/tools/text/epubcheck/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/w3c/epubcheck";
description = "Validation tool for EPUB";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = with licenses; [ asl20 bsd3 mpl10 w3c ];
platforms = platforms.all;
maintainers = with maintainers; [ eadwu ];
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index cae8fd201906..bce8fec2da48 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://languagetool.org";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ edwtjo ];
platforms = jre.meta.platforms;
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index 3e348f159c17..876e9971fd29 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -54,6 +54,7 @@ link-grammar = stdenv.mkDerivation rec {
};
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A Grammar Checking library";
homepage = "https://www.abisource.com/projects/link-grammar/";
changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix
index 05bf89e30189..6525b82bf867 100644
--- a/pkgs/tools/text/mdbook-mermaid/default.nix
+++ b/pkgs/tools/text/mdbook-mermaid/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dXeu/e92lafurA/bqKoszIjK/3qw/ZvVKnDxYALRpTk=";
+ sha256 = "sha256-1neEuDsPMI4f1HaAP+Kx62RBW8hqqNThHpUNa5DzlnY=";
};
- cargoSha256 = "sha256-LVfeQPRpwv1l3Brm8HJYoYvv26fJhsfR4I9Ds4NuWQM=";
+ cargoSha256 = "sha256-Sk0cOLknS1UK3OcLHVSnA/H3BeMe7bpo2HgHEErQSAQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index f6dcd72d7bf2..4fe156600c07 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -12,21 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
- version = "0.26.1";
+ version = "0.27.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = "mdcat";
rev = "mdcat-${version}";
- sha256 = "sha256-vB49EwQltonR9Uw8RRMZTPR4WkcylnIqiE0/8+t2R1Q=";
+ sha256 = "sha256-iWFWpUyg/VYI+AKFsJe/rOYco+680l/bIHX0qXfD3u0=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
- cargoSha256 = "sha256-v52ob5l5HiiZZmo88D9/ldFi0170/BuPzgKIt9ctSgU=";
+ cargoSha256 = "sha256-e/yupkCqWZZCfD8brVb2yD4pt3ExSfwCm2bmTyjRGpA=";
checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
@@ -43,15 +43,16 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installManPage $releaseDir/build/mdcat-*/out/mdcat.1
- installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash
- installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish
- installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
+ installShellCompletion \
+ --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash \
+ --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish \
+ --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
'';
meta = with lib; {
description = "cat for markdown";
- homepage = "https://github.com/lunaryorn/mdcat";
+ homepage = "https://codeberg.org/flausch/mdcat";
license = with licenses; [ mpl20 ];
- maintainers = with maintainers; [ davidtwco SuperSandro2000 ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix
index e30020d15d9b..becb90b0f1de 100644
--- a/pkgs/tools/text/mmdoc/default.nix
+++ b/pkgs/tools/text/mmdoc/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isx86_64;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Minimal Markdown Documentation";
homepage = "https://github.com/ryantm/mmdoc";
license = licenses.cc0;
diff --git a/pkgs/tools/text/robodoc/default.nix b/pkgs/tools/text/robodoc/default.nix
index e30e8739797a..015b76253a83 100644
--- a/pkgs/tools/text/robodoc/default.nix
+++ b/pkgs/tools/text/robodoc/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
homepage = "https://github.com/gumpu/ROBODoc";
description = "Documentation Extraction Tool";
longDescription = ''
diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix
index 0de0f745a233..8ddf15041f32 100644
--- a/pkgs/tools/text/sad/default.nix
+++ b/pkgs/tools/text/sad/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "sad";
- version = "0.4.20";
+ version = "0.4.21";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BhkSqXiQPOSYnCXqjAqenKx3DextxPluqsTAMI4Xs7g=";
+ sha256 = "sha256-kM5jeoFmDOwgnzdSwfPJfZhpBS8RPMNt143S5iYYrF4=";
};
- cargoSha256 = "sha256-aKTF0DH8Lf/H6OfQPuQ6yGOmUEUguYcHMCuYKIjNR9k=";
+ cargoSha256 = "sha256-JwYUM4o4I3dC1HgG4bkUS1PH4MsxcvwdefjefnEZQFs=";
meta = with lib; {
description = "CLI tool to search and replace";
diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/tools/text/seehecht/default.nix
new file mode 100644
index 000000000000..e9ee07ee8ca6
--- /dev/null
+++ b/pkgs/tools/text/seehecht/default.nix
@@ -0,0 +1,27 @@
+{ lib, rustPlatform, fetchFromGitea }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "seehecht";
+ version = "3.0.2";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "papojari";
+ repo = "seehecht";
+ rev = "v${version}";
+ sha256 = "sha256-x5zZEDaBmWpyvY+sKuiK4L+hc85prxCueWYUNMi9ty0=";
+ };
+
+ cargoSha256 = "sha256-mWGmMtUYeM97SM+/jtOzkAe1usuZT4yOI6PAbiGKe7M=";
+
+ postInstall = ''
+ ln -s $out/bin/seh $out/bin/seehecht
+ '';
+
+ meta = with lib; {
+ description = "A tool to quickly open a markdown document with already filled out frontmatter";
+ license = licenses.lgpl3Only;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ papojari ];
+ };
+}
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 757c65eed848..53146ddd0610 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
patches = [ ./bash-completion.patch ];
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
+ # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
+ # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
+ NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 4d6d23054da1..7525dd65785e 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
modes, BaseX offers a client/server architecture.
'';
homepage = "https://basex.org/";
+ sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index 683eecde46b9..c7866f8cba8a 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
# for downloads and call it the "project site".
homepage = "https://www.thaiopensource.com/relaxng/trang.html";
platforms = platforms.unix;
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # source bundles dependencies as jars
+ ];
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix
index cb270f69ad1b..38e4f9510eb0 100644
--- a/pkgs/tools/text/zoekt/default.nix
+++ b/pkgs/tools/text/zoekt/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildGoModule
, fetchFromGitHub
, git
@@ -21,6 +22,7 @@ buildGoModule {
];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Fast trigram based code search";
homepage = "https://github.com/google/zoekt";
license = licenses.asl20;
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index be7f978a42aa..ed07c5588fec 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -322,6 +322,9 @@ stdenv.mkDerivation rec {
the backend output markups (which can be almost any type of SGML/XML
markup) can be customized and extended by the user.
'';
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ ] ++ lib.optional _enableDitaaFilter binaryBytecode;
homepage = "http://www.methods.co.nz/asciidoc/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix
index 924eea3c0a86..267309e2e35b 100644
--- a/pkgs/tools/typesetting/coq2html/default.nix
+++ b/pkgs/tools/typesetting/coq2html/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "xavierleroy";
repo = "coq2html";
rev = "v${version}";
- sha256 = "sha256:1ad825yifn518wk1c2y2ji10q3m468r8ajjgw2nzzy7d608nx7yq";
+ hash = "sha256-2J9uETDt+P+t4E9KhTIypA4MQpTCCxYmR6FYF30RqKk=";
};
nativeBuildInputs = [ ocaml ];
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index f1bec5a240a1..68b8399fc76c 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -48,6 +48,10 @@ stdenv.mkDerivation rec {
'';
homepage = "https://xmlgraphics.apache.org/fop/";
license = licenses.asl20;
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # source bundles dependencies as jars
+ ];
platforms = platforms.all;
maintainers = with maintainers; [ bjornfor ];
};
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 9ce2de02d302..d4cd1478ac46 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Converts HTML files to PostScript and PDF";
homepage = "https://michaelrsweet.github.io/htmldoc";
changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";
diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix
index 192b5424e9a6..7de3e2ada379 100644
--- a/pkgs/tools/typesetting/pdftk/default.nix
+++ b/pkgs/tools/typesetting/pdftk/default.nix
@@ -88,6 +88,10 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Command-line tool for working with PDFs";
homepage = "https://gitlab.com/pdftk-java/pdftk";
+ sourceProvenance = with sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin averelld ];
platforms = platforms.unix;
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 7aca12e341c4..565b0345e50a 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -59,19 +59,23 @@ stdenv.mkDerivation rec {
makeWrapper
];
buildInputs = [
+ luaEnv
harfbuzz
icu
fontconfig
libiconv
- luaEnv
]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
;
checkInputs = [
poppler_utils
];
+ passthru = {
+ # So it will be easier to inspect this environment, in comparison to others
+ inherit luaEnv;
+ };
- preConfigure = ''
+ postPatch = ''
patchShebangs build-aux/*.sh
'' + lib.optionalString stdenv.isDarwin ''
sed -i -e 's|@import AppKit;|#import |' src/macfonts.m
@@ -100,6 +104,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" "man" "dev" ];
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "A typesetting system";
longDescription = ''
SILE is a typesetting system; its job is to produce beautiful
diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix
index d40eb4aac800..a4110d5187e0 100644
--- a/pkgs/tools/typesetting/soupault/default.nix
+++ b/pkgs/tools/typesetting/soupault/default.nix
@@ -5,9 +5,7 @@
ocamlPackages.buildDunePackage rec {
pname = "soupault";
- version = "4.0.0";
-
- useDune2 = true;
+ version = "4.0.1";
minimalOCamlVersion = "4.08";
@@ -16,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
owner = "PataphysicalSociety";
repo = pname;
rev = version;
- sha256 = "sha256-txNKAZMd3LReFoAtf6iaoDF+Ku3IUNDzBWUqGC2ePKw=";
+ sha256 = "sha256-Ojsup/BgXsqhRUsU6JevvuLnMtVs2Kd5kTeDvVO5BOk=";
};
buildInputs = with ocamlPackages; [
@@ -42,6 +40,7 @@ ocamlPackages.buildDunePackage rec {
meta = {
description = "A tool that helps you create and manage static websites";
homepage = "https://soupault.app/";
+ changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ toastal ];
};
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 4d9fdfd7820e..b9b1b228efa5 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libdv libjpeg libpng ]
++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ];
- NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${SDL.dev}/include/SDL";
+ NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${lib.getDev SDL}/include/SDL";
postPatch = ''
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix
index 4b950fd0f220..83b56e2f056a 100644
--- a/pkgs/tools/video/untrunc-anthwlock/default.nix
+++ b/pkgs/tools/video/untrunc-anthwlock/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)";
homepage = "https://github.com/anthwlock/untrunc";
license = licenses.gpl2;
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 061dd486e0d8..97b3fbd1b7a6 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "awless";
@@ -19,5 +19,8 @@ buildGoPackage rec {
platforms = with platforms; linux ++ darwin;
license = licenses.asl20;
maintainers = with maintainers; [ pradeepchhetri swdunlop ];
+ # asm: InitTextSym double init for "".Syscall
+ # panic: invalid use of LSym - NewFuncInfo with Extra of type *obj.FuncInfo
+ broken = (stdenv.isLinux && stdenv.isAarch64);
};
}
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index c431980125a6..bc4a920051a8 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -1,6 +1,6 @@
-{ lib, python3, glibcLocales, docker-compose }:
+{ lib, python3, glibcLocales, docker-compose_1 }:
let
- docker_compose = changeVersion (with localPython.pkgs; docker-compose.override {
+ docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override {
inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko;
}).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks";
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index 62a13499dd85..9bffe01c8d37 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7WZ7Kb3Rx/hq7LYaDN/B9CpPgr9+aR5+FKDG7G/JydA=";
+ sha256 = "sha256-uhLaBX5vgQO/RkZUrP2uAubavq5MBvr3TRsGYchfR5s=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index 69b9f540e458..61ff951e8be4 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (rec {
tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"
'';
+ # Workaround build failure on -fno-common toolchains:
+ # ld: utils.o:xenstore/utils.h:27:
+ # multiple definition of `xprintf'; xenstored_core.o:xenstore/utils.h:27: first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
buildPhase = ''
export CC=gcc
export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess'
diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix
index 2159322a5870..2b47767b5da4 100644
--- a/pkgs/tools/wayland/swaysome/default.nix
+++ b/pkgs/tools/wayland/swaysome/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "swaysome";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitLab {
owner = "hyask";
repo = pname;
rev = version;
- sha256 = "sha256-hI6XPND05m67dxo9EwIDhFTyC2UrL4Ll1V/WcBoJymU=";
+ sha256 = "sha256-E2Oy8ubH4VIpuH4idYNiZJISuYYe+stcUY/atN2JcVw=";
};
- cargoSha256 = "sha256-jG6HZiL2almALyEnQRmbeCTRG11URP3+Bxqyn8hLs7w=";
+ cargoSha256 = "sha256-S+GcyEYQ4nnVoPMuglTmFdP5j015UyCXMyyhPHa5m8k=";
meta = with lib; {
description = "Helper to make sway behave more like awesomewm";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 129a06484139..708d76f3da34 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -90,11 +90,13 @@ mapAliases ({
at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
+ automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
avldrums-lv2 = x42-avldrums; # Added 2020-03-29
avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
awesome-4-0 = awesome; # Added 2022-05-05
aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;
axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13
+ azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02
### B ###
@@ -127,6 +129,7 @@ mapAliases ({
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22
bro = zeek; # Added 2019-09-29
+ btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
@@ -193,6 +196,7 @@ mapAliases ({
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03
clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15
+ clementineUnfree = throw "clementineUnfree has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
codimd = hedgedoc; # Added 2020-11-29
@@ -207,6 +211,7 @@ mapAliases ({
couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12
+ corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30
cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
@@ -262,7 +267,7 @@ mapAliases ({
cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
-
+ curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04
cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
@@ -336,6 +341,8 @@ mapAliases ({
docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22
doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30
docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22
+ docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05
+ docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05
dolphinEmu = dolphin-emu; # Added 2021-11-10
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
@@ -379,6 +386,7 @@ mapAliases ({
enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22
encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
+ envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
epoxy = libepoxy; # Added 2021-11-11
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
@@ -447,6 +455,7 @@ mapAliases ({
g4py = python3Packages.geant4; # Added 2020-06-06
gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
+ gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03
gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22
gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22
@@ -455,6 +464,7 @@ mapAliases ({
gfm = throw "gfm has been removed"; # Added 2021-01-15
giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23
giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
+ git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01
gitAndTools = self // {
@@ -507,6 +517,7 @@ mapAliases ({
gobby5 = gobby; # Added 2021-02-01
gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22
gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15
+ goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21
goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22
gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23
@@ -515,7 +526,9 @@ mapAliases ({
google-gflags = gflags; # Added 2019-07-25
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+ go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
+ go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02
gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
@@ -524,6 +537,7 @@ mapAliases ({
graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19
graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
+ gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03
gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
@@ -532,6 +546,7 @@ mapAliases ({
gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
+ grv = "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
@@ -568,8 +583,10 @@ mapAliases ({
### I ###
+ i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22
iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
+ ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15
icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
@@ -633,6 +650,7 @@ mapAliases ({
keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
kerberos = libkrb5; # moved from top-level 2021-03-14
kexectools = kexec-tools; # Added 2021-09-03
+ kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
kgx = gnome-console; # Added 2022-02-19
@@ -669,6 +687,7 @@ mapAliases ({
libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04
libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22
libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22
+ libdigidoc = throw "'libdigidoc' is unused in nixpkgs, deprecated and archived by upstream, use 'libdigidocpp' instead"; # Added 2022-06-03
liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22
liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22
liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22
@@ -698,6 +717,7 @@ mapAliases ({
libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19
librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24
libseat = seatd; # Added 2021-06-24
+ libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22
libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22
libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
@@ -812,18 +832,19 @@ mapAliases ({
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
+ marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
matrique = spectral; # Added 2020-01-27
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23
+ mcomix3 = mcomix; # Added 2022-06-05
mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
meme = meme-image-generator; # Added 2021-04-21
memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22
mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18
mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mess = mame; # Added 2019-10-30
- metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2"; # Added 2022-01-12
mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12
midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
mime-types = mailcap; # Added 2022-01-21
@@ -843,6 +864,8 @@ mapAliases ({
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
+ mopidy-spotify = throw "mopidy-spotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
+ mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22
mozart-binary = mozart2-binary; # Added 2019-09-23
@@ -850,6 +873,7 @@ mapAliases ({
mpc_cli = mpc-cli; # moved from top-level 2022-01-24
mpd_clientlib = libmpdclient; # Added 2021-02-11
mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22
+ mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22
multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
mumble_git = pkgs.mumble; # Added 2019-08-01
@@ -905,6 +929,7 @@ mapAliases ({
nix_2_6 = nixVersions.nix_2_6;
nixopsUnstable = nixops_unstable; # Added 2022-03-03
nixosTest = testers.nixosTest; # Added 2022-05-05
+ nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23
nmap-unfree = nmap; # Added 2021-04-06
nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
@@ -1055,6 +1080,7 @@ mapAliases ({
pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24
polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
+ pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
powerdns = pdns; # Added 2022-03-28
portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10
@@ -1094,6 +1120,7 @@ mapAliases ({
proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
+ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
@@ -1207,6 +1234,7 @@ mapAliases ({
scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15
scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
+ scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
sdlmame = mame; # Added 2019-10-30
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
@@ -1309,7 +1337,6 @@ mapAliases ({
telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22
telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22
telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22
- telepathy_salut = throw "'telepathy_salut' has been renamed to/replaced by 'telepathy-salut'"; # Converted to throw 2022-02-22
telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22
terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21
terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22
@@ -1351,10 +1378,10 @@ mapAliases ({
trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned";
trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29
truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22
- tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07
turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08
twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
+ tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
### U ###
@@ -1422,7 +1449,9 @@ mapAliases ({
winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22
winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22
wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
+ wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
wmii_hg = wmii;
+ ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
### X ###
@@ -1440,6 +1469,7 @@ mapAliases ({
xineLib = xine-lib; # Added 2021-04-27
xineUI = xine-ui; # Added 2021-04-27
xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
+ xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
xp-pen-g430 = pentablet-driver; # Added 2020-05-03
xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26
@@ -1483,6 +1513,19 @@ mapAliases ({
ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22
ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22
+ ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_14_0 = throw "ocamlformat_0_14_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_14_1 = throw "ocamlformat_0_14_1 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_14_2 = throw "ocamlformat_0_14_2 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_14_3 = throw "ocamlformat_0_14_3 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_15_0 = throw "ocamlformat_0_15_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_15_1 = throw "ocamlformat_0_15_1 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_16_0 = throw "ocamlformat_0_16_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01
+ ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01
+
zabbix44 = throw ''
Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at
https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7ab64e64225..fa1a9c46f08b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -133,10 +133,19 @@ with pkgs;
### Push NixOS tests inside the fixed point
+ # See also allTestsForSystem in nixos/release.nix
nixosTests = import ../../nixos/tests/all-tests.nix {
inherit pkgs;
system = stdenv.hostPlatform.system;
callTest = t: t.test;
+ } // {
+ # for typechecking of the scripts and evaluation of
+ # the nodes, without running VMs.
+ allDrivers = import ../../nixos/tests/all-tests.nix {
+ inherit pkgs;
+ system = stdenv.hostPlatform.system;
+ callTest = t: t.test.driver;
+ };
};
### BUILD SUPPORT
@@ -258,9 +267,13 @@ with pkgs;
bingo = callPackage ../development/tools/bingo {};
+ bootstrap-studio = callPackage ../development/web/bootstrap-studio {};
+
breakpad = callPackage ../development/misc/breakpad { };
- buf = callPackage ../development/tools/buf { };
+ buf = callPackage ../development/tools/buf {
+ buildGoModule = buildGo118Module;
+ };
cfn-nag = callPackage ../development/tools/cfn-nag { };
@@ -331,8 +344,6 @@ with pkgs;
conftest = callPackage ../development/tools/conftest { };
- corgi = callPackage ../development/tools/corgi { };
-
colmena = callPackage ../tools/admin/colmena { };
colorz = callPackage ../tools/misc/colorz { };
@@ -387,7 +398,7 @@ with pkgs;
gpick = callPackage ../tools/misc/gpick { };
- hobbes = callPackage ../development/tools/hobbes { };
+ hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
@@ -409,6 +420,8 @@ with pkgs;
pridecat = callPackage ../tools/misc/pridecat { };
+ pridefetch = callPackage ../tools/misc/pridefetch { };
+
proto-contrib = callPackage ../development/tools/proto-contrib { };
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
@@ -492,8 +505,6 @@ with pkgs;
nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
- docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {};
-
docker-ls = callPackage ../tools/misc/docker-ls { };
docker-slim = callPackage ../applications/virtualization/docker-slim { };
@@ -627,6 +638,8 @@ with pkgs;
mod = callPackage ../development/tools/mod { };
+ mongosh = callPackage ../development/tools/mongosh { };
+
mysql-shell = callPackage ../development/tools/mysql-shell {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
@@ -908,8 +921,6 @@ with pkgs;
useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
- ical2org = callPackage ../tools/misc/ical2org {};
-
iconConvTools = callPackage ../build-support/icon-conv-tools {};
validatePkgConfig = makeSetupHook
@@ -990,7 +1001,7 @@ with pkgs;
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
boost = boost16x; # checkPhase fails with Boost 1.77
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
adminer = callPackage ../servers/adminer { };
@@ -1031,7 +1042,10 @@ with pkgs;
stdenv = clangStdenv;
};
- honggfuzz = callPackage ../tools/security/honggfuzz { };
+ honggfuzz = callPackage ../tools/security/honggfuzz {
+ clang = clang_12;
+ llvm = llvm_12;
+ };
aflplusplus = callPackage ../tools/security/aflplusplus {
clang = clang_9;
@@ -1066,6 +1080,8 @@ with pkgs;
airfield = callPackage ../tools/networking/airfield { };
+ airgeddon = callPackage ../tools/networking/airgeddon { };
+
apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
airsonic = callPackage ../servers/misc/airsonic { };
@@ -1127,6 +1143,12 @@ with pkgs;
gfshare = callPackage ../tools/security/gfshare { };
+ gh-cal = callPackage ../tools/misc/gh-cal {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ gh-eco = callPackage ../tools/misc/gh-eco { };
+
glooctl = callPackage ../applications/networking/cluster/glooctl { };
gobgp = callPackage ../tools/networking/gobgp { };
@@ -1179,6 +1201,8 @@ with pkgs;
sdlookup = callPackage ../tools/security/sdlookup { };
+ spectre-cli = callPackage ../tools/security/spectre-cli { };
+
sx-go = callPackage ../tools/security/sx-go { };
systeroid = callPackage ../tools/system/systeroid { };
@@ -1201,6 +1225,8 @@ with pkgs;
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
+ voms = callPackage ../tools/networking/voms { };
+
vopono = callPackage ../tools/networking/vopono { };
winbox = callPackage ../tools/admin/winbox {
@@ -1511,7 +1537,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
- contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { };
+ contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; };
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
@@ -1623,7 +1649,7 @@ with pkgs;
writefreely = callPackage ../applications/misc/writefreely { };
- iqueue = callPackage ../development/libraries/iqueue { };
+ iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; };
lifecycled = callPackage ../tools/misc/lifecycled { };
@@ -1718,9 +1744,7 @@ with pkgs;
apksigcopier = callPackage ../development/tools/apksigcopier { };
- apksigner = callPackage ../development/tools/apksigner {
- inherit (androidenv.androidPkgs_9_0) build-tools;
- };
+ apksigner = callPackage ../development/tools/apksigner { };
apktool = callPackage ../development/tools/apktool {
inherit (androidenv.androidPkgs_9_0) build-tools;
@@ -1885,8 +1909,6 @@ with pkgs;
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
- azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { };
-
awless = callPackage ../tools/virtualization/awless { };
bashblog = callPackage ../tools/text/bashblog { };
@@ -1897,6 +1919,8 @@ with pkgs;
betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { };
+ binocle = callPackage ../applications/misc/binocle { };
+
bitwise = callPackage ../tools/misc/bitwise { };
blanket = callPackage ../applications/audio/blanket { };
@@ -1905,13 +1929,15 @@ with pkgs;
brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
- stdenvBootstrapTools =
- let args = { crossSystem = stdenv.hostPlatform.system; }; in
- if stdenv.hostPlatform.isDarwin
- then callPackage ../stdenv/darwin/make-bootstrap-tools.nix args
- else if stdenv.hostPlatform.isLinux
- then callPackage ../stdenv/linux/make-bootstrap-tools.nix args
- else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
+ stdenvBootstrapTools = if stdenv.hostPlatform.isDarwin then
+ callPackage ../stdenv/darwin/make-bootstrap-tools.nix {
+ localSystem = stdenv.buildPlatform;
+ crossSystem =
+ if stdenv.buildPlatform == stdenv.hostPlatform then null else stdenv.hostPlatform;
+ }
+ else if stdenv.hostPlatform.isLinux then
+ callPackage ../stdenv/linux/make-bootstrap-tools.nix {}
+ else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
boxes = callPackage ../tools/text/boxes { };
@@ -2014,7 +2040,7 @@ with pkgs;
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
bonnie = callPackage ../tools/filesystems/bonnie {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
botamusique = callPackage ../tools/audio/botamusique { };
@@ -2135,7 +2161,7 @@ with pkgs;
dfmt = callPackage ../tools/text/dfmt { };
- diopser = callPackage ../applications/audio/diopser { };
+ diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; };
diskonaut = callPackage ../tools/misc/diskonaut { };
@@ -2235,7 +2261,7 @@ with pkgs;
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
- gammy = qt5.callPackage ../tools/misc/gammy { };
+ gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; };
gams = callPackage ../tools/misc/gams (config.gams or {});
@@ -2385,6 +2411,8 @@ with pkgs;
pass = callPackage ../tools/security/pass { };
+ passage = callPackage ../tools/security/passage { };
+
passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };
pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };
@@ -2664,6 +2692,8 @@ with pkgs;
bicon = callPackage ../applications/misc/bicon { };
+ biliass = with python3.pkgs; toPythonApplication biliass;
+
bindfs = callPackage ../tools/filesystems/bindfs { };
binwalk = with python3Packages; toPythonApplication binwalk;
@@ -2744,8 +2774,6 @@ with pkgs;
bmake = callPackage ../development/tools/build-managers/bmake { };
- go-mk = callPackage ../development/tools/build-managers/go-mk { };
-
boca = callPackage ../development/libraries/boca { };
bubblewrap = callPackage ../tools/admin/bubblewrap { };
@@ -2961,6 +2989,8 @@ with pkgs;
clac = callPackage ../tools/misc/clac {};
+ map-cmd = callPackage ../tools/misc/map {};
+
clash = callPackage ../tools/networking/clash {
buildGoModule = buildGo118Module;
};
@@ -2999,7 +3029,7 @@ with pkgs;
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
- clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
+ clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; };
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
@@ -3328,7 +3358,7 @@ with pkgs;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
- djv = callPackage ../applications/graphics/djv { };
+ djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; };
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
@@ -3443,6 +3473,8 @@ with pkgs;
envsubst = callPackage ../tools/misc/envsubst { };
+ er-patcher = callPackage ../tools/games/er-patcher { };
+
errcheck = callPackage ../development/tools/errcheck {
buildGoModule = buildGo118Module;
};
@@ -4246,8 +4278,6 @@ with pkgs;
syslogng = callPackage ../tools/system/syslog-ng { };
- syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
-
svt-av1 = callPackage ../tools/video/svt-av1 { };
inherit (callPackages ../servers/rainloop { })
@@ -4501,6 +4531,10 @@ with pkgs;
bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
+ bzip3 = callPackage ../tools/compression/bzip3 {
+ stdenv = clangStdenv;
+ };
+
cabextract = callPackage ../tools/archivers/cabextract { };
cadaver = callPackage ../tools/networking/cadaver { };
@@ -4606,8 +4640,6 @@ with pkgs;
protobuf = protobuf3_19;
};
- clementineUnfree = clementine.unfree;
-
mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
ciopfs = callPackage ../tools/filesystems/ciopfs { };
@@ -4616,20 +4648,16 @@ with pkgs;
circus = callPackage ../tools/networking/circus { };
- citrix_workspace = citrix_workspace_21_12_0;
+ citrix_workspace = citrix_workspace_22_05_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
- citrix_workspace_20_04_0
- citrix_workspace_20_06_0
- citrix_workspace_20_09_0
- citrix_workspace_20_10_0
- citrix_workspace_20_12_0
citrix_workspace_21_01_0
citrix_workspace_21_03_0
citrix_workspace_21_06_0
citrix_workspace_21_08_0
citrix_workspace_21_09_0
citrix_workspace_21_12_0
+ citrix_workspace_22_05_0
;
cmigemo = callPackage ../tools/text/cmigemo { };
@@ -4729,7 +4757,7 @@ with pkgs;
evscript = callPackage ../tools/inputmethods/evscript { };
- gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
+ gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
kime = callPackage ../tools/inputmethods/kime { };
@@ -4960,7 +4988,7 @@ with pkgs;
createrepo_c = callPackage ../tools/package-management/createrepo_c { };
cromfs = callPackage ../tools/archivers/cromfs {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
cron = callPackage ../tools/system/cron { };
@@ -5012,8 +5040,6 @@ with pkgs;
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
- curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
-
curlie = callPackage ../tools/networking/curlie { };
cunit = callPackage ../tools/misc/cunit { };
@@ -5542,6 +5568,8 @@ with pkgs;
choose = callPackage ../tools/text/choose { };
+ conform = callPackage ../applications/version-management/git-and-tools/conform { };
+
emscripten = callPackage ../development/compilers/emscripten {
llvmPackages = llvmPackages_13;
};
@@ -5559,7 +5587,7 @@ with pkgs;
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
# When updating make sure to update all plugins or they will break!
elk6Version = "6.8.21";
- elk7Version = "7.16.1";
+ elk7Version = "7.17.4";
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
util-linux = util-linuxMinimal;
@@ -5612,7 +5640,7 @@ with pkgs;
endlessh-go = callPackage ../servers/endlessh-go { };
- ericw-tools = callPackage ../applications/misc/ericw-tools { };
+ ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
cryfs = callPackage ../tools/filesystems/cryfs { };
@@ -6113,8 +6141,6 @@ with pkgs;
gawkInteractive = gawk.override { interactive = true; };
- gawp = callPackage ../tools/misc/gawp { };
-
gbdfed = callPackage ../tools/misc/gbdfed {
gtk = gtk2-x11;
};
@@ -6197,8 +6223,6 @@ with pkgs;
inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
};
- git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { };
-
git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx {
inherit (python3Packages)
buildPythonApplication
@@ -6287,8 +6311,6 @@ with pkgs;
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
- git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
-
git-ftp = callPackage ../development/tools/git-ftp { };
git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { };
@@ -6390,6 +6412,10 @@ with pkgs;
gitleaks = callPackage ../tools/security/gitleaks { };
+ gitsign = callPackage ../tools/security/gitsign {
+ buildGoModule = buildGo118Module;
+ };
+
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
@@ -6516,8 +6542,6 @@ with pkgs;
godot-server = callPackage ../development/tools/godot/server.nix { };
- goklp = callPackage ../tools/networking/goklp {};
-
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
goofys = callPackage ../tools/filesystems/goofys { };
@@ -6644,7 +6668,7 @@ with pkgs;
robodoc = callPackage ../tools/text/robodoc { };
- ucg = callPackage ../tools/text/ucg { };
+ ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; };
grive2 = callPackage ../tools/filesystems/grive2 { };
@@ -6674,8 +6698,6 @@ with pkgs;
stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
} // (config.grub or {}));
- grv = callPackage ../applications/version-management/git-and-tools/grv { };
-
trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
@@ -6725,9 +6747,8 @@ with pkgs;
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
- gsmlib = callPackage ../development/libraries/gsmlib {
- autoreconfHook = buildPackages.autoreconfHook269;
- };
+ gsmlib = callPackage ../development/libraries/gsmlib
+ { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; };
gssdp = callPackage ../development/libraries/gssdp { };
@@ -7056,9 +7077,7 @@ with pkgs;
ifuse = callPackage ../tools/filesystems/ifuse { };
ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
- idevicerestore = callPackage ../tools/misc/idevicerestore {
- inherit (darwin) IOKit;
- };
+ idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv;
@@ -7216,7 +7235,7 @@ with pkgs;
boost = boost16x;
};
- isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
+ isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; };
isync = callPackage ../tools/networking/isync {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -7418,8 +7437,6 @@ with pkgs;
keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;
- kexpand = callPackage ../development/tools/kexpand { };
-
kent = callPackage ../applications/science/biology/kent { };
keybase = callPackage ../tools/security/keybase {
@@ -7655,11 +7672,11 @@ with pkgs;
mani = callPackage ../development/tools/mani { };
- mapcache = callPackage ../servers/mapcache { };
+ mapcache = callPackage ../servers/geospatial/mapcache { };
- mapserver = callPackage ../servers/mapserver { };
+ mapserver = callPackage ../servers/geospatial/mapserver { };
- martin = callPackage ../servers/martin {
+ martin = callPackage ../servers/geospatial/martin {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -8121,7 +8138,7 @@ with pkgs;
lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
- loki = callPackage ../development/libraries/loki { };
+ loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; };
longview = callPackage ../servers/monitoring/longview { };
@@ -8296,6 +8313,8 @@ with pkgs;
mencal = callPackage ../applications/misc/mencal { } ;
+ metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
+
metar = callPackage ../applications/misc/metar { };
mfcuk = callPackage ../tools/security/mfcuk { };
@@ -8357,7 +8376,7 @@ with pkgs;
mkclean = callPackage ../applications/video/mkclean {};
- mkcue = callPackage ../tools/cd-dvd/mkcue { };
+ mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; };
mkp224o = callPackage ../tools/security/mkp224o { };
@@ -8637,8 +8656,6 @@ with pkgs;
ngrok-2 = callPackage ../tools/networking/ngrok-2 { };
- ngrok-1 = callPackage ../tools/networking/ngrok-1 { };
-
nifi = callPackage ../servers/web-apps/nifi { };
nitter = callPackage ../servers/nitter { };
@@ -8717,6 +8734,8 @@ with pkgs;
pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
+ panoply = callPackage ../tools/misc/panoply { };
+
patray = callPackage ../tools/audio/patray { };
pathvector = callPackage ../tools/networking/pathvector { };
@@ -8911,9 +8930,8 @@ with pkgs;
ola = callPackage ../applications/misc/ola { };
- olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation;
- };
+ olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
+ { stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
ombi = callPackage ../servers/ombi { };
@@ -8945,7 +8963,7 @@ with pkgs;
opencryptoki = callPackage ../tools/security/opencryptoki { };
- opendbx = callPackage ../development/libraries/opendbx { };
+ opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; };
opendht = callPackage ../development/libraries/opendht {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -9206,17 +9224,13 @@ with pkgs;
pell = callPackage ../applications/misc/pell { };
- pepper = callPackage ../tools/admin/salt/pepper { };
-
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
percona-xtrabackup = percona-xtrabackup_8_0;
- percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix {
- boost = boost159;
- };
- percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
- boost = boost170;
- };
+ percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix
+ { stdenv = gcc10StdenvCompat; boost = boost159; };
+ percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix
+ { stdenv = gcc10StdenvCompat; boost = boost170; };
pick = callPackage ../tools/misc/pick { };
@@ -9315,7 +9329,9 @@ with pkgs;
pgcenter = callPackage ../tools/misc/pgcenter { };
- pgmetrics = callPackage ../tools/misc/pgmetrics { };
+ pgmetrics = callPackage ../tools/misc/pgmetrics {
+ buildGoModule = buildGo118Module;
+ };
pgsync = callPackage ../development/tools/database/pgsync { };
@@ -9853,8 +9869,6 @@ with pkgs;
relic = callPackage ../development/tools/relic { };
- remarkjs = callPackage ../development/web/remarkjs { };
-
alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
remind = callPackage ../tools/misc/remind { };
@@ -10028,6 +10042,8 @@ with pkgs;
rw = callPackage ../tools/misc/rw { };
+ rwc = callPackage ../tools/system/rwc { };
+
rxp = callPackage ../tools/text/xml/rxp { };
rzip = callPackage ../tools/compression/rzip { };
@@ -10172,6 +10188,8 @@ with pkgs;
securefs = callPackage ../tools/filesystems/securefs { };
+ seehecht = callPackage ../tools/text/seehecht { };
+
seexpr = callPackage ../development/compilers/seexpr { };
setroot = callPackage ../tools/X11/setroot { };
@@ -10297,10 +10315,6 @@ with pkgs;
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
- sit = callPackage ../applications/version-management/sit {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- };
-
sixpair = callPackage ../tools/misc/sixpair {};
sketchybar = callPackage ../os-specific/darwin/sketchybar {
@@ -10834,9 +10848,7 @@ with pkgs;
texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
- textadept = callPackage ../applications/editors/textadept/10 { };
-
- textadept11 = callPackage ../applications/editors/textadept/11 { };
+ textadept = callPackage ../applications/editors/textadept { };
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
@@ -10878,7 +10890,7 @@ with pkgs;
tidy-viewer = callPackage ../tools/text/tidy-viewer { };
- tile38 = callPackage ../servers/tile38 { };
+ tile38 = callPackage ../servers/geospatial/tile38 { };
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
@@ -11028,7 +11040,7 @@ with pkgs;
traceroute = callPackage ../tools/networking/traceroute { };
- tracebox = callPackage ../tools/networking/tracebox { };
+ tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
tracee = callPackage ../tools/security/tracee { };
@@ -11494,7 +11506,7 @@ with pkgs;
td = callPackage ../tools/misc/td { };
- tegola = callPackage ../servers/tegola {};
+ tegola = callPackage ../servers/geospatial/tegola {};
tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
@@ -11882,7 +11894,7 @@ with pkgs;
xwinwrap = callPackage ../tools/X11/xwinwrap {};
- yafaray-core = callPackage ../tools/graphics/yafaray-core { };
+ yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; };
yajsv = callPackage ../tools/misc/yajsv { };
@@ -11931,7 +11943,7 @@ with pkgs;
yle-dl = callPackage ../tools/misc/yle-dl {};
- you-get = python3Packages.callPackage ../tools/misc/you-get { };
+ you-get = callPackage ../tools/misc/you-get { };
zasm = callPackage ../development/compilers/zasm {};
@@ -12319,6 +12331,8 @@ with pkgs;
binaryen = callPackage ../development/compilers/binaryen { };
+ blueprint-compiler = callPackage ../development/compilers/blueprint { };
+
bluespec = callPackage ../development/compilers/bluespec {
gmp-static = gmp.override { withStatic = true; };
tex = texlive.combined.scheme-full;
@@ -12487,6 +12501,8 @@ with pkgs;
fennel = callPackage ../development/compilers/fennel { };
+ firrtl = callPackage ../development/compilers/firrtl { };
+
flasm = callPackage ../development/compilers/flasm { };
flyctl = callPackage ../development/web/flyctl { };
@@ -12557,6 +12573,8 @@ with pkgs;
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
+ gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv;
+
# This is not intended for use in nixpkgs but for providing a faster-running
# compiler to nixpkgs users by building gcc with reproducibility-breaking
# profile-guided optimizations
@@ -13065,7 +13083,7 @@ with pkgs;
remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { };
- t-rex = callPackage ../servers/t-rex {
+ t-rex = callPackage ../servers/geospatial/t-rex {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -13119,8 +13137,6 @@ with pkgs;
go = go_1_17;
- go-repo-root = callPackage ../development/tools/go-repo-root { };
-
go-junit-report = callPackage ../development/tools/go-junit-report { };
gobang = callPackage ../development/tools/database/gobang {
@@ -13491,9 +13507,8 @@ with pkgs;
mint = callPackage ../development/compilers/mint { };
- mitscheme = callPackage ../development/compilers/mit-scheme {
- texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
- };
+ mitscheme = callPackage ../development/compilers/mit-scheme
+ { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
mitschemeX11 = mitscheme.override {
enableX11 = true;
@@ -13570,9 +13585,8 @@ with pkgs;
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
- obliv-c = callPackage ../development/compilers/obliv-c {
- ocamlPackages = ocaml-ng.ocamlPackages_4_05;
- };
+ obliv-c = callPackage ../development/compilers/obliv-c
+ { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
ocaml-ng = callPackage ./ocaml-packages.nix { };
ocaml = ocamlPackages.ocaml;
@@ -13583,10 +13597,8 @@ with pkgs;
inherit (callPackage ../development/tools/ocaml/ocamlformat { })
ocamlformat # latest version
- ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
- ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
- ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0
- ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0;
+ ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
+ ocamlformat_0_22_4;
orc = callPackage ../development/compilers/orc { };
@@ -13676,18 +13688,18 @@ with pkgs;
inherit (darwin) apple_sdk;
};
- rust_1_60 = callPackage ../development/compilers/rust/1_60.nix {
+ rust_1_61 = callPackage ../development/compilers/rust/1_61.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_14 = llvmPackages_14.libllvm;
};
- rust = rust_1_60;
+ rust = rust_1_61;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
- mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
+ mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; };
- rustPackages_1_60 = rust_1_60.packages.stable;
- rustPackages = rustPackages_1_60;
+ rustPackages_1_61 = rust_1_61.packages.stable;
+ rustPackages = rustPackages_1_61;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -14273,7 +14285,7 @@ with pkgs;
stdenv = clangStdenv;
};
- jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc922.jacinda;
+ jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda;
janet = callPackage ../development/interpreters/janet {};
@@ -14807,15 +14819,18 @@ with pkgs;
ansible = ansible_2_12;
ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
- version = "2.12.5";
+ version = "2.12.6";
src = oldAttrs.src.override {
inherit version;
- hash = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
+ hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0=";
};
+ meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
}));
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
+ ansible-later = with python3.pkgs; toPythonApplication ansible-later;
+
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
@@ -14904,8 +14919,6 @@ with pkgs;
automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };
- automoc4 = callPackage ../development/tools/misc/automoc4 { };
-
avrdude = callPackage ../development/embedded/avrdude { };
b4 = callPackage ../development/tools/b4 { };
@@ -14932,10 +14945,7 @@ with pkgs;
buildJdk = jdk11_headless;
buildJdkName = "java11";
runJdk = jdk11_headless;
- stdenv =
- if stdenv.cc.isClang then llvmPackages.stdenv
- else if stdenv.cc.isGNU then gcc10Stdenv
- else stdenv;
+ stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;
bazel_self = bazel_4;
};
@@ -15073,7 +15083,9 @@ with pkgs;
bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { };
- buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
+ buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent {
+ buildGoModule = buildGo118Module;
+ };
buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
@@ -15732,7 +15744,7 @@ with pkgs;
kcov = callPackage ../development/tools/analysis/kcov { };
- kind = callPackage ../development/tools/kind { };
+ kind = callPackage ../development/tools/kind { buildGoModule = buildGo118Module; };
khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { };
@@ -15908,17 +15920,14 @@ with pkgs;
jre_headless = jre8_headless;
};
+ nmrpflash = callPackage ../development/embedded/nmrpflash { };
+
nwjs = callPackage ../development/tools/nwjs { };
nwjs-sdk = callPackage ../development/tools/nwjs {
sdk = true;
};
- # only kept for nixui, see https://github.com/matejc/nixui/issues/27
- nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
- gconf = gnome2.GConf;
- };
-
nrfutil = callPackage ../development/tools/misc/nrfutil { };
obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; };
@@ -16096,6 +16105,9 @@ with pkgs;
replacement = callPackage ../development/tools/misc/replacement { };
+ inherit (callPackage ../development/tools/replay-io { })
+ replay-io replay-node-cli;
+
retdec = callPackage ../development/tools/analysis/retdec {
stdenv = gcc8Stdenv;
};
@@ -16203,10 +16215,7 @@ with pkgs;
sloc = nodePackages.sloc;
- smatch = callPackage ../development/tools/analysis/smatch {
- buildllvmsparse = false;
- buildc2xml = false;
- };
+ smatch = callPackage ../development/tools/analysis/smatch { };
smc = callPackage ../tools/misc/smc { };
@@ -16275,7 +16284,7 @@ with pkgs;
symfony-cli = callPackage ../development/tools/symfony-cli { };
- swiftshader = callPackage ../development/libraries/swiftshader { };
+ swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; };
systemfd = callPackage ../development/tools/systemfd { };
@@ -16290,7 +16299,7 @@ with pkgs;
c3c = callPackage ../development/compilers/c3c { };
- swfmill = callPackage ../tools/video/swfmill { };
+ swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; };
swftools = callPackage ../tools/video/swftools {
stdenv = gccStdenv;
@@ -16372,10 +16381,6 @@ with pkgs;
tweak = callPackage ../applications/editors/tweak { };
- tychus = callPackage ../development/tools/tychus {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation;
- };
-
uddup = callPackage ../tools/security/uddup { };
udis86 = callPackage ../development/tools/udis86 { };
@@ -16439,7 +16444,7 @@ with pkgs;
webdis = callPackage ../development/tools/database/webdis { };
- xc3sprog = callPackage ../development/embedded/xc3sprog { };
+ xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; };
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
@@ -16836,7 +16841,7 @@ with pkgs;
classads = callPackage ../development/libraries/classads { };
clfft = callPackage ../development/libraries/clfft {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
clipp = callPackage ../development/libraries/clipp { };
@@ -16912,7 +16917,7 @@ with pkgs;
uci = callPackage ../development/libraries/uci { };
- uri = callPackage ../development/libraries/uri { };
+ uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; };
cppcms = callPackage ../development/libraries/cppcms { };
@@ -16942,7 +16947,7 @@ with pkgs;
cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
- cxxtools = callPackage ../development/libraries/cxxtools { };
+ cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
cwiid = callPackage ../development/libraries/cwiid { };
@@ -17323,6 +17328,8 @@ with pkgs;
geoipjava = callPackage ../development/libraries/java/geoipjava { };
+ geomyidae = callPackage ../applications/networking/gopher/geomyidae { };
+
geos = callPackage ../development/libraries/geos { };
geos39 = callPackage ../development/libraries/geos/3.9.nix { };
@@ -18393,10 +18400,6 @@ with pkgs;
libdecor = callPackage ../development/libraries/libdecor { };
- libdigidoc = callPackage ../development/libraries/libdigidoc {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
-
libdigidocpp = callPackage ../development/libraries/libdigidocpp { };
libdiscid = callPackage ../development/libraries/libdiscid { };
@@ -18435,8 +18438,9 @@ with pkgs;
libdvdread = callPackage ../development/libraries/libdvdread { };
libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
- inherit (callPackage ../development/libraries/libdwarf { })
- libdwarf dwarfdump;
+ libdwarf = callPackage ../development/libraries/libdwarf { };
+ dwarfdump = libdwarf.bin;
+ libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { };
libe57format = callPackage ../development/libraries/libe57format { };
@@ -18694,7 +18698,11 @@ with pkgs;
libieee1284 = callPackage ../development/libraries/libieee1284 { };
- libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
+ libimobiledevice = callPackage ../development/libraries/libimobiledevice {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation;
+ };
+
+ libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { };
libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
@@ -18839,7 +18847,7 @@ with pkgs;
glibcIconv = libc: let
inherit (libc) pname version;
libcDev = lib.getDev libc;
- in runCommand "${pname}-iconv-${version}" {} ''
+ in runCommand "${pname}-iconv-${version}" { strictDeps = true; } ''
mkdir -p $out/include
ln -sv ${libcDev}/include/iconv.h $out/include
'';
@@ -19338,6 +19346,10 @@ with pkgs;
libversion = callPackage ../development/libraries/libversion { };
+ libvgm = callPackage ../development/libraries/libvgm {
+ inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
+ };
+
libvirt = callPackage ../development/libraries/libvirt {
inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
};
@@ -19644,14 +19656,12 @@ with pkgs;
mosquitto = callPackage ../servers/mqtt/mosquitto { };
- mps = callPackage ../development/libraries/mps { };
+ mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; };
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
mpeg2dec = libmpeg2;
- mqtt-bench = callPackage ../applications/misc/mqtt-bench {};
-
mqttui = callPackage ../tools/networking/mqttui {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -19712,6 +19722,8 @@ with pkgs;
nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
+ nanotts = callPackage ../tools/audio/nanotts { };
+
ncnn = callPackage ../development/libraries/ncnn { };
ndpi = callPackage ../development/libraries/ndpi { };
@@ -19766,7 +19778,7 @@ with pkgs;
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
- non = callPackage ../applications/audio/non { };
+ non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; };
ntl = callPackage ../development/libraries/ntl { };
@@ -20434,13 +20446,17 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
- SDL = callPackage ../development/libraries/SDL ({
+ SDL_classic = callPackage ../development/libraries/SDL ({
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
# libGLU doesn’t work with Android’s SDL
libGLU = null;
});
+ SDL_compat = callPackage ../development/libraries/SDL_compat { };
+
+ SDL = SDL_classic;
+
SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { };
SDL_sixel = callPackage ../development/libraries/SDL_sixel { };
@@ -20763,8 +20779,6 @@ with pkgs;
stegseek = callPackage ../tools/security/stegseek {};
- stlport = callPackage ../development/libraries/stlport { };
-
streamlink = callPackage ../applications/video/streamlink { };
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};
@@ -20871,7 +20885,7 @@ with pkgs;
tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
- tiscamera = callPackage ../os-specific/linux/tiscamera { };
+ tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; };
tivodecode = callPackage ../applications/video/tivodecode { };
@@ -20989,6 +21003,8 @@ with pkgs;
hdf5 = hdf5.override { usev110Api = true; };
};
+ vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
+
vlock = callPackage ../misc/screensavers/vlock { };
vmime = callPackage ../development/libraries/vmime { };
@@ -21083,7 +21099,7 @@ with pkgs;
websocketpp = callPackage ../development/libraries/websocket++ { };
- webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
+ webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
# bump when majoring of packages have updated
webrtc-audio-processing = webrtc-audio-processing_0_3;
@@ -21253,7 +21269,7 @@ with pkgs;
zlib-ng = callPackage ../development/libraries/zlib-ng { };
- libdynd = callPackage ../development/libraries/libdynd { };
+ libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; };
zlog = callPackage ../development/libraries/zlog { };
@@ -21406,8 +21422,6 @@ with pkgs;
vgo2nix = callPackage ../development/tools/vgo2nix { };
- ws = callPackage ../development/tools/ws { };
-
### DEVELOPMENT / JAVA MODULES
javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { });
@@ -21647,6 +21661,8 @@ with pkgs;
clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
+ codeowners = callPackage ../development/tools/codeowners { };
+
couchdb3 = callPackage ../servers/http/couchdb/3.nix {
erlang = erlangR22;
};
@@ -21681,6 +21697,8 @@ with pkgs;
dkimproxy = callPackage ../servers/mail/dkimproxy { };
+ dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
+
do-agent = callPackage ../servers/monitoring/do-agent { };
dodgy = with python3Packages; toPythonApplication dodgy;
@@ -21931,7 +21949,7 @@ with pkgs;
mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
- mbtileserver = callPackage ../servers/mbtileserver { };
+ mbtileserver = callPackage ../servers/geospatial/mbtileserver { };
memcached = callPackage ../servers/memcached {};
@@ -22019,6 +22037,7 @@ with pkgs;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
+ pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@@ -22029,6 +22048,8 @@ with pkgs;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
+ openssl = openssl_3_0;
+ pcre = pcre2;
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@@ -22037,6 +22058,8 @@ with pkgs;
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
+ openssl = openssl_3_0;
+ pcre = pcre2;
withKTLS = true;
withPerl = false;
# We don't use `with` statement here on purpose!
@@ -22168,9 +22191,9 @@ with pkgs;
tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
- pg_featureserv = callPackage ../servers/pg_featureserv { };
+ pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { };
- pg_tileserv = callPackage ../servers/pg_tileserv { };
+ pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { };
pies = callPackage ../servers/pies { };
@@ -22247,7 +22270,7 @@ with pkgs;
nginx-sso = callPackage ../servers/nginx-sso { };
- percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
+ percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; };
percona-server = percona-server56;
riak = callPackage ../servers/nosql/riak/2.2.0.nix {
@@ -22272,9 +22295,9 @@ with pkgs;
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
- boost = boost173; # Configure checks for specific version.
- protobuf = protobuf3_11;
- icu = icu67;
+ boost = boost177; # Configure checks for specific version.
+ protobuf = protobuf3_19;
+ icu = icu69;
};
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
@@ -22402,7 +22425,6 @@ with pkgs;
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
- prometheus-dmarc-exporter = callPackage ../servers/monitoring/prometheus/dmarc-exporter { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { };
@@ -22709,7 +22731,7 @@ with pkgs;
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
- xqilla = callPackage ../development/tools/xqilla { };
+ xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };
xquartz = callPackage ../servers/x11/xquartz { };
@@ -23615,7 +23637,7 @@ with pkgs;
pipework = callPackage ../os-specific/linux/pipework { };
- pktgen = callPackage ../os-specific/linux/pktgen { };
+ pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; };
plymouth = callPackage ../os-specific/linux/plymouth { };
@@ -23929,12 +23951,9 @@ with pkgs;
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
- udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks2;
- udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
-
ugtrain = callPackage ../tools/misc/ugtrain { };
unscd = callPackage ../os-specific/linux/unscd { };
@@ -24262,8 +24281,6 @@ with pkgs;
envypn-font = callPackage ../data/fonts/envypn-font
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
- envdir = callPackage ../tools/misc/envdir-go { };
-
execline-man-pages = skawarePackages.execline-man-pages;
ezra-sil = callPackage ../data/fonts/ezra-sil { };
@@ -24836,10 +24853,6 @@ with pkgs;
quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {};
- r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { };
-
- r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
-
raleway = callPackage ../data/fonts/raleway { };
recursive = callPackage ../data/fonts/recursive { };
@@ -25474,8 +25487,6 @@ with pkgs;
bspwm = callPackage ../applications/window-managers/bspwm { };
- btops = callPackage ../applications/window-managers/btops { };
-
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@@ -25718,6 +25729,8 @@ with pkgs;
curseradio = callPackage ../applications/audio/curseradio { };
+ curtail = callPackage ../applications/graphics/curtail { };
+
cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
cvs = callPackage ../applications/version-management/cvs { };
@@ -25818,7 +25831,6 @@ with pkgs;
docker_20_10;
docker = docker_20_10;
- docker-edge = docker_20_10;
docker-client = docker.override { clientOnly = true; };
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
@@ -25841,7 +25853,8 @@ with pkgs;
afterburn = callPackage ../tools/admin/afterburn {};
docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
- docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { };
+ docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
+ docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix {};
amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
@@ -25871,7 +25884,7 @@ with pkgs;
droopy = python3Packages.callPackage ../applications/networking/droopy { };
drumgizmo = callPackage ../applications/audio/drumgizmo {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
dsf2flac = callPackage ../applications/audio/dsf2flac { };
@@ -26139,6 +26152,8 @@ with pkgs;
faircamp = callPackage ../applications/misc/faircamp { };
+ famistudio = callPackage ../applications/audio/famistudio { };
+
fasttext = callPackage ../applications/science/machine-learning/fasttext { };
fbmenugen = callPackage ../applications/misc/fbmenugen { };
@@ -26193,9 +26208,9 @@ with pkgs;
flrig = callPackage ../applications/radio/flrig { };
- fluxus = callPackage ../applications/graphics/fluxus { };
+ fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; };
- flwrap = callPackage ../applications/radio/flwrap { };
+ flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; };
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
@@ -26439,8 +26454,6 @@ with pkgs;
rhythmbox = callPackage ../applications/audio/rhythmbox { };
- gradio = callPackage ../applications/audio/gradio { };
-
puddletag = libsForQt5.callPackage ../applications/audio/puddletag { };
w_scan = callPackage ../applications/video/w_scan { };
@@ -26539,6 +26552,8 @@ with pkgs;
firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
+ fmtoy = callPackage ../tools/audio/fmtoy { };
+
flac = callPackage ../applications/audio/flac { };
redoflacs = callPackage ../applications/audio/redoflacs { };
@@ -26769,9 +26784,7 @@ with pkgs;
m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
- manim = python3Packages.callPackage ../applications/video/manim {
- opencv = python3Packages.opencv3;
- };
+ manim = callPackage ../applications/video/manim { };
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
@@ -26887,7 +26900,7 @@ with pkgs;
inherit (gnome2) GConf;
};
- gosmore = callPackage ../applications/misc/gosmore { };
+ gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
@@ -27037,6 +27050,8 @@ with pkgs;
hugo = callPackage ../applications/misc/hugo { buildGoModule = buildGo118Module; };
+ gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
+
go-org = callPackage ../applications/misc/go-org { };
hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
@@ -27064,6 +27079,8 @@ with pkgs;
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
+ hypnotix = callPackage ../applications/video/hypnotix { };
+
indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { };
jackline = callPackage ../applications/networking/instant-messengers/jackline { };
@@ -27170,6 +27187,8 @@ with pkgs;
swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { };
+ swaynag-battery = callPackage ../applications/misc/swaynag-battery {};
+
tiramisu = callPackage ../applications/misc/tiramisu { };
rootbar = callPackage ../applications/misc/rootbar {};
@@ -27190,6 +27209,8 @@ with pkgs;
i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };
+ i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };
+
i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { };
i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { };
@@ -27208,8 +27229,6 @@ with pkgs;
i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
- i3cat = callPackage ../tools/misc/i3cat { };
-
i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
i3lock = callPackage ../applications/window-managers/i3/lock.nix {
@@ -27398,8 +27417,6 @@ with pkgs;
lua5 = lua5_3;
};
- iptraf = callPackage ../applications/networking/iptraf { };
-
iptraf-ng = callPackage ../applications/networking/iptraf-ng { };
irccloud = callPackage ../applications/networking/irc/irccloud { };
@@ -27465,7 +27482,7 @@ with pkgs;
jgmenu = callPackage ../applications/misc/jgmenu { };
- jigdo = callPackage ../applications/misc/jigdo { };
+ jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; };
jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
@@ -27763,9 +27780,10 @@ with pkgs;
boost = boost175;
};
- libreoffice = if stdenv.isDarwin
- then callPackage ../applications/office/libreoffice/darwin.nix {}
- else hiPrio libreoffice-still;
+ libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
+
+ libreoffice = hiPrio libreoffice-still;
+
libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice;
libreoffice-args = {
@@ -27943,7 +27961,9 @@ with pkgs;
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
- magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs/default.nix { };
+ magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs {
+ inherit (darwin.apple_sdk.frameworks) Security AppKit;
+ };
magnetophonDSP = lib.recurseIntoAttrs {
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
@@ -27978,8 +27998,6 @@ with pkgs;
electron = electron_9;
};
- marp = callPackage ../applications/office/marp { };
-
magnetico = callPackage ../applications/networking/p2p/magnetico { };
mastodon-bot = nodePackages.mastodon-bot;
@@ -28002,7 +28020,7 @@ with pkgs;
mbrola = callPackage ../applications/audio/mbrola { };
- mcomix3 = callPackage ../applications/graphics/mcomix3 {};
+ mcomix = callPackage ../applications/graphics/mcomix { };
mcpp = callPackage ../development/compilers/mcpp { };
@@ -28079,7 +28097,7 @@ with pkgs;
mikmod = callPackage ../applications/audio/mikmod { };
- miniaudicle = callPackage ../applications/audio/miniaudicle { };
+ miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; };
minicom = callPackage ../tools/misc/minicom { };
@@ -28120,6 +28138,17 @@ with pkgs;
};
};
+ mmlgui = callPackage ../applications/audio/mmlgui {
+ inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+ libvgm = libvgm.override {
+ withAllEmulators = false;
+ emulators = [
+ "_PRESET_SMD"
+ ];
+ enableLibplayer = false;
+ };
+ };
+
mmsd = callPackage ../tools/networking/mmsd { };
mmtc = callPackage ../applications/audio/mmtc { };
@@ -28192,8 +28221,6 @@ with pkgs;
mopidy-scrobbler
mopidy-somafm
mopidy-soundcloud
- mopidy-spotify
- mopidy-spotify-tunigo
mopidy-subidy
mopidy-tunein
mopidy-youtube
@@ -28419,6 +28446,8 @@ with pkgs;
odin2 = callPackage ../applications/audio/odin2 { };
+ okteto = callPackage ../development/tools/okteto { };
+
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
@@ -28585,10 +28614,6 @@ with pkgs;
maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
- maxscale = callPackage ../tools/networking/maxscale {
- stdenv = gcc6Stdenv;
- };
-
pdfdiff = callPackage ../applications/misc/pdfdiff { };
pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
@@ -28792,6 +28817,10 @@ with pkgs;
owamp = callPackage ../applications/networking/owamp { };
+ vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { };
+
+ vgmtools = callPackage ../tools/audio/vgmtools { };
+
vieb = callPackage ../applications/networking/browsers/vieb { };
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
@@ -28923,7 +28952,7 @@ with pkgs;
pianobar = callPackage ../applications/audio/pianobar { };
- pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
+ pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
pianoteq = callPackage ../applications/audio/pianoteq { };
@@ -29045,8 +29074,6 @@ with pkgs;
electron = electron_9;
};
- pond = callPackage ../applications/networking/instant-messengers/pond { };
-
ponymix = callPackage ../applications/audio/ponymix { };
portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { };
@@ -29101,7 +29128,14 @@ with pkgs;
pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
- pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { };
+ pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview {
+ # use the same stdenv as libsForQt514 to fix build
+ boost = boost.override {
+ stdenv = if stdenv.cc.isGNU
+ then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
+ else stdenv;
+ };
+ };
puredata = callPackage ../applications/audio/puredata { };
puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
@@ -29359,6 +29393,8 @@ with pkgs;
rkdeveloptool = callPackage ../misc/rkdeveloptool { };
+ rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { };
+
rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { };
rofi-unwrapped = callPackage ../applications/misc/rofi { };
@@ -29433,11 +29469,12 @@ with pkgs;
scli = callPackage ../applications/misc/scli { };
- scribus = callPackage ../applications/office/scribus {
+ scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix {
inherit (gnome2) libart_lgpl;
};
- scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { };
+ scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
+ scribus = scribus_1_5;
seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
@@ -29664,7 +29701,7 @@ with pkgs;
socialscan = with python3.pkgs; toPythonApplication socialscan;
- sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
+ sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; };
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
@@ -29684,8 +29721,6 @@ with pkgs;
spotify = callPackage ../applications/audio/spotify/wrapper.nix { };
- libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});
-
sourcetrail = let
llvmPackages = llvmPackages_10;
in libsForQt5.callPackage ../development/tools/sourcetrail {
@@ -29803,8 +29838,6 @@ with pkgs;
syncthing-discovery
syncthing-relay;
- syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { };
-
syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { };
@@ -29901,8 +29934,6 @@ with pkgs;
telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
- telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
-
telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
teleprompter = callPackage ../applications/misc/teleprompter {};
@@ -30037,8 +30068,6 @@ with pkgs;
todoman = callPackage ../applications/office/todoman { };
- toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { };
-
topydo = callPackage ../applications/misc/topydo {};
torchat = callPackage ../applications/networking/instant-messengers/torchat { };
@@ -30230,8 +30259,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
- vimiv = callPackage ../applications/graphics/vimiv { };
-
vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; };
@@ -30458,6 +30485,8 @@ with pkgs;
waon = callPackage ../applications/audio/waon { };
+ warp = callPackage ../applications/networking/warp { };
+
w3m = callPackage ../applications/networking/browsers/w3m { };
# Should always be the version with the most features
@@ -30617,11 +30646,8 @@ with pkgs;
wxGTK = wxGTK31;
};
- wxcam = callPackage ../applications/video/wxcam {
- inherit (gnome2) libglade;
- wxGTK = wxGTK28;
- gtk = gtk2;
- };
+ wxcam = callPackage ../applications/video/wxcam
+ { stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; };
xa = callPackage ../development/compilers/xa/xa.nix { };
dxa = callPackage ../development/compilers/xa/dxa.nix { };
@@ -30830,7 +30856,7 @@ with pkgs;
xmountains = callPackage ../applications/graphics/xmountains { };
- xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };
+ xmppc = callPackage ../applications/networking/instant-messengers/xmppc {};
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
@@ -30942,6 +30968,8 @@ with pkgs;
ytmdl = callPackage ../tools/misc/ytmdl { };
+ yutto = with python3.pkgs; toPythonApplication yutto;
+
yuview = libsForQt5.yuview;
zam-plugins = callPackage ../applications/audio/zam-plugins { };
@@ -31191,6 +31219,8 @@ with pkgs;
lndconnect = callPackage ../applications/blockchains/lndconnect { };
+ lndhub-go = callPackage ../applications/blockchains/lndhub-go { };
+
lndmanage = callPackage ../applications/blockchains/lndmanage { };
monero-cli = callPackage ../applications/blockchains/monero-cli {
@@ -31205,17 +31235,15 @@ with pkgs;
boost = boost17x;
};
- oxen = callPackage ../applications/blockchains/oxen {
- boost = boost17x;
- };
+ oxen = callPackage ../applications/blockchains/oxen
+ { stdenv = gcc10StdenvCompat; boost = boost17x; };
masari = callPackage ../applications/blockchains/masari { boost = boost165; };
napari = with python3Packages; toPythonApplication napari;
- nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet {
- boost = boost172;
- };
+ nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet
+ { stdenv = gcc10StdenvCompat; boost = boost172; };
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
@@ -31292,12 +31320,14 @@ with pkgs;
beancount = with python3.pkgs; toPythonApplication beancount;
+ beancount-language-server = callPackage ../development/tools/beancount-language-server {};
+
bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench;
cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
- cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
+ cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { buildGoModule = buildGo118Module; };
confd = callPackage ../tools/system/confd { };
@@ -31582,16 +31612,16 @@ with pkgs;
cuyo = callPackage ../games/cuyo { };
deliantra-server = callPackage ../games/deliantra/server.nix {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
deliantra-arch = callPackage ../games/deliantra/arch.nix {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
deliantra-maps = callPackage ../games/deliantra/maps.nix {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
deliantra-data = callPackage ../games/deliantra/data.nix {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
ddnet = callPackage ../games/ddnet { };
@@ -31614,9 +31644,8 @@ with pkgs;
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
- dxx-rebirth = callPackage ../games/dxx-rebirth {
- physfs = physfs_2;
- };
+ dxx-rebirth = callPackage ../games/dxx-rebirth
+ { stdenv = gcc10StdenvCompat; physfs = physfs_2; };
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
descent1-assets
@@ -31882,7 +31911,7 @@ with pkgs;
manaplus = callPackage ../games/manaplus { };
- mars = callPackage ../games/mars { };
+ mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
megaglest = callPackage ../games/megaglest { };
@@ -31981,7 +32010,7 @@ with pkgs;
openlierox = callPackage ../games/openlierox { };
- openclonk = callPackage ../games/openclonk { };
+ openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; };
openjk = callPackage ../games/openjk { };
@@ -32026,7 +32055,7 @@ with pkgs;
opentyrian = callPackage ../games/opentyrian { };
- openxcom = callPackage ../games/openxcom { };
+ openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
openxray = callPackage ../games/openxray { };
@@ -32130,7 +32159,7 @@ with pkgs;
rocksndiamonds = callPackage ../games/rocksndiamonds { };
- rott = callPackage ../games/rott { };
+ rott = callPackage ../games/rott { SDL = SDL_compat; };
rott-shareware = rott.override {
buildShareware = true;
@@ -32210,13 +32239,15 @@ with pkgs;
# You still can override by passing more arguments.
space-orbit = callPackage ../games/space-orbit { };
- spring = callPackage ../games/spring {
- asciidoc = asciidoc-full;
- boost = boost155;
- };
+ spring = callPackage ../games/spring
+ { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; };
springLobby = callPackage ../games/spring/springlobby.nix { };
+ srb2 = callPackage ../games/srb2 { };
+
+ srb2kart = callPackage ../games/srb2kart { };
+
ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
stardust = callPackage ../games/stardust { };
@@ -32253,12 +32284,8 @@ with pkgs;
stt = callPackage ../tools/audio/stt { };
- stuntrally = callPackage ../games/stuntrally {
- ogre = ogre1_9;
- mygui = mygui.override {
- withOgre = true;
- };
- };
+ stuntrally = callPackage ../games/stuntrally
+ { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
superTux = callPackage ../games/supertux { };
@@ -32316,8 +32343,6 @@ with pkgs;
trackballs = callPackage ../games/trackballs { };
- tremulous = callPackage ../games/tremulous { };
-
tumiki-fighters = callPackage ../games/tumiki-fighters { };
tuxpaint = callPackage ../games/tuxpaint { };
@@ -32474,8 +32499,6 @@ with pkgs;
serverOnly = true;
};
- zangband = callPackage ../games/zangband { };
-
zaz = callPackage ../games/zaz { };
zdbsp = callPackage ../games/zdoom/zdbsp.nix { };
@@ -32510,7 +32533,7 @@ with pkgs;
### DESKTOP ENVIRONMENTS
- arcan = recurseIntoAttrs (callPackage ../desktops/arcan { });
+ arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { });
cdesktopenv = callPackage ../desktops/cdesktopenv { };
@@ -32689,6 +32712,8 @@ with pkgs;
aragorn = callPackage ../applications/science/biology/aragorn { };
+ astral = callPackage ../applications/science/biology/astral { };
+
archimedes = callPackage ../applications/science/electronics/archimedes {
stdenv = gcc6Stdenv;
};
@@ -32708,23 +32733,23 @@ with pkgs;
};
bpp-core = callPackage ../development/libraries/science/biology/bpp-core {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
bppsuite = callPackage ../applications/science/biology/bppsuite {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
cd-hit = callPackage ../applications/science/biology/cd-hit {
@@ -32882,7 +32907,7 @@ with pkgs;
star = callPackage ../applications/science/biology/star { };
- strelka = callPackage ../applications/science/biology/strelka { };
+ strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; };
inherit (callPackages ../applications/science/biology/sumatools {})
sumalibs
@@ -32951,7 +32976,7 @@ with pkgs;
flintqs = callPackage ../development/libraries/science/math/flintqs { };
- getdp = callPackage ../applications/science/math/getdp { };
+ getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; };
gurobi = callPackage ../applications/science/math/gurobi { };
@@ -33105,7 +33130,7 @@ with pkgs;
### SCIENCE/MOLECULAR-DYNAMICS
- dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
+ dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; };
lammps = callPackage ../applications/science/molecular-dynamics/lammps {
fftw = fftw;
@@ -33159,7 +33184,7 @@ with pkgs;
mcfm = callPackage ../applications/science/physics/MCFM {
stdenv = gccStdenv;
- lhapdf = lhapdf.override { stdenv = gccStdenv; };
+ lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; };
};
nnpdf = callPackage ../applications/science/physics/nnpdf { };
@@ -33201,7 +33226,7 @@ with pkgs;
alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
aspino = callPackage ../applications/science/logic/aspino {
- stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
+ stdenv = gcc10StdenvCompat;
};
beluga = callPackage ../applications/science/logic/beluga {};
@@ -33320,6 +33345,7 @@ with pkgs;
keymapviz = callPackage ../tools/misc/keymapviz { };
lean = callPackage ../applications/science/logic/lean {};
+ lean2 = callPackage ../applications/science/logic/lean2 {};
lean3 = lean;
elan = callPackage ../applications/science/logic/elan {};
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
@@ -33590,8 +33616,6 @@ with pkgs;
singular = callPackage ../applications/science/math/singular { };
- scilab = callPackage ../applications/science/math/scilab { };
-
scilab-bin = callPackage ../applications/science/math/scilab-bin {};
scilla = callPackage ../tools/security/scilla { };
@@ -34042,7 +34066,7 @@ with pkgs;
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
- idsk = callPackage ../tools/filesystems/idsk { };
+ idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
colima = callPackage ../applications/virtualization/colima { };
@@ -34222,11 +34246,11 @@ with pkgs;
configuration:
let
c = import (path + "/nixos/lib/eval-config.nix") {
- inherit (stdenv.hostPlatform) system;
modules =
[(
{ lib, ... }: {
config.nixpkgs.pkgs = lib.mkDefault pkgs;
+ config.nixpkgs.localSystem = lib.mkDefault stdenv.hostPlatform;
}
)] ++ (
if builtins.isList configuration
@@ -34258,8 +34282,6 @@ with pkgs;
nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
- nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
-
nixdoc = callPackage ../tools/nix/nixdoc {};
dnadd = callPackage ../tools/nix/dnadd { };
@@ -34411,6 +34433,8 @@ with pkgs;
sndio = callPackage ../misc/sndio { };
+ sticky = callPackage ../applications/misc/sticky { };
+
stork = callPackage ../applications/misc/stork { };
oclgrind = callPackage ../development/tools/analysis/oclgrind { };
@@ -34505,7 +34529,7 @@ with pkgs;
stdenv = gccStdenv;
};
- rss-glx = callPackage ../misc/screensavers/rss-glx { };
+ rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; };
run-scaled = callPackage ../tools/X11/run-scaled { };
@@ -34513,7 +34537,7 @@ with pkgs;
runit = callPackage ../tools/system/runit { };
- runitor = callPackage ../tools/system/runitor { };
+ runitor = callPackage ../tools/system/runitor { buildGoModule = buildGo118Module; };
refind = callPackage ../tools/bootloaders/refind { };
@@ -34752,6 +34776,8 @@ with pkgs;
tvheadend = callPackage ../servers/tvheadend { };
+ uacme = callPackage ../tools/admin/uacme { };
+
ums = callPackage ../servers/ums { };
unity3d = callPackage ../development/tools/unity3d {
@@ -35148,9 +35174,8 @@ with pkgs;
openring = callPackage ../applications/misc/openring { };
- openvino = callPackage ../development/libraries/openvino {
- python = python3;
- };
+ openvino = callPackage ../development/libraries/openvino
+ { stdenv = gcc10StdenvCompat; python = python3; };
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
@@ -35291,7 +35316,9 @@ with pkgs;
webwormhole = callPackage ../tools/networking/webwormhole { };
- werf = callPackage ../applications/networking/cluster/werf { };
+ werf = callPackage ../applications/networking/cluster/werf {
+ buildGoModule = buildGo118Module;
+ };
wifi-password = callPackage ../os-specific/darwin/wifi-password {};
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index ad06227e74f1..e9cb8681f653 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -128,7 +128,7 @@ let
in {
freeformType =
- let t = lib.types.attrsOf lib.types.raw;
+ let t = lib.types.lazyAttrsOf lib.types.raw;
in t // {
merge = loc: defs:
let r = t.merge loc defs;
@@ -139,7 +139,7 @@ in {
config = {
warnings = lib.optionals config.warnUndeclaredOptions (
- lib.mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared
+ lib.mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared or {}
);
};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c46a7f1bcd24..79815b65f605 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -13,13 +13,13 @@ let
"integer-simple"
"native-bignum"
"ghc902"
- "ghc922"
+ "ghc923"
"ghcHEAD"
];
nativeBignumIncludes = [
"ghc902"
- "ghc922"
+ "ghc923"
"ghcHEAD"
];
@@ -121,7 +121,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
- ghc922 = callPackage ../development/compilers/ghc/9.2.2.nix {
+ ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
if stdenv.isAarch64 || stdenv.isAarch32 then
@@ -227,9 +227,9 @@ in {
ghc = bh.compiler.ghc902;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
};
- ghc922 = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc922;
- ghc = bh.compiler.ghc922;
+ ghc923 = callPackage ../development/haskell-modules {
+ buildHaskellPackages = bh.packages.ghc923;
+ ghc = bh.compiler.ghc923;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index a55ecc2b51ee..2f53fc73874e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -343,6 +343,8 @@ in {
mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { };
+ new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { };
+
nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }));
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3e0e8e25b2fa..96dfd89b5958 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -95,6 +95,7 @@ in
'';
meta = with lib; {
+ broken = stdenv.isDarwin;
description = "Lightweight UNIX I/O and POSIX binding for Lua";
homepage = "https://www.gitano.org.uk/luxio/";
license = licenses.mit;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 905294b8f8b5..053af5e6677b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -24,6 +24,8 @@ let
alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {};
+ alsa = callPackage ../development/ocaml-modules/alsa { };
+
angstrom = callPackage ../development/ocaml-modules/angstrom { };
angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };
@@ -34,6 +36,8 @@ let
ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
+ ao = callPackage ../development/ocaml-modules/ao { };
+
apron = callPackage ../development/ocaml-modules/apron { };
arp = callPackage ../development/ocaml-modules/arp { };
@@ -93,6 +97,8 @@ let
brisk-reconciler = callPackage ../development/ocaml-modules/brisk-reconciler { };
+ bwd = callPackage ../development/ocaml-modules/bwd { };
+
bz2 = callPackage ../development/ocaml-modules/bz2 { };
ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
@@ -310,6 +316,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
+ dtools = callPackage ../development/ocaml-modules/dtools { };
+
duff = callPackage ../development/ocaml-modules/duff { };
dum = callPackage ../development/ocaml-modules/dum { };
@@ -343,6 +351,8 @@ let
dune-site = callPackage ../development/ocaml-modules/dune-site { };
+ duppy = callPackage ../development/ocaml-modules/duppy { };
+
duration = callPackage ../development/ocaml-modules/duration { };
dyn = callPackage ../development/ocaml-modules/dyn { };
@@ -478,6 +488,8 @@ let
inherit (pkgs) gsl;
};
+ gstreamer = callPackage ../development/ocaml-modules/gstreamer { };
+
h2 = callPackage ../development/ocaml-modules/h2 { };
hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { };
@@ -688,6 +700,8 @@ let
libllvm = pkgs.llvmPackages_10.libllvm;
};
+ lo = callPackage ../development/ocaml-modules/lo { };
+
logs = callPackage ../development/ocaml-modules/logs { };
lru = callPackage ../development/ocaml-modules/lru { };
@@ -732,6 +746,10 @@ let
macaque = callPackage ../development/ocaml-modules/macaque { };
+ mad = callPackage ../development/ocaml-modules/mad { };
+
+ magic = callPackage ../development/ocaml-modules/magic { };
+
magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
mariadb = callPackage ../development/ocaml-modules/mariadb {
@@ -869,6 +887,8 @@ let
mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { };
+ mm = callPackage ../development/ocaml-modules/mm { };
+
mmap = callPackage ../development/ocaml-modules/mmap { };
mparser = callPackage ../development/ocaml-modules/mparser { };
@@ -1109,6 +1129,8 @@ let
posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { };
+ posix-time2 = callPackage ../development/ocaml-modules/posix/time2.nix { };
+
posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
postgresql = callPackage ../development/ocaml-modules/postgresql {
@@ -1129,6 +1151,10 @@ let
ptime = callPackage ../development/ocaml-modules/ptime { };
+ pulseaudio = callPackage ../development/ocaml-modules/pulseaudio {
+ inherit (pkgs) pulseaudio;
+ };
+
pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { };
resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { };
@@ -1203,6 +1229,10 @@ let
pipebang = callPackage ../development/ocaml-modules/pipebang { };
+ portaudio = callPackage ../development/ocaml-modules/portaudio {
+ inherit (pkgs) portaudio;
+ };
+
pprint = callPackage ../development/ocaml-modules/pprint { };
ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { };
@@ -1291,9 +1321,6 @@ let
rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };
- ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { };
- ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { };
-
resto = callPackage ../development/ocaml-modules/resto { };
resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { };
resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { };
@@ -1322,8 +1349,6 @@ let
sedlex = callPackage ../development/ocaml-modules/sedlex { };
- sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { };
-
semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { };
sha = callPackage ../development/ocaml-modules/sha { };
@@ -1370,12 +1395,20 @@ let
tsdl = callPackage ../development/ocaml-modules/tsdl { };
+ tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { };
+
+ tsdl-mixer = callPackage ../development/ocaml-modules/tsdl-mixer { };
+
+ tsdl-ttf = callPackage ../development/ocaml-modules/tsdl-ttf { };
+
twt = callPackage ../development/ocaml-modules/twt { };
uchar = callPackage ../development/ocaml-modules/uchar { };
uecc = callPackage ../development/ocaml-modules/uecc { };
+ unix-errno = callPackage ../development/ocaml-modules/unix-errno { };
+
utop = callPackage ../development/tools/ocaml/utop { };
uuidm = callPackage ../development/ocaml-modules/uuidm { };
@@ -1457,6 +1490,8 @@ let
yuscii = callPackage ../development/ocaml-modules/yuscii { };
+ yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { };
+
z3 = callPackage ../development/ocaml-modules/z3 {
inherit (pkgs) z3;
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3ccfac4d0cfe..f24b11399206 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6,7 +6,7 @@
be almost as much code as the function itself. */
{ config
-, stdenv, lib, buildPackages, pkgs
+, stdenv, lib, buildPackages, pkgs, darwin
, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, fetchFromGitLab
, perl, overrides, buildPerl, shortenPerlShebang
, nixosTests
@@ -330,7 +330,7 @@ let
installPhase = "./Build install --prefix $out";
- SDL_INST_DIR = pkgs.SDL.dev;
+ SDL_INST_DIR = lib.getDev pkgs.SDL;
buildInputs = [ pkgs.SDL ArchiveExtract ArchiveZip TextPatch ];
propagatedBuildInputs = [ CaptureTiny FileShareDir FileWhich ];
@@ -948,6 +948,19 @@ let
};
};
+ ArrayRefElem = buildPerlPackage {
+ pname = "Array-RefElem";
+ version = "1.00";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id//G/GA/GAAS/Array-RefElem-1.00.tar.gz";
+ sha256 = "sha256-U7iAo67AQ+TjcM4SaCtHVt5F3XQtq1cpT+IaFUU87+M=";
+ };
+ meta = {
+ description = "Set up array elements as aliases";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
AsyncPing = buildPerlPackage {
pname = "AsyncPing";
version = "2016.1207";
@@ -1619,6 +1632,7 @@ let
homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs";
description = "XS implementation of MongoDB's BSON serialization (EOL)";
license = lib.licenses.asl20;
+ platforms = lib.platforms.linux; # configure phase fails with "ld: unknown option: -mmacosx-version-min=10.12"
};
};
@@ -2066,6 +2080,7 @@ let
};
propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ];
buildInputs = [ TestMockObject TestException NetLDAPServerTest ];
+ doCheck = !stdenv.isDarwin; # t/02-realms_api.t and t/50.auth.case.sensitivity.t
meta = {
description= "Authentication from an LDAP Directory";
license = with lib.licenses; [ artistic1 ];
@@ -8034,6 +8049,7 @@ let
url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz";
sha256 = "0ls1y9bb2nff9djli91s86541r7ajcjp22gqhcdmj7hs69w92qpz";
};
+ doCheck = !stdenv.isDarwin;
nativeBuildInputs = [ pkgs.ld-is-cc-hook ];
propagatedBuildInputs = [ CaptureTiny ];
buildInputs = [ ModuleBuild ];
@@ -9439,6 +9455,7 @@ let
postCheck = ''
rm -r $out/lib
'';
+ doCheck = !stdenv.isDarwin;
meta = {
description = "Dynamically create Perl language bindings";
license = lib.licenses.lgpl2Plus;
@@ -9474,6 +9491,7 @@ let
license = lib.licenses.lgpl2Plus;
};
propagatedBuildInputs = [ Gtk2 ];
+ doCheck = !stdenv.isDarwin;
};
Gnome2VFS = buildPerlPackage {
@@ -9811,14 +9829,15 @@ let
};
};
- Gtk3 = buildPerlPackage {
+ Gtk3 = buildPerlPackage rec {
pname = "Gtk3";
- version = "0.037";
+ version = "0.038";
src = fetchurl {
- url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz";
- sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz";
+ url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-${version}.tar.gz";
+ sha256 = "sha256-cNxL8qp0mBx54V/SmNmY4FqS66SBHxrVyfH03jdzesw=";
};
propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ];
+ preCheck = lib.optionalString stdenv.isDarwin "rm t/overrides.t"; # Currently failing on macOS
meta = {
description = "Perl interface to the 3.x series of the GTK toolkit";
license = lib.licenses.lgpl21Plus;
@@ -10523,6 +10542,8 @@ let
};
propagatedBuildInputs = [ HTTPDate ];
buildInputs = [ TestDeep TestRequires URI ];
+ # Broken on Hydra since 2021-06-17: https://hydra.nixos.org/build/146507373
+ doCheck = false;
meta = {
description = "A minimalist HTTP user agent cookie jar";
license = with lib.licenses; [ asl20 ];
@@ -11382,6 +11403,21 @@ let
doCheck = !stdenv.isDarwin; # openpty fails in the sandbox
};
+ IPCConcurrencyLimit = buildPerlPackage {
+ pname = "IPC-ConcurrencyLimit";
+ version = "0.17";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MA/MATTK/IPC-ConcurrencyLimit-0.17.tar.gz";
+ sha256 = "sha256-Lk11vlLpD8YFg31ajp+yacCofdPTYfMBLA/5Sl+9z+8=";
+ };
+ buildInputs = [ ExtUtilsMakeMaker ];
+ propagatedBuildInputs = [ FilePath IO ];
+ meta = {
+ description = "Lock-based limits on cooperative multi-processing";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
IPCountry = buildPerlPackage {
pname = "IP-Country";
version = "2.28";
@@ -11503,6 +11539,8 @@ let
description = "A tool to read, write and edit EXIF meta information";
homepage = "https://exiftool.org/";
+ mainProgram = "exiftool";
+
longDescription = ''
ExifTool is a platform-independent Perl library plus a command-line
application for reading, writing and editing meta information in a wide
@@ -12388,6 +12426,7 @@ let
LocaleGettext = buildPerlPackage {
pname = "gettext";
version = "1.07";
+ strictDeps = true;
buildInputs = [ pkgs.gettext ];
src = fetchurl {
url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz";
@@ -13428,6 +13467,10 @@ let
url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.1/pari-${pariversion}.tgz";
sha256 = "1yjml5z1qdn258qh6329v7vib2gyx6q2np0s5ybci0rhmz6z4hli";
};
+ # Workaround build failure on -fno-common toolchains:
+ # ld: libPARI/libPARI.a(compat.o):(.bss+0x8): multiple definition of
+ # `overflow'; Pari.o:(.bss+0x80): first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz";
makeMakerFlags = "pari_tgz=pari-${pariversion}.tgz";
src = fetchurl {
@@ -21002,6 +21045,57 @@ let
};
};
+ Tcl = buildPerlPackage {
+ pname = "Tcl";
+ version = "1.27";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/V/VK/VKON/Tcl-1.27.tar.gz";
+ sha256 = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI=";
+ };
+ propagatedBuildInputs = [
+ pkgs.bwidget
+ pkgs.tcl
+ pkgs.tix
+ pkgs.tk
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.CoreServices ];
+ makeMakerFlags = lib.optionalString stdenv.isLinux
+ "--tclsh=${pkgs.tcl}/bin/tclsh --nousestubs";
+ meta = {
+ description = "Tcl extension module for perl";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ TclpTk = buildPerlPackage {
+ pname = "Tcl-pTk";
+ version = "1.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.09.tar.gz";
+ sha256 = "sha256-LR+YBlKS9+W7mBBy9/EkAOjxGVVe4MC5zToPr/pXl24=";
+ };
+ propagatedBuildInputs = [
+ ClassISA
+ SubName
+ Tcl
+ TestDeep
+ ];
+ buildPhase = ''
+ perl Makefile.PL --tclsh "${pkgs.tk.tcl}/bin/tclsh" INSTALL_BASE=$out --no-test-for-tk
+ '';
+ postInstall = ''
+ mkdir -p $out/lib/perl5/site_perl
+ mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/
+ mv $out/lib/perl5/auto $out/lib/perl5/site_perl/
+ '' + lib.optionalString stdenv.isDarwin ''
+ mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/
+ '';
+ meta = {
+ description = "Interface to Tcl/Tk with Perl/Tk compatible syntax";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TemplatePluginAutoformat = buildPerlPackage {
pname = "Template-Plugin-Autoformat";
version = "2.77";
@@ -23280,6 +23374,19 @@ let
};
};
+ TextLevenshteinXS = buildPerlPackage {
+ pname = "Text-LevenshteinXS";
+ version = "0.03";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-0.03.tar.gz";
+ sha256 = "sha256-43T/eyN5Gc5eqSRfNW0ctSzIf9JrOlo4s/Pl/4KgFJE=";
+ };
+ meta = {
+ description = "Levenshtein edit distance in a XS way";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TextLorem = buildPerlModule {
pname = "Text-Lorem";
version = "0.3";
@@ -24111,6 +24218,21 @@ let
};
};
+ TkToolBar = buildPerlPackage {
+ pname = "Tk-ToolBar";
+ version = "0.12";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/A/AS/ASB/Tk-ToolBar-0.12.tar.gz";
+ sha256 = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8=";
+ };
+ makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";
+ buildInputs = [ Tk ];
+ doCheck = false; # Expects working X11.
+ meta = {
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TreeDAGNode = buildPerlPackage {
pname = "Tree-DAG_Node";
version = "1.31";
@@ -24541,6 +24663,7 @@ let
meta = {
description = "Cryptographically secure v4 UUIDs for Linux x64";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ platforms = lib.platforms.linux; # configure phase fails with "OS unsupported"
};
};
@@ -25520,6 +25643,20 @@ let
};
};
+ WebServiceValidatorHTMLW3C = buildPerlModule {
+ pname = "WebService-Validator-HTML-W3C";
+ version = "0.28";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/ST/STRUAN/WebService-Validator-HTML-W3C-0.28.tar.gz";
+ sha256 = "sha256-zLB60zegOuyBob6gqJzSlUaR/1uzZ9+aMrnZEw8XURA=";
+ };
+ buildInputs = [ ClassAccessor LWP ];
+ meta = {
+ description = "Provides access to the W3C's online Markup validator";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
} // lib.optionalAttrs config.allowAliases {
autodie = null; # part of Perl
AutoLoader = null; # part of Perl 5.22
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 003f9a516f36..c84d0739d31f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -47,6 +47,7 @@ mapAliases ({
ConfigArgParse = configargparse; # added 2021-03-18
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
+ dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
dateutil = python-dateutil; # added 2021-07-03
demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
@@ -67,6 +68,7 @@ mapAliases ({
dogpile_cache = dogpile-cache; # added 2021-10-28
dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
+ fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
flask_testing = flask-testing; # added 2022-04-25
flask_wtf = flask-wtf; # added 2022-05-24
@@ -99,18 +101,23 @@ mapAliases ({
pathpy = path; # added 2022-04-12
pdfminer = pdfminer-six; # added 2022-05-25
pep257 = pydocstyle; # added 2022-04-12
+ poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
+ pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
+ pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
+ pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
pyreadability = readability-lxml; # added 2022-05-24
pysmart-smartx = pysmart; # added 2021-10-22
+ pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
pytest_6 = pytest; # added 2022-02-10
pytestcov = pytest-cov; # added 2021-01-04
pytest-pep8 = pytestpep8; # added 2021-01-04
@@ -156,7 +163,10 @@ mapAliases ({
tensorflow-tensorboard = tensorboard; # added 2022-03-06
tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
+ types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
+ types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
+ webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
websocket_client = websocket-client; # added 2021-06-15
xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
zc-buildout221 = zc-buildout; # added 2021-07-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2fe618420d6f..2e553cf8addf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -209,6 +209,8 @@ in {
aenum = callPackage ../development/python-modules/aenum { };
+ aeppl = callPackage ../development/python-modules/aeppl { };
+
aesara = callPackage ../development/python-modules/aesara { };
aesedb = callPackage ../development/python-modules/aesedb { };
@@ -401,6 +403,10 @@ in {
aioshelly = callPackage ../development/python-modules/aioshelly { };
+ aioshutil = callPackage ../development/python-modules/aioshutil { };
+
+ aioskybell = callPackage ../development/python-modules/aioskybell { };
+
aiosignal = callPackage ../development/python-modules/aiosignal { };
aioslimproto = callPackage ../development/python-modules/aioslimproto { };
@@ -409,6 +415,8 @@ in {
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
+ aiosmtplib = callPackage ../development/python-modules/aiosmtplib { };
+
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
aiosteamist = callPackage ../development/python-modules/aiosteamist { };
@@ -673,6 +681,8 @@ in {
asn1crypto = callPackage ../development/python-modules/asn1crypto { };
+ asn1tools = callPackage ../development/python-modules/asn1tools { };
+
aspell-python = callPackage ../development/python-modules/aspell-python { };
aspy-refactor-imports = callPackage ../development/python-modules/aspy-refactor-imports { };
@@ -1225,6 +1235,8 @@ in {
bids-validator = callPackage ../development/python-modules/bids-validator { };
+ biliass = callPackage ../development/python-modules/biliass { };
+
billiard = callPackage ../development/python-modules/billiard { };
bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
@@ -1253,6 +1265,8 @@ in {
bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { };
+ bite-parser = callPackage ../development/python-modules/bite-parser { };
+
bitlist = callPackage ../development/python-modules/bitlist { };
bitmath = callPackage ../development/python-modules/bitmath { };
@@ -1319,6 +1333,8 @@ in {
bond-api = callPackage ../development/python-modules/bond-api { };
+ bond-async = callPackage ../development/python-modules/bond-async { };
+
booleanoperations = callPackage ../development/python-modules/booleanoperations { };
boolean-py = callPackage ../development/python-modules/boolean-py { };
@@ -1541,6 +1557,10 @@ in {
censys = callPackage ../development/python-modules/censys { };
+ coincurve = callPackage ../development/python-modules/coincurve {
+ inherit (pkgs) secp256k1;
+ };
+
connect-box = callPackage ../development/python-modules/connect_box { };
connection-pool = callPackage ../development/python-modules/connection-pool { };
@@ -1585,6 +1605,8 @@ in {
cfn-lint = callPackage ../development/python-modules/cfn-lint { };
+ cfscrape = callPackage ../development/python-modules/cfscrape { };
+
cftime = callPackage ../development/python-modules/cftime { };
cgen = callPackage ../development/python-modules/cgen { };
@@ -1757,6 +1779,8 @@ in {
cloudsplaining = callPackage ../development/python-modules/cloudsplaining { };
+ cloup = callPackage ../development/python-modules/cloup { };
+
clustershell = callPackage ../development/python-modules/clustershell { };
clvm = callPackage ../development/python-modules/clvm { };
@@ -2071,8 +2095,6 @@ in {
dask-mpi = callPackage ../development/python-modules/dask-mpi { };
- dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
-
dask-yarn = callPackage ../development/python-modules/dask-yarn { };
databases = callPackage ../development/python-modules/databases { };
@@ -2085,6 +2107,8 @@ in {
dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
+ dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };
+
datadiff = callPackage ../development/python-modules/datadiff { };
datadog = callPackage ../development/python-modules/datadog { };
@@ -2135,6 +2159,10 @@ in {
ddt = callPackage ../development/python-modules/ddt { };
+ deal = callPackage ../development/python-modules/deal { };
+
+ deal-solver = callPackage ../development/python-modules/deal-solver { };
+
deap = callPackage ../development/python-modules/deap { };
debian = callPackage ../development/python-modules/debian { };
@@ -2348,6 +2376,8 @@ in {
django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
+ django-model-utils = callPackage ../development/python-modules/django-model-utils { };
+
django-modelcluster = callPackage ../development/python-modules/django_modelcluster { };
django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
@@ -2360,6 +2390,8 @@ in {
django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { };
+ django-otp = callPackage ../development/python-modules/django-otp { };
+
django-paintstore = callPackage ../development/python-modules/django-paintstore { };
django-pglocks = callPackage ../development/python-modules/django-pglocks { };
@@ -2394,6 +2426,8 @@ in {
djangorestframework-camel-case = callPackage ../development/python-modules/djangorestframework-camel-case { };
+ djangorestframework-guardian = callPackage ../development/python-modules/djangorestframework-guardian { };
+
djangorestframework-recursive = callPackage ../development/python-modules/djangorestframework-recursive { };
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
@@ -2474,6 +2508,8 @@ in {
doc8 = callPackage ../development/python-modules/doc8 { };
+ docformatter = callPackage ../development/python-modules/docformatter { };
+
docker = callPackage ../development/python-modules/docker { };
dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { };
@@ -2538,6 +2574,8 @@ in {
dpath = callPackage ../development/python-modules/dpath { };
+ dpcontracts = callPackage ../development/python-modules/dpcontracts { };
+
dpkt = callPackage ../development/python-modules/dpkt { };
dragonfly = callPackage ../development/python-modules/dragonfly { };
@@ -2548,6 +2586,8 @@ in {
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
+ drf-spectacular = callPackage ../development/python-modules/drf-spectacular { };
+
drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { };
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
@@ -2594,6 +2634,10 @@ in {
durus = callPackage ../development/python-modules/durus { };
+ dvclive = callPackage ../development/python-modules/dvclive { };
+
+ dvc-render = callPackage ../development/python-modules/dvc-render { };
+
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
dyn = callPackage ../development/python-modules/dyn { };
@@ -2775,8 +2819,18 @@ in {
etesync = callPackage ../development/python-modules/etesync { };
+ eth-abi = callPackage ../development/python-modules/eth-abi { };
+
+ eth-account = callPackage ../development/python-modules/eth-account { };
+
eth-hash = callPackage ../development/python-modules/eth-hash { };
+ eth-keyfile = callPackage ../development/python-modules/eth-keyfile { };
+
+ eth-keys = callPackage ../development/python-modules/eth-keys { };
+
+ eth-rlp = callPackage ../development/python-modules/eth-rlp { };
+
eth-typing = callPackage ../development/python-modules/eth-typing { };
eth-utils = callPackage ../development/python-modules/eth-utils { };
@@ -2821,6 +2875,8 @@ in {
expects = callPackage ../development/python-modules/expects { };
+ expecttest = callPackage ../development/python-modules/expecttest { };
+
expiringdict = callPackage ../development/python-modules/expiringdict { };
explorerscript = callPackage ../development/python-modules/explorerscript { };
@@ -2851,6 +2907,8 @@ in {
ezdxf = callPackage ../development/python-modules/ezdxf { };
+ f90nml = callPackage ../development/python-modules/f90nml { };
+
Fabric = callPackage ../development/python-modules/Fabric { };
faadelays = callPackage ../development/python-modules/faadelays { };
@@ -2869,8 +2927,6 @@ in {
factory_boy = callPackage ../development/python-modules/factory_boy { };
- fake_factory = callPackage ../development/python-modules/fake_factory { };
-
fake-useragent = callPackage ../development/python-modules/fake-useragent { };
faker = callPackage ../development/python-modules/faker { };
@@ -2885,6 +2941,8 @@ in {
fastapi = callPackage ../development/python-modules/fastapi { };
+ fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
+
fastavro = callPackage ../development/python-modules/fastavro { };
fastbencode = callPackage ../development/python-modules/fastbencode { };
@@ -3266,6 +3324,8 @@ in {
functools32 = callPackage ../development/python-modules/functools32 { };
+ functorch = callPackage ../development/python-modules/functorch { };
+
funcy = callPackage ../development/python-modules/funcy { };
furl = callPackage ../development/python-modules/furl { };
@@ -3879,6 +3939,8 @@ in {
heudiconv = callPackage ../development/python-modules/heudiconv { };
+ hexbytes = callPackage ../development/python-modules/hexbytes { };
+
hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { };
hg-evolve = callPackage ../development/python-modules/hg-evolve { };
@@ -4021,6 +4083,8 @@ in {
hupper = callPackage ../development/python-modules/hupper { };
+ huum = callPackage ../development/python-modules/huum { };
+
hvac = callPackage ../development/python-modules/hvac { };
hvplot = callPackage ../development/python-modules/hvplot { };
@@ -4091,6 +4155,8 @@ in {
idasen = callPackage ../development/python-modules/idasen { };
+ icontract = callPackage ../development/python-modules/icontract { };
+
identify = callPackage ../development/python-modules/identify { };
idna = callPackage ../development/python-modules/idna { };
@@ -4311,6 +4377,8 @@ in {
isort = callPackage ../development/python-modules/isort { };
+ isosurfaces = callPackage ../development/python-modules/isosurfaces { };
+
isounidecode = callPackage ../development/python-modules/isounidecode { };
isoweek = callPackage ../development/python-modules/isoweek { };
@@ -4707,6 +4775,8 @@ in {
launchpadlib = callPackage ../development/python-modules/launchpadlib { };
+ laundrify-aio = callPackage ../development/python-modules/laundrify-aio { };
+
lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
@@ -4741,6 +4811,7 @@ in {
ledger = (toPythonModule (pkgs.ledger.override {
usePython = true;
+ boost = pkgs.boost179; # Current default boost (1.77) doesn’t work with Python 3.10.
python3 = python;
})).py;
@@ -5131,6 +5202,8 @@ in {
mapbox = callPackage ../development/python-modules/mapbox { };
+ mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { };
+
mariadb = callPackage ../development/python-modules/mariadb { };
marisa-trie = callPackage ../development/python-modules/marisa-trie { };
@@ -5278,6 +5351,8 @@ in {
mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
+ messagebird = callPackage ../development/python-modules/messagebird { };
+
metakernel = callPackage ../development/python-modules/metakernel { };
metar = callPackage ../development/python-modules/metar { };
@@ -5306,7 +5381,9 @@ in {
minexr = callPackage ../development/python-modules/minexr { };
- miniaudio = callPackage ../development/python-modules/miniaudio { };
+ miniaudio = callPackage ../development/python-modules/miniaudio {
+ inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
+ };
minidb = callPackage ../development/python-modules/minidb { };
@@ -5424,6 +5501,8 @@ in {
more-itertools = callPackage ../development/python-modules/more-itertools { };
+ more-properties = callPackage ../development/python-modules/more-properties { };
+
moretools = callPackage ../development/python-modules/moretools { };
morphys = callPackage ../development/python-modules/morphys { };
@@ -5860,6 +5939,8 @@ in {
numcodecs = callPackage ../development/python-modules/numcodecs { };
+ numdifftools = callPackage ../development/python-modules/numdifftools { };
+
numericalunits = callPackage ../development/python-modules/numericalunits { };
numexpr = callPackage ../development/python-modules/numexpr { };
@@ -5884,6 +5965,10 @@ in {
py-deprecate = callPackage ../development/python-modules/py-deprecate { };
+ py-ecc = callPackage ../development/python-modules/py-ecc { };
+
+ py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { };
+
nwdiag = callPackage ../development/python-modules/nwdiag { };
oasatelematics = callPackage ../development/python-modules/oasatelematics { };
@@ -6344,6 +6429,8 @@ in {
micloud = callPackage ../development/python-modules/micloud { };
+ msgraph-core = callPackage ../development/python-modules/msgraph-core { };
+
netmap = callPackage ../development/python-modules/netmap { };
openai = callPackage ../development/python-modules/openai { };
@@ -6513,6 +6600,8 @@ in {
pysbd = callPackage ../development/python-modules/pysbd { };
+ pyschemes = callPackage ../development/python-modules/pyschemes { };
+
pyshark = callPackage ../development/python-modules/pyshark { };
pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };
@@ -6688,8 +6777,6 @@ in {
posix_ipc = callPackage ../development/python-modules/posix_ipc { };
- poster3 = callPackage ../development/python-modules/poster3 { };
-
pot = callPackage ../development/python-modules/pot { };
potentials = callPackage ../development/python-modules/potentials { };
@@ -6795,7 +6882,9 @@ in {
protonup = callPackage ../development/python-modules/protonup { };
- protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { };
+ protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
+ pkgs-systemd = pkgs.systemd;
+ };
prov = callPackage ../development/python-modules/prov { };
@@ -7147,8 +7236,6 @@ in {
inherit (pkgs) graphviz;
};
- pydrive = callPackage ../development/python-modules/pydrive { };
-
pydrive2 = callPackage ../development/python-modules/pydrive2 { };
pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
@@ -7361,6 +7448,8 @@ in {
pyialarm = callPackage ../development/python-modules/pyialarm { };
+ pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { };
+
pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { };
@@ -7421,6 +7510,8 @@ in {
pykwalify = callPackage ../development/python-modules/pykwalify { };
+ pykwb = callPackage ../development/python-modules/pykwb { };
+
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
pylama = callPackage ../development/python-modules/pylama { };
@@ -7499,6 +7590,8 @@ in {
pymaging_png = callPackage ../development/python-modules/pymaging_png { };
+ pymailgunner = callPackage ../development/python-modules/pymailgunner { };
+
pymanopt = callPackage ../development/python-modules/pymanopt { };
pymarshal = callPackage ../development/python-modules/pymarshal { };
@@ -7517,7 +7610,7 @@ in {
pymbolic = callPackage ../development/python-modules/pymbolic { };
- pymc3 = callPackage ../development/python-modules/pymc3 { };
+ pymc = callPackage ../development/python-modules/pymc { };
pymdstat = callPackage ../development/python-modules/pymdstat { };
@@ -7991,6 +8084,8 @@ in {
pysmartapp = callPackage ../development/python-modules/pysmartapp { };
+ pySmartDL = callPackage ../development/python-modules/pySmartDL { };
+
pysmartthings = callPackage ../development/python-modules/pysmartthings { };
pysmb = callPackage ../development/python-modules/pysmb { };
@@ -8045,8 +8140,6 @@ in {
pyspnego = callPackage ../development/python-modules/pyspnego { };
- pyspotify = callPackage ../development/python-modules/pyspotify { };
-
pysptk = callPackage ../development/python-modules/pysptk { };
pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 {
@@ -8287,6 +8380,8 @@ in {
pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
+ pytest-test-utils = callPackage ../development/python-modules/pytest-test-utils { };
+
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
@@ -8401,6 +8496,8 @@ in {
python-hglib = callPackage ../development/python-modules/python-hglib { };
+ python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { };
+
python-hosts = callPackage ../development/python-modules/python-hosts { };
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
@@ -8704,6 +8801,8 @@ in {
pyunifi = callPackage ../development/python-modules/pyunifi { };
+ pyunifiprotect = callPackage ../development/python-modules/pyunifiprotect { };
+
pyupdate = callPackage ../development/python-modules/pyupdate { };
pyupgrade = callPackage ../development/python-modules/pyupgrade { };
@@ -8792,6 +8891,8 @@ in {
pywlroots = callPackage ../development/python-modules/pywlroots { };
+ pyws66i = callPackage ../development/python-modules/pyws66i { };
+
pyxattr = callPackage ../development/python-modules/pyxattr { };
pyworld = callPackage ../development/python-modules/pyworld { };
@@ -9460,7 +9561,7 @@ in {
serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
- service-identity = callPackage ../development/python-modules/service_identity { };
+ service-identity = callPackage ../development/python-modules/service-identity { };
setproctitle = callPackage ../development/python-modules/setproctitle { };
@@ -9926,6 +10027,8 @@ in {
srsly = callPackage ../development/python-modules/srsly { };
+ srt = callPackage ../development/python-modules/srt { };
+
srvlookup = callPackage ../development/python-modules/srvlookup { };
ssdeep = callPackage ../development/python-modules/ssdeep {
@@ -10597,8 +10700,6 @@ in {
typer = callPackage ../development/python-modules/typer { };
- types-cryptography = callPackage ../development/python-modules/types-cryptography { };
-
types-dateutil = callPackage ../development/python-modules/types-dateutil { };
types-decorator = callPackage ../development/python-modules/types-decorator { };
@@ -10613,8 +10714,6 @@ in {
types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
- types-paramiko = callPackage ../development/python-modules/types-paramiko { };
-
types-protobuf = callPackage ../development/python-modules/types-protobuf { };
types-pytz = callPackage ../development/python-modules/types-pytz { };
@@ -10721,6 +10820,8 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
+ unifi-discovery = callPackage ../development/python-modules/unifi-discovery { };
+
unify = callPackage ../development/python-modules/unify { };
unifiled = callPackage ../development/python-modules/unifiled { };
@@ -10817,6 +10918,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};
+ vaa = callPackage ../development/python-modules/vaa { };
+
validate-email = callPackage ../development/python-modules/validate-email { };
validators = callPackage ../development/python-modules/validators { };
@@ -11007,10 +11110,10 @@ in {
webargs = callPackage ../development/python-modules/webargs { };
- webapp2 = callPackage ../development/python-modules/webapp2 { };
-
webassets = callPackage ../development/python-modules/webassets { };
+ webauthn = callPackage ../development/python-modules/webauthn { };
+
web = callPackage ../development/python-modules/web { };
web-cache = callPackage ../development/python-modules/web-cache { };
@@ -11233,6 +11336,8 @@ in {
xpybutil = callPackage ../development/python-modules/xpybutil { };
+ xsdata = callPackage ../development/python-modules/xsdata { };
+
xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { };
xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { };
@@ -11307,6 +11412,8 @@ in {
yoda = toPythonModule (pkgs.yoda.override { inherit python; });
+ yolink-api = callPackage ../development/python-modules/yolink-api { };
+
youless-api = callPackage ../development/python-modules/youless-api { };
youtube-dl = callPackage ../tools/misc/youtube-dl { };
@@ -11343,6 +11450,8 @@ in {
yubico-client = callPackage ../development/python-modules/yubico-client { };
+ yutto = callPackage ../tools/misc/yutto { };
+
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
z3 = (toPythonModule (pkgs.z3.override {
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 270766f36511..d4c155d714ff 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -197,6 +197,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
qtfeedback = callPackage ../development/libraries/qtfeedback { };
+ qtforkawesome = callPackage ../development/libraries/qtforkawesome { };
+
qtutilities = callPackage ../development/libraries/qtutilities { };
qtinstaller = callPackage ../development/libraries/qtinstaller { };
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 9ef47c873ba5..4d66d838dd2b 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -17,4 +17,7 @@ let
in
(qt6 // {
+ # LIBRARIES
+
+ quazip = callPackage ../development/libraries/quazip { };
})))
diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix
index 5e309a0129c3..788f052eda52 100644
--- a/pkgs/top-level/release-alternatives.nix
+++ b/pkgs/top-level/release-alternatives.nix
@@ -9,7 +9,7 @@ let
blasUsers = [
# "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull"
"fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus"
- "sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4"
+ "superlu" "suitesparse_5_3" "suitesparse_4_4"
"suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra"
"arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo"
"xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta"
@@ -33,10 +33,10 @@ let
["haskellPackages" "bindings-levmar"]
] ++ lib.optionals allowUnfree [ "magma" ];
blas64Users = [
- "rspamd" "suitesparse_5_3" "suitesparse_4_4"
+ "rspamd" "sundials" "suitesparse_5_3" "suitesparse_4_4"
"suitesparse_4_2" "petsc" "cholmod-extra"
"arpack" "qrupdate" "iml" "globalarrays" "arrayfire"
- "xfitter" "lammps" "plink-ng" "quantum-espresso"
+ "lammps" "plink-ng" "quantum-espresso"
"calculix" "csdp" "getdp" "jags"
"lammps" "lammps-mpi"
# ["ocamlPackages" "lacaml"]
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 63a4a335dc9b..ba4f998296e2 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -153,7 +153,6 @@ in
/* Linux on armv7l-hf */
armv7l-hf = mapTestOnCross lib.systems.examples.armv7l-hf-multiplatform linuxCommon;
- scaleway-c1 = mapTestOnCross lib.systems.examples.scaleway-c1 linuxCommon;
pogoplug4 = mapTestOnCross lib.systems.examples.pogoplug4 linuxCommon;
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 789d83c4be07..0777b448d5b4 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -52,7 +52,7 @@ let
ghc884
ghc8107
ghc902
- ghc922
+ ghc923
];
# packagePlatforms applied to `haskell.packages.*`
@@ -329,8 +329,8 @@ let
;
};
- haskell.packages.native-bignum.ghc922 = {
- inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922)
+ haskell.packages.native-bignum.ghc923 = {
+ inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923)
hello
lens
random
@@ -376,6 +376,20 @@ let
spectacle = [
compilerNames.ghc8107
];
+ weeder = [
+ compilerNames.ghc8107
+ compilerNames.ghc902
+ compilerNames.ghc923
+ ];
+ purescript = [
+ compilerNames.ghc8107
+ ];
+ purescript-cst = [
+ compilerNames.ghc8107
+ ];
+ purescript-ast = [
+ compilerNames.ghc8107
+ ];
})
{
mergeable = pkgs.releaseTools.aggregate {
@@ -442,11 +456,11 @@ let
jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc902
- jobs.pkgsMusl.haskell.compiler.ghc922
+ jobs.pkgsMusl.haskell.compiler.ghc923
jobs.pkgsMusl.haskell.compiler.ghcHEAD
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902
- jobs.pkgsMusl.haskell.compiler.native-bignum.ghc922
+ jobs.pkgsMusl.haskell.compiler.native-bignum.ghc923
jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD
];
};
@@ -462,7 +476,7 @@ let
};
constituents = accumulateDerivations [
jobs.pkgsStatic.haskellPackages
- jobs.pkgsStatic.haskell.packages.native-bignum.ghc922
+ jobs.pkgsStatic.haskell.packages.native-bignum.ghc923
];
};
}
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0c759095f56d..bac3d1b1171d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -57,7 +57,6 @@ let
jobs.openssl.x86_64-darwin
jobs.pandoc.x86_64-darwin
jobs.postgresql.x86_64-darwin
- jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin
jobs.ruby.x86_64-darwin
jobs.rustc.x86_64-darwin
@@ -102,7 +101,6 @@ let
jobs.go.x86_64-linux
jobs.linux.x86_64-linux
jobs.pandoc.x86_64-linux
- jobs.python2.x86_64-linux
jobs.python3.x86_64-linux
# Needed by contributors to test PRs (by inclusion of the PR template)
jobs.nixpkgs-review.x86_64-linux
@@ -110,7 +108,7 @@ let
jobs.nix-info.x86_64-linux
jobs.nix-info-tested.x86_64-linux
# Ensure that X11/GTK are in order.
- jobs.thunderbird-unwrapped.x86_64-linux
+ jobs.firefox-unwrapped.x86_64-linux
jobs.cachix.x86_64-linux
/*
@@ -138,7 +136,6 @@ let
jobs.cargo.x86_64-darwin
jobs.cachix.x86_64-darwin
jobs.go.x86_64-darwin
- jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin
jobs.nixpkgs-review.x86_64-darwin
jobs.nix-info.x86_64-darwin