diff options
Diffstat (limited to 'pkgs/tools')
31 files changed, 248 insertions, 109 deletions
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 529871683f6..6cb52ccd135 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.51.1"; + version = "1.51.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NU4xJTW0KCi8PZAY4cRJijGHCZEn5Z41xNF7+iH01oo="; + sha256 = "sha256-Nx9lASZOEetkADVEs2JxPRi9SCrb4SLnEpLpzcpp/Is="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index d4d5ee7348b..43d9a628787 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.41.1"; + version = "0.41.4"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6ltEC9LCuE4Rj4TlBwsDI45L92XMuCbEuMDkOk8OkZo="; + sha256 = "sha256-QRT5wvud9VMtXQ8QPC7joIMq7kYYlfVUSgzqMFW5LIE="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-13PcAQlHPaQ1n7OiRSEW5H3rDXgUAmKAQGqQM31iyR8="; + vendorSha256 = "sha256-9/Mtjqny68HN4FItT2+yoknzdHBAS1aQL0VkTdm6624="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 3c16fb1e0ed..d2a9bd2563e 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -1,20 +1,20 @@ { lib -, stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , dotnetCorePackages +, testVersion +, discordchatexporter-cli }: buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.32"; + version = "2.33.2"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo="; + sha256 = "wOSa6O3O4QlGL5ecnR14ldXPYV5mDoPDlJjcwN5Lrek="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -23,15 +23,24 @@ buildDotnetModule rec { projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; nugetDeps = ./deps.nix; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + postFixup = '' + ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli + ''; + + passthru = { + updateScript = ./updater.sh; + tests.version = testVersion { + package = discordchatexporter-cli; + version = "v${version}"; + }; + }; meta = with lib; { description = "A tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; + changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a360d0099fd..92bf39b58ef 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; }) - (fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) + (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; }) + (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 9e0752b5482..aa049682b83 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-01-12"; + version = "unstable-2022-03-09"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; - sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; + rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5"; + sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554"; }; postPatch = '' @@ -60,11 +60,13 @@ stdenv.mkDerivation { smoke-test = nixosTests.bcachefs; }; + enableParallelBuilding = true; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak chiiruno ]; + maintainers = with maintainers; [ davidak Madouura ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 72a869b08e6..c51cc12da36 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto , zstd -, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib +, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.setuptools ]; - buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ systemd ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 1dc47e4287a..4a0ef0e9a73 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.2.0-dev-20220120"; + version = "3.1.0-dev-20220314"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-0f17CAANxomtx1fvhj+mI6k4IqwIimmcTSTXZGbbWDY="; + sha256 = "sha256-j/ozkIoRM+G7fi0qBG8UGKPtrn6DR6KNK0Hc53dxsMw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 50b9dba51d3..0f4dde0a416 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , substituteAll , fetchurl +, fetchpatch , fetchFromGitHub , autoreconfHook , gettext @@ -9,12 +10,14 @@ , vala , wrapGAppsHook , dbus +, systemd , dconf ? null , glib , gdk-pixbuf , gobject-introspection , gtk2 , gtk3 +, gtk4 , gtk-doc , runCommand , isocodes @@ -60,16 +63,22 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.24"; + version = "1.5.26"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-1qx06MlEUjSS067FdQG1Bdi4ZAh3hPcNjUX5PIiC3Sk="; + sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc="; }; patches = [ + # Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388 + (fetchpatch { + url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch"; + sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI="; + }) + (substituteAll { src = ./fix-paths.patch; pythonInterpreter = python3Runtime.interpreter; @@ -94,6 +103,7 @@ stdenv.mkDerivation rec { (enableFeature enablePython2Library "python-library") (enableFeature enablePython2Library "python2") # XXX: python2 library does not work anyway (enableFeature enableUI "ui") + "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations" @@ -123,12 +133,14 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + systemd dconf gdk-pixbuf gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 + gtk4 isocodes json-glib libnotify diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch index 60269c6c241..340ec22130f 100644 --- a/pkgs/tools/inputmethods/ibus/fix-paths.patch +++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/configure.ac b/configure.ac +index a3cdb2da..cade9466 100644 --- a/configure.ac +++ b/configure.ac -@@ -429,11 +429,11 @@ +@@ -469,11 +469,11 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], if test "x$enable_pygobject" = "xyes"; then PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) @@ -14,7 +16,7 @@ AC_SUBST(py2overridesdir) fi fi -@@ -462,7 +462,7 @@ +@@ -502,7 +502,7 @@ if test x"$enable_python_library" = x"yes"; then PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION" python2dir="$PYTHON2_LIBDIR/site-packages" @@ -23,9 +25,11 @@ AC_SUBST(pkgpython2dir) else enable_python_library="no (disabled, use --enable-python-library to enable)" +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..6d5e726f 100644 --- a/data/dconf/Makefile.am +++ b/data/dconf/Makefile.am -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ man_5dir = $(mandir)/man5 install-data-hook: if test -z "$(DESTDIR)"; then \ @@ -34,12 +38,14 @@ fi EXTRA_DIST = \ +diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in +index 474ce8a8..ee30808e 100644 --- a/setup/ibus-setup.in +++ b/setup/ibus-setup.in -@@ -27,5 +27,5 @@ +@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@ export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ export IBUS_LIBEXECDIR=${libexecdir} --exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@ -+exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py $@ +-exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@" ++exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py "$@" diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 36e82903a7e..783af7fda71 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -53,6 +53,7 @@ let pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; cbfstool = generic { pname = "cbfstool"; @@ -77,6 +78,7 @@ let pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; amdfwtool = generic { pname = "amdfwtool"; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ec3f480ebf1..492e8a83a2f 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MnsIm8E6CR5tEB6Oq35fJKQiPJfqP86/hp0t6lqJ0JE="; + sha256 = "sha256-ZNE+DfQdIlxA6sXMI8DAIQ3x+kcgXoGApUuoPncRfpc="; }; vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM="; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ce3a5acd4c9..3a7338221ba 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,38 +1,49 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, finger_bsd -, abook ? null -, gnupg ? null -, goobook ? null -, khard ? null -, mu ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, bsd-finger +, withAbook ? true, abook +, withGnupg ? true, gnupg +, withGoobook ? true, goobook +, withKhard ? true, khard +, withMu ? true, mu }: let - perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); + perl' = perl.withPackages (p: with p; [ + AuthenSASL + ConvertASN1 + perlldap + ]); in stdenv.mkDerivation rec { pname = "lbdb"; version = "0.48.1"; + src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook perl' ] - ++ lib.optional (!stdenv.isDarwin) finger_bsd - ++ lib.optional (abook != null) abook - ++ lib.optional (gnupg != null) gnupg - ++ lib.optional (goobook != null) goobook - ++ lib.optional (khard != null) khard - ++ lib.optional (mu != null) mu; + buildInputs = [ perl' ] + ++ lib.optional (!stdenv.isDarwin) bsd-finger + ++ lib.optional withAbook abook + ++ lib.optional withGnupg gnupg + ++ lib.optional withGoobook goobook + ++ lib.optional withKhard khard + ++ lib.optional withMu mu; configureFlags = [ ] - ++ lib.optional (abook != null) "--with-abook" - ++ lib.optional (gnupg != null) "--with-gpg" - ++ lib.optional (goobook != null) "--with-goobook" - ++ lib.optional (khard != null) "--with-khard" - ++ lib.optional (mu != null) "--with-mu"; + ++ lib.optional withAbook "--with-abook" + ++ lib.optional withGnupg "--with-gpg" + ++ lib.optional withGoobook "--with-goobook" + ++ lib.optional withKhard "--with-khard" + ++ lib.optional withMu "--with-mu"; - patches = [ ./add-methods-to-rc.patch + patches = [ + ./add-methods-to-rc.patch # fix undefined exec_prefix. Remove with the next release (fetchpatch { url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; @@ -43,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.spinnaker.de/lbdb/"; + description = "The Little Brother's Database"; license = licenses.gpl2; + maintainers = with maintainers; [ kaiha bfortz ]; platforms = platforms.all; - description = "The Little Brother's Database"; - maintainers = [ maintainers.kaiha maintainers.bfortz ]; }; } diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix new file mode 100644 index 00000000000..b880c66f971 --- /dev/null +++ b/pkgs/tools/misc/license-generator/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "license-generator"; + version = "0.8.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; + }; + + cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 6afaf0fbb34..8b6c52446aa 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: +{ lib, stdenv, fetchFromGitHub, maven, jdk17_headless }: let - version = "1.2021.12"; + version = "1.2022.2"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "sha256:016mrs4djbaid1ma5922dvq372pphbzzmjzsjalj2dqp60538xll"; + sha256 = "sha256-55IBhulFo42jscBFrHM39qA0GRgKBoYNye4q9QkmjsM="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central deps = stdenv.mkDerivation { name = "plantuml-server-${version}-deps"; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild @@ -25,10 +25,12 @@ let runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + installPhase = '' + find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256:12w1iw9c5j7y9hhaip07j3aszjiiakkww1v3zszlj15fj8jgqyf2"; + outputHash = "sha256-AheCBX5jFzDHqTI2pCWBIiDESEKMClXlvWIcFvu0goA="; }; in @@ -37,16 +39,20 @@ stdenv.mkDerivation rec { inherit version; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild + # maven can output reproducible files after setting project.build.outputTimestamp property + # see https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build # 'maven.repo.local' must be writable so copy it out of nix store cp -R $src repo chmod +w -R repo cd repo - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + mvn package --offline \ + -Dproject.build.outputTimestamp=0 \ + -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 runHook postBuild ''; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 554822ba8de..cfdb2b79c6d 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; + sha256 = "sha256-+QtZmrPE3R98UVSwrC8xoehNKwd0Exg+AZ2BJxBIrfY="; }; - vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; + vendorSha256 = "sha256-rRp8pR2cpW88o0KPwuvgSkE263S5oGK/4df4CQSOlRo="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 4673ab41654..6b15488f5c6 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -70,13 +70,13 @@ buildPythonPackage rec { homepage = "https://ytdl-org.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' - youtube-dl is a small, Python-based command-line program - to download videos from YouTube.com and a few more sites. - youtube-dl is released to the public domain, which means - you can modify it, redistribute it or use it however you like. + youtube-dl is a small, Python-based command-line program to download + videos from YouTube.com and a few more sites. youtube-dl is released to + the public domain, which means you can modify it, redistribute it or use + it however you like. ''; license = licenses.publicDomain; + maintainers = with maintainers; [ bluescreen303 fpletz ma27 ]; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 AndersonTorres fpletz ma27 ]; }; } diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index a83a02bd097..12e429b7bcb 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,26 +1,47 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-finger'. +{ lib +, stdenv +, fetchurl +, buildClient ? true +}: stdenv.mkDerivation rec { - pname = "bsd-finger"; + srcName = "bsd-finger"; + pname = srcName + lib.optionalString (!buildClient) "d"; version = "0.17"; src = fetchurl { - url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + url = "mirror://ibiblioPubLinux/system/network/finger/${srcName}-${version}.tar.gz"; + hash = "sha256-hIhdZo0RfvUOAccDSkXYND10fOxiEuQOjQgVG8GOE/o="; }; + # outputs = [ "out" "man" ]; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [ ./ubuntu-0.17-9.patch ]; + patches = [ + ./ubuntu-0.17-9.patch + ]; - preBuild = "cd finger"; + preBuild = let + srcdir = if buildClient then "finger" else "fingerd"; + in '' + cd ${srcdir} + ''; - preInstall = "mkdir -p $out/man/man1 $out/bin "; + preInstall = let + bindir = if buildClient then "bin" else "sbin"; + mandir = if buildClient then "man/man1" else "man/man8"; + in '' + mkdir -p $out/${bindir} $out/${mandir} + ''; meta = with lib; { + description = + if buildClient + then "User information lookup program" + else "Remote user information server"; platforms = platforms.linux; license = licenses.bsdOriginal; }; } +# TODO: multiple outputs (manpage) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 06ef6675ceb..2f757edbdb1 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cmst"; - version = "2022.01.05"; + version = "2022.03.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "0d05vrsjm30q22wpxicnxhjzrjq5kxjhpb6262m46sgkr8yipfhr"; + sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index f32a4249c00..9ec491f1c57 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.10.1"; + version = "3.11"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "0nkisr2215w68ivadg3sx3q50iwamznwigs63lclb8jlrih9gg03"; + sha256 = "0pvy1cj92phpbldw0bdc0ds70n8irqcyn1ybyis0a6nnz84v936y"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index eb73a33e01f..c90ba9cfc64 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-03-09T02-08-36Z"; + version = "2022-03-13T22-34-00Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-OaV0Xb3nNeZJLayGperQah0JQ7BlGFPWa1//Kt5+EiU="; + sha256 = "sha256-NIhowfkG2bFIcCNXUQ3cETHsR5/NLvIHQ9LeftgSyd0="; }; vendorSha256 = "sha256-Wdw9mZ3UupoJ4yDwS4f3mOmCn+7TvHmx4aRu+96pHM4="; diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index ddbba0650f4..150a1fa899f 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "sha256-vem9aXyRIV/2O3sfZ5zpcxs9GSc+uqUgFedyY1O4hWw="; + sha256 = "sha256-oXtFkjCnbfjV15XWkmmJmhG82GyaY4FAcF5NrGnxHm0="; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 423363b56c2..e0fdbdff0b3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; + sha256 = "sha256-29L7XkcUnUdS0Oqg2saMxJzyDUbfT44yb/yPGLKvTqU="; }; patches = [ diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 17c9f690d0a..a61aff2107d 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-KrUb71/wEQnAD2VVkufw12kXrz35sU5fNciSJsMyGrc="; + sha256 = "sha256-cKzGg3fAXKqnBZES3YUMbv1ZAcLqo6AdrXKXSFSAnis="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-JewI+23eNrMHfSUwsA3CaeTvG61/ZOFFLpm7rKZKsoU="; + cargoSha256 = "sha256-OLrxqbTIhHMNPEnSAUbTqoYnaZi/BxbWUCxaTo9Zyww="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index d15cbe8a9cc..a1f783a7fe4 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.10.2"; + version = "0.11.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-U6qElZkray4kjScv9X4I5m2z1ZWQzqcPYAuPzpyRpW0="; + sha256 = "sha256-43PqIM61MXY35BSprRNPTMyVUEVD15sq4+6PHS/P2o0="; }; - cargoSha256 = "sha256-0J02Uz184zx5xZYhqUmyaAFCQ0aogwy0fQTXbteBdV8="; + cargoSha256 = "sha256-ue93L8pyjKR+bxNdltQcsHSPJ3Iz+4gpeskIhhR2/wI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 35541fa36ac..05a9e45c956 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnixos"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0zcghb9nm911bfwpzcgj4ga2cndxbzp5pmrxff711qydrwgy7sg7"; + sha256 = "0nm7g184xh6xzjz4a40a7kgfnpmq043x6v0cynpffa6wd9jv89s9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 678f0a9be8b..f07aade89ca 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, netcat # Optional packages -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, systemd ? null, ejabberd ? null, mariadb ? null, postgresql ? null, subversion ? null , mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , nginx ? null, s6-rc ? null, xinetd ? null @@ -26,7 +26,7 @@ , getopt }: -assert enableMySQLDatabase -> mysql != null; +assert enableMySQLDatabase -> mariadb != null; assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { buildInputs = [ getopt netcat ] ++ lib.optional stdenv.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd - ++ lib.optional enableMySQLDatabase mysql.out + ++ lib.optional enableMySQLDatabase mariadb.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index 5fb88ca9921..c2196cea686 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-+vipQl/HWoYnOPkQLjeIedpnnqPVYaUWhks9eCgMOxQ="; + sha256 = "sha256-kPDNTwsfI+8nOgsLv2aONrLGSRZhw5YzNntJ2tbE0oI="; }; - cargoSha256 = "sha256-xWEQvCyd8auE0q9rBt9iDgU8Dscf4pq/gsAINH2eQY4="; + cargoSha256 = "sha256-fTdTgbeOQXEpLHq9tHiPLkttvaxS/WJ86h3jRdrfbJM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index d93f0135c20..2042ec30fff 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs="; + sha256 = "sha256-ih154MtLWBUdo7+ugu6tg5O/XSjlgFC00wgWC71VeaE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix new file mode 100644 index 00000000000..3bf4e788912 --- /dev/null +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sigma-cli"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Nfd78Y35naDTzwodcdvJr/02CptcHxS717VGsR/QOuI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + prettytable + pysigma + pysigma-backend-splunk + pysigma-pipeline-crowdstrike + pysigma-pipeline-sysmon + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' + ''; + + pythonImportsCheck = [ + "sigma.cli" + ]; + + meta = with lib; { + description = "Sigma command line interface"; + homepage = "https://github.com/SigmaHQ/sigma-cli"; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 9280da44311..1a2530d0a06 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 729a0900f85..14c95bd2f3b 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; + sha256 = "sha256-VV4nCR+BGly+EdCkyI4KeS0Zmn6NkfRsMs//0Sj3E20="; }; - cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; + cargoSha256 = "sha256-MyCi5PuUs9MJArDFaBgjjBInYJAS/SAPe1iNTs9feLY="; meta = with lib; { description = "A syntax-aware diff"; |