diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
152 files changed, 1264 insertions, 560 deletions
diff --git a/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/nixpkgs/pkgs/tools/misc/android-tools/default.nix index 1654b008aa55..8d74e74cb8ac 100644 --- a/nixpkgs/pkgs/tools/misc/android-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/android-tools/default.nix @@ -1,8 +1,12 @@ -{ lib, stdenv, fetchurl -, cmake, perl, go -, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 +{ lib, stdenv, fetchurl, fetchpatch +, cmake, perl, go, python3 +, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2, fmt_7 }: +let + pythonEnv = python3.withPackages(ps: [ ps.protobuf ]); +in + stdenv.mkDerivation rec { pname = "android-tools"; version = "31.0.2"; @@ -12,8 +16,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; }; + patches = [ + # fmt 8 breaks the build but we can use fmt 7 from Nixpkgs: + (fetchpatch { + # Vendor google's version of fmtlib + url = "https://github.com/nmeum/android-tools/commit/21061c1dfb006c22304053c1f6f9e48ae4cbe25a.patch"; + sha256 = "17mcsgfc3i8xq4hck0ppnzafh15aljxy7j2q4djcmwnvrkv9kx3s"; + revert = true; + excludes = [ "vendor/fmtlib" ]; + }) + ]; + + postPatch = '' + sed -i -E "0,/import api_pb2/ s//from google.protobuf import api_pb2/" vendor/avb/aftltool.py + ''; + nativeBuildInputs = [ cmake perl go ]; - buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; + buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; + propagatedBuildInputs = [ pythonEnv ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; @@ -22,6 +42,12 @@ stdenv.mkDerivation rec { export GOCACHE=$TMPDIR/go-cache ''; + postInstall = '' + install -Dm755 ../vendor/avb/aftltool.py -t $out/bin + install -Dm755 ../vendor/avb/avbtool.py -t $out/bin + install -Dm755 ../vendor/mkbootimg/mkbootimg.py $out/bin/mkbootimg + ''; + meta = with lib; { description = "Android SDK platform tools"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix new file mode 100644 index 000000000000..0b6984526e4b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix @@ -0,0 +1,68 @@ +{ lib +, resholvePackage +, fetchFromGitHub +, asciidoc +, bash +, coreutils +, gawk +, gnum4 +, testVersion +, util-linux +}: + +resholvePackage rec { + pname = "arch-install-scripts"; + version = "24"; + + src = fetchFromGitHub { + owner = "archlinux"; + repo = "arch-install-scripts"; + rev = "v${version}"; + sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq"; + }; + + nativeBuildInputs = [ asciidoc gnum4 ]; + + preBuild = '' + substituteInPlace ./Makefile \ + --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" + + # https://github.com/archlinux/arch-install-scripts/pull/10 + substituteInPlace ./common \ + --replace "print '%s' \"\$1\"" "printf '%s' \"\$1\"" + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + solutions = { + # Give each solution a short name. This is what you'd use to + # override its settings, and it shows in (some) error messages. + profile = { + # the only *required* arguments are the 3 below + + # Specify 1 or more $out-relative script paths. Unlike many + # builders, resholvePackage modifies the output files during + # fixup (to correctly resolve in-package sourcing). + scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ]; + + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. + interpreter = "${bash}/bin/bash"; + + # packages resholve should resolve executables from + inputs = [ coreutils gawk util-linux ]; + }; + }; + + meta = with lib; { + description = "Useful scripts for installing Arch Linux"; + longDescription = '' + A small suite of scripts aimed at automating some menial tasks when installing Arch Linux. + ''; + homepage = "https://github.com/archlinux/arch-install-scripts"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ yayayayaka ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index 81b910117f17..de0f13c77fd0 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; + sha256 = "sha256-3XwnlSPlyEE4oznXK59/rooZLtj1+VbozprXU2W0J5I="; }; - cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; + cargoSha256 = "sha256-g5yfE/s1N6EgI2ikiJbypI4iQbXPu6zGNoSVC6ldoWo="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/bat"; changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir lilyball zowoq ]; + maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index d6ee17204304..72f142105b71 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.204"; + version = "1.205"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE="; + sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I="; }; nativeBuildInputs = [ dpkg ]; diff --git a/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix b/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix index f1aefd9b7583..1de5b7c4cf69 100644 --- a/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix +++ b/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Installer for BetterDiscord"; - homepage = "https://betterdiscord.net"; + homepage = "https://betterdiscord.app"; license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index a5c456c00501..9193e18d116a 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.6.0"; + version = "1.6.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-H/QT/fmQI9sHjl6wMJjrfjvbOhY9VyBkAGetvcUqGrE="; + sha256 = "sha256-SjfTMBGby2jzmeNEtBVYqumLExhXW8nqxpbaeeaRM3w="; }; - cargoHash = "sha256-5mqLVbB/dLAk3Ck7ilHhVn0CB/6Ln82SaTxZ/vkx+9k="; + cargoHash = "sha256-BdSqTzXu7Glhr0fQGmnkg5BXYgdQS6jgfH3A9hPpECY="; nativeBuildInputs = [ installShellFiles @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dywedir ]; license = with licenses; [ mit ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index 90abc7659203..d65d31d44c4e 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.36"; + version = "3.2.39"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; + sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index fd289f9cfb8a..a60a84475b06 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.2"; + version = "2.1.6"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA="; + sha256 = "sha256-6BzocbG7I3ZHlPGZ2GRY/n9ezRF2OER9BFaoIq0yBro="; }; - vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; + vendorSha256 = "sha256-i20Zt1ZP1ij1Qp4moNZqUTQOHPlchonFF7ag5qjMoqg="; doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix index 72721020e129..249e814fd303 100644 --- a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix +++ b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-FwjD+BdRc8y/g5MQLmBB/qkUj33cywbH2wjTp0y0s8A="; + sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-JygEE7K8swbFvJ2aDXs+INhfoLuhy+LY7T8AUr4lgJY="; + cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 552ea140d608..6f5a6ec25fbb 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ]; + ldflags = [ "-X main.versionString=${version}" ]; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; diff --git a/nixpkgs/pkgs/tools/misc/complete-alias/default.nix b/nixpkgs/pkgs/tools/misc/complete-alias/default.nix index 721e99427bb6..c23ed9771f23 100644 --- a/nixpkgs/pkgs/tools/misc/complete-alias/default.nix +++ b/nixpkgs/pkgs/tools/misc/complete-alias/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "complete-alias"; - version = "1.10.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cykerway"; repo = pname; rev = version; - sha256 = "1s0prdnmb2qnzc8d7ddldzqa53yc10qq0lbgx2l9dzmz8pdwylyc"; + sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/convbin/default.nix b/nixpkgs/pkgs/tools/misc/convbin/default.nix index 7f57cab585bc..7405535edd43 100644 --- a/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.0"; + version = "3.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; + sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/nixpkgs/pkgs/tools/misc/cope/default.nix b/nixpkgs/pkgs/tools/misc/cope/default.nix new file mode 100644 index 000000000000..ffa25ba9530b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/cope/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, perl, perlPackages, makeWrapper, }: + +perlPackages.buildPerlPackage rec { + pname = "cope"; + version = "unstable-2015-01-29"; + + src = fetchFromGitHub { + owner = "lotrfan"; + repo = pname; + rev = "0dc82a939a9498ff80caf472841c279dfe03efae"; + sha256 = "sha256-Tkv26M6YnaUB0nudjKGG482fvUkCobPk0VF1manBCoY="; + }; + + buildInputs = with perlPackages; [ EnvPath FileShareDir IOPty IOStty ListMoreUtils RegexpCommon RegexpIPv6 ]; + + postInstall = '' + mkdir -p $out/bin + mv $out/lib/perl5/site_perl/${perl.version}/auto/share/dist/Cope/* $out/bin/ + rm -r $out/lib/perl5/site_perl/${perl.version}/auto + ''; + + meta = with lib; { + description = "A colourful wrapper for terminal programs"; + homepage = "https://github.com/lotrfan/cope"; + license = with licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index 95f9c74f5ade..36e82903a7e4 100644 --- a/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.14"; @@ -6,7 +6,7 @@ let commonMeta = with lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only gpl2Plus ]; maintainers = with maintainers; [ petabyteboy felixsinger yuka ]; platforms = platforms.linux; }; @@ -81,7 +81,13 @@ let amdfwtool = generic { pname = "amdfwtool"; meta.description = "Create AMD firmware combination"; - installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool"; + installPhase = '' + runHook preInstall + + install -Dm755 amdfwtool $out/bin/amdfwtool + + runHook postInstall + ''; }; acpidump-all = generic { pname = "acpidump-all"; @@ -89,9 +95,15 @@ let meta.description = "Walk through all ACPI tables with their addresses"; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; - installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; + installPhase = '' + runHook preInstall + + install -Dm755 acpidump-all $out/bin/acpidump-all + + runHook postInstall + ''; postFixup = let - binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; + binPath = [ coreutils acpica-tools gnugrep gnused file ]; in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; diff --git a/nixpkgs/pkgs/tools/misc/coreshot/default.nix b/nixpkgs/pkgs/tools/misc/coreshot/default.nix new file mode 100644 index 000000000000..bb2404b1ed52 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/coreshot/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: + +mkDerivation rec { + pname = "coreshot"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + libcprime + ]; + + meta = with lib; { + description = "A screen capture utility from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 0b2b03ba8db9..f22a7268fbc9 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; diff --git a/nixpkgs/pkgs/tools/misc/cpufetch/default.nix b/nixpkgs/pkgs/tools/misc/cpufetch/default.nix index 4473738ac76c..46c485f52991 100644 --- a/nixpkgs/pkgs/tools/misc/cpufetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpufetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpufetch"; - version = "0.98"; + version = "1.00"; src = fetchFromGitHub { owner = "Dr-Noob"; repo = "cpufetch"; rev = "v${version}"; - sha256 = "060hmkwmb5ybcrj9jfx9681zk92489kq71nl6nacn8nfqrcn3qdb"; + sha256 = "sha256-2Iar7RwL3T4DrFbqKJFys/R+VENRg2lmYFkslEaZeVE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 8bca39c2ad52..9ff6a7aaa9aa 100644 --- a/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qarmin"; repo = pname; rev = version; - sha256 = "sha256-LtGgpfToQUNKM1hmMPW7UrS/n7iyI+dz2vbSo+GOcRg="; + sha256 = "sha256-OBe6nk5C3kO5Lkas9+G+VY3xAzY7SWx8W5CkSbaYJ9Y="; }; - cargoSha256 = "sha256-ZbyoCo1n4GRBkb5SClby5V51rLN1PnvCHD30TiJU2gY="; + cargoSha256 = "sha256-Jghkf1mX5ic7zB2KmtOZbSxgF8C6KjRdGG1Yt+dzylI="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/misc/dashing/default.nix b/nixpkgs/pkgs/tools/misc/dashing/default.nix index 496639ec07a5..6dfa3f2b7796 100644 --- a/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "A Dash Generator Script for Any HTML"; diff --git a/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/nixpkgs/pkgs/tools/misc/dateutils/default.nix index e6793813b2be..a43f07c0a2d9 100644 --- a/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.8"; + version = "0.4.9"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z"; + sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/misc/dialog/default.nix b/nixpkgs/pkgs/tools/misc/dialog/default.nix index 744f55aed10b..dd31fed35832 100644 --- a/nixpkgs/pkgs/tools/misc/dialog/default.nix +++ b/nixpkgs/pkgs/tools/misc/dialog/default.nix @@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210324"; + version = "1.3-20210621"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM="; + hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g="; }; buildInputs = [ @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" ]; - installTargets = [ "install${lib.optionalString withLibrary "-full"}" ]; + installTargets = [ + "install${lib.optionalString withLibrary "-full"}" + ]; meta = with lib; { homepage = "https://invisible-island.net/dialog/dialog.html"; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 88a9846e8352..09f27a0c22cb 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles -, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd @@ -7,20 +7,13 @@ }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -let - apksigner = runCommand "apksigner" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper "${jdk}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar ${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3/lib/apksigner.jar" - ''; -in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "178"; + version = "182"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; + sha256 = "sha256-atWyVMewm+I/SDdE9+z1JYLLVOFDsgps2BL9WgZLlVA="; }; outputs = [ "out" "man" ]; @@ -42,10 +35,10 @@ python3Packages.buildPythonApplication rec { # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: docx2txt dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon + # Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon pythonPath = [ binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils - dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip + e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd xz zip zstd ] @@ -53,7 +46,7 @@ python3Packages.buildPythonApplication rec { argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) - ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] + ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2 @@ -73,6 +66,23 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" + + # Failing because of file-v5.40 has a slightly different output. + # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 + "test_text_proper_indentation" + ] ++ lib.optionals stdenv.isDarwin [ + # Disable flaky tests on Darwin + "test_non_unicode_filename" + "test_listing" + ]; + + # flaky tests on Darwin + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/comparators/test_git.py" + "tests/comparators/test_java.py" + "tests/comparators/test_uimage.py" + "tests/comparators/test_device.py" + "tests/comparators/test_macho.py" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/nixpkgs/pkgs/tools/misc/disfetch/default.nix index d66d413fcc36..96f2b28b5e3f 100644 --- a/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -1,29 +1,29 @@ -{ stdenv -, lib -, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.24"; + version = "2.15"; src = fetchFromGitHub { - owner = "llathasa-veleth"; + owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-Uoc5xSyLXXEqdyYn71NK8c8A/1wQ6djYn/HHJwGg5vc="; + sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8="; }; dontBuild = true; installPhase = '' + runHook preInstall install -Dm755 -t $out/bin disfetch + runHook postInstall ''; meta = with lib; { description = "Yet another *nix distro fetching program, but less complex"; - homepage = "https://github.com/llathasa-veleth/disfetch"; + homepage = "https://github.com/q60/disfetch"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.vel ]; + maintainers = with maintainers; [ vel ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index 058a0d1ad6f4..1fd1d3422a0f 100644 --- a/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; @@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "10jrcy8m9ll4136ghq3fhmnphd9g3rw863x708vm17n44kgdxyab"; + # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Terminal disk space navigator"; homepage = "https://github.com/imsnif/diskonaut"; license = licenses.mit; - maintainers = with maintainers; [ evanjs ]; + maintainers = with maintainers; [ evanjs SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 0c3d319f2a70..56880b6448df 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.2"; + version = "2.14.4"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; + sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; + cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/duf/default.nix b/nixpkgs/pkgs/tools/misc/duf/default.nix index 076eb33fbb19..e95edb08b84a 100644 --- a/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; - buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index 85055ccba5eb..01c0ff4315e1 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg="; + sha256 = "sha256-5GhoL3by4sXhFJrNZi/UlERBa+s2oqDVVJODY0kdfxI="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms="; + cargoSha256 = "sha256-cgH3jrZPGUHiBDeJ9qj80dU+Vbz+wHMOsCaGAvJY6mg="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dutree/default.nix b/nixpkgs/pkgs/tools/misc/dutree/default.nix new file mode 100644 index 000000000000..db767a1afb62 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/dutree/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dutree"; + version = "0.2.18"; + + src = fetchFromGitHub { + owner = "nachoparker"; + repo = pname; + rev = "v${version}"; + sha256 = "17lm8jd07bi499mywg2iq669im34j4x4yhc8a3adxn12f8j0dfg7"; + # test directory has files with unicode names which causes hash mismatches + # It is also not used by any tests or parts of build process + extraPostFetch = '' + rm -r $out/test + ''; + }; + + cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw"; + + meta = with lib; { + description = "A tool to analyze file system usage written in Rust"; + homepage = "https://github.com/nachoparker/dutree"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock b/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock deleted file mode 100644 index c5b48135993f..000000000000 --- a/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "elfcat" -version = "0.1.4" diff --git a/nixpkgs/pkgs/tools/misc/elfcat/default.nix b/nixpkgs/pkgs/tools/misc/elfcat/default.nix index a9691e43c6a9..91e4dfb99b3f 100644 --- a/nixpkgs/pkgs/tools/misc/elfcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/elfcat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; + sha256 = "sha256-v8G9XiZS+49HtuLjs4Co9A1J+5STAerphkLaMGvqXT4="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoSha256 = null; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries."; diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index abfd12523db9..8309bc129414 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.9"; + version = "5.0"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI="; + sha256 = "1fqyshn9i213h6hiy31xlm719f6vayskfna92kvbd2aykryvp1ra"; }; - patches = lib.optionals stdenv.isDarwin [ - # Fix v4.9 segfault on Darwin. remove with the next update - # https://github.com/eradman/entr/issues/74 - (fetchpatch { - url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch"; - sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi"; - includes = [ "entr.c" ]; - }) - ]; - postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat diff --git a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix index eafc71030ac8..8f847df3d5d1 100644 --- a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix @@ -14,10 +14,10 @@ buildGoPackage rec { sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; }; - preBuild = '' - # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") -''; + # 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"; diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index beaffadab97e..777415de5800 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210719.0"; + version = "20210728.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc="; + sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ="; }; # no tests diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 69a67a6e9181..4c58632e0df6 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.0"; + version = "2021.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; + rev = version; + sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/etcher/default.nix b/nixpkgs/pkgs/tools/misc/etcher/default.nix index d0fae336d9d3..6834179cfe9a 100644 --- a/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace /opt/balenaEtcher/balena-etcher-electron ${pname} + runHook postInstall ''; diff --git a/nixpkgs/pkgs/tools/misc/ethminer/add-global-context.patch b/nixpkgs/pkgs/tools/misc/ethminer/add-global-context.patch new file mode 100644 index 000000000000..f0891e5a2758 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ethminer/add-global-context.patch @@ -0,0 +1,25 @@ +diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt +index 1a53de8..832e926 100644 +--- a/libethcore/CMakeLists.txt ++++ b/libethcore/CMakeLists.txt +@@ -7,7 +7,7 @@ set(SOURCES + include_directories(BEFORE ..) + + add_library(ethcore ${SOURCES}) +-target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon) ++target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon) + + if(ETHASHCL) + target_link_libraries(ethcore PRIVATE ethash-cl) +diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h +index d9aadc7..fe5c6cf 100644 +--- a/libethcore/EthashAux.h ++++ b/libethcore/EthashAux.h +@@ -22,6 +22,7 @@ + #include <libdevcore/Worker.h> + + #include <ethash/ethash.hpp> ++#include <ethash/global_context.hpp> + + namespace dev + { diff --git a/nixpkgs/pkgs/tools/misc/ethminer/default.nix b/nixpkgs/pkgs/tools/misc/ethminer/default.nix index 675147bc5d57..e159622bc8e1 100644 --- a/nixpkgs/pkgs/tools/misc/ethminer/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethminer/default.nix @@ -64,6 +64,11 @@ stdenv.mkDerivation rec { cudatoolkit ]; + patches = [ + # global context library is separated from libethash + ./add-global-context.patch + ]; + preConfigure = '' sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt ''; diff --git a/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/nixpkgs/pkgs/tools/misc/ethtool/default.nix index 4b6d7cc9332e..9457507458d8 100644 --- a/nixpkgs/pkgs/tools/misc/ethtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.4"; + version = "5.13"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12"; + sha256 = "1wwcwiav0fbl75axmx8wms4xfdp1ji5c7j49k4yl8bngqra74fp6"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libmnl ]; + meta = with lib; { description = "Utility for controlling network drivers and hardware"; homepage = "https://www.kernel.org/pub/software/network/ethtool/"; diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index 632eb4590586..9cabff9a9bef 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -18,16 +18,21 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + nativeBuildInputs = [ + cmake pkg-config installShellFiles + # ghc is not supported on aarch64-darwin yet. + ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; + buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 + '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \ diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 4ed308643e56..27352c83dee9 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.21"; + version = "0.1.24"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; + sha256 = "sha256-Oa/o2Jd0rf+fIVQCaCiSh+tI2KINh1Kx3NTVEULQlzI="; }; - cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; + cargoSha256 = "sha256-iFGw5mkeRGiMWe5wcrEcmH0WlHJ8p1D0rf1mh+1Mo+w="; doInstallCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 4a9dc7ee774e..108cc5b82fd6 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.39"; + version = "5.40"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; + sha256 = "0myxlpj9gy2diqavx33vq88kpvr1k1bpzsm0d0zmb2hl7ks22wqn"; }; - patches = [ - # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3 - # Without the RCS id change to avoid conflicts. Remove on next bump. - ./webassembly-format-fix.patch - ]; - nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] - ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; @@ -29,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; + maintainers = with maintainers; [ ]; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch b/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch deleted file mode 100644 index 5eca833e4d71..000000000000 --- a/nixpkgs/pkgs/tools/misc/file/webassembly-format-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/funcs.c b/src/funcs.c -index 299b8f022..ecbfa28c5 100644 ---- a/src/funcs.c -+++ b/src/funcs.c -@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt) - if (*++p == '%') - continue; - // Skip uninteresting. -- while (strchr("0.'+- ", *p) != NULL) -+ while (strchr("#0.'+- ", *p) != NULL) - p++; - if (*p == '*') { - if (msg) diff --git a/nixpkgs/pkgs/tools/misc/findutils/default.nix b/nixpkgs/pkgs/tools/misc/findutils/default.nix index 18881ef181d2..8c8b8c7b2b43 100644 --- a/nixpkgs/pkgs/tools/misc/findutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix @@ -9,21 +9,18 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp"; }; postPatch = '' substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' ''; - patches = [ ./no-install-statedir.patch ] - # fix gnulib tests on 32-bit ARM. Included on findutils master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + patches = [ ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort @@ -43,6 +40,12 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; + CFLAGS = [ + # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 + # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 + "-D__nonnull\\(params\\)=" + ]; + enableParallelBuilding = true; meta = { diff --git a/nixpkgs/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch b/nixpkgs/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch deleted file mode 100644 index 39bd29f8439e..000000000000 --- a/nixpkgs/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gnulib-tests/test-perror2.c -+++ b/gnulib-tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gnulib-tests/test-strerror_r.c -+++ b/gnulib-tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - diff --git a/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix index 838572d92973..e2e066fd8903 100644 --- a/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/nixpkgs/pkgs/tools/misc/flameshot/default.nix @@ -1,14 +1,28 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }: +{ mkDerivation +, lib +, fetchFromGitHub +, qtbase +, cmake +, qttools +, qtsvg +, nix-update-script +}: mkDerivation rec { pname = "flameshot"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2"; + sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; }; nativeBuildInputs = [ cmake qttools qtsvg ]; diff --git a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 40f30bd7ad90..507fbb7dcc71 100644 --- a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,12 +1,12 @@ -{ lib, appimageTools, fetchurl }: let +{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.9.0"; + version = "5.11.0"; name = "${pname}-${version}"; src = fetchurl { name = "${name}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin"; }; udevRules = fetchurl { @@ -14,12 +14,20 @@ sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; + appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} + + # Get rid of the autoupdater + ${nodePackages.asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${nodePackages.asar}/bin/asar pack app $out/resources/app.asar + ''; + }); -in appimageTools.wrapType2 { - inherit name src; +in appimageTools.wrapAppImage { + inherit name; + src = appimageContents; multiPkgs = null; # no 32bit needed extraPkgs = { pkgs, ... }@args: [ @@ -27,11 +35,14 @@ in appimageTools.wrapType2 { ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; extraInstallCommands = '' + # Add desktop convencience stuff mv $out/bin/{${name},${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ - --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" + + # Add udev rules mkdir -p $out/lib/udev/rules.d ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules ''; diff --git a/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 5f64057c46c3..0f66fa55acad 100644 --- a/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -7,7 +7,7 @@ , withGUI ? withGTK , withPython ? true , withExtras ? true -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: assert withGTK -> withGUI; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { readline uthash woff2 zeromq libuninameslist python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withSpiro [libspiro] + ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = { + meta = with lib; { description = "A font editor"; - homepage = "http://fontforge.github.io"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.erictapen ]; + homepage = "https://fontforge.github.io"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index 69b76cf648d8..f58b73a47233 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw="; + sha256 = "sha256-ARwBm9p6o/iC09F6pc5c4qq3WClNTyAvLPsG58YQOAM="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { xdelta ]; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/nixpkgs/pkgs/tools/misc/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix index 3ef5a643259c..d38a0ad71377 100644 --- a/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { buildInputs = [ ncurses ]; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}" + ldflags = [ + "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}" ]; # The vim plugin expects a relative path to the binary; patch it to abspath. diff --git a/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix index 17e67c0bc75e..5ccdf2e2feba 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.2"; + version = "5.4.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; + sha256 = "sha256-0Pg9bHQwWElW4B3oRco5F2FsaEeLC0ZXx7J+hl7dc3Y="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index 2e2d8ccfc14f..16594f898b97 100644 --- a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/github/gh-ost"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ]; meta = with lib; { description = "Triggerless online schema migration solution for MySQL"; diff --git a/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix index 88d62b896df7..18f251fb7208 100644 --- a/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; }; - buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; + ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with lib; { description = "Generic, high-level git support for git-flow workflows"; @@ -21,4 +21,3 @@ buildGoPackage rec { license = licenses.mit; }; } - diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 5e805920b68a..e26509dd11dd 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,19 +2,18 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.173.2"; + version = "0.176.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0="; + sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs="; }; - vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; + vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4="; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/nixpkgs/pkgs/tools/misc/goss/default.nix b/nixpkgs/pkgs/tools/misc/goss/default.nix index bbe947ecd120..c4396bfae9fb 100644 --- a/nixpkgs/pkgs/tools/misc/goss/default.nix +++ b/nixpkgs/pkgs/tools/misc/goss/default.nix @@ -14,9 +14,9 @@ buildGoModule rec { vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7"; CGO_ENABLED = 0; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/aelsabbahy/goss/"; diff --git a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 36a7055f875c..05a93b44b94e 100644 --- a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ldflags = [ + "-X main.Version=${version}" "-X main.Commit=${version}" "-X main.BuildDate=1970-01-01" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix index 8d18d654c72f..729cfbc283f9 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "4.0.7"; + version = "3.3.14"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "sha256-sZn/ug4oh/SHbICbiQeAmtEIwT3++DBWbT2XBkYGYUc="; + sha256 = "04dslbvgrraacsw7wydbiv8jc753as2g54wn9sgh3lsryvzrfqfa"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix index e47ea74bbe98..bb44c800a312 100644 --- a/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "grc"; - version = "1.12"; + version = "1.13"; format = "other"; src = fetchFromGitHub { owner = "garabik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; + sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 37ebbe630cad..248351272d89 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -20,11 +20,11 @@ assert !cpp || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0qazfslkqbmzg495jafpvqp0khws3jkxa0z7rph9qvhacil6544p"; + sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; }; passthru = { diff --git a/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/nixpkgs/pkgs/tools/misc/hdfview/default.nix index 8537e5748c30..b33fee8e0b52 100644 --- a/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdfview"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; - sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c"; + sha256 = "sha256-VmgHSVMFoy09plU5pSnyaPz8N15toy7QfCtXI7mqDGY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index 3d91dd6d9abb..43dcbc4a74fc 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE="; + sha256 = "sha256-lcvpNhfSgr8ky03sTo7kjnaLUJeIrzFqpYUjvQpT1Po="; }; - vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8="; + vendorSha256 = "sha256-TKs3xuZaO9PvlAcV5GDa3Jb36zeVWX3LcdcPxWR6KzE="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/nixpkgs/pkgs/tools/misc/interactsh/default.nix new file mode 100644 index 000000000000..b623faea39fb --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/interactsh/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "interactsh"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9tmEeYuMRZVkcUupBzJv3rCuy7Il46yh5i0UEUNCNtc="; + }; + + vendorSha256 = "sha256-YTzo8YjnJUNXZrYKYTCHOgZAUrMlYzbEEP3yXYfNZqo="; + + modRoot = "."; + subPackages = [ + "cmd/interactsh-client" + "cmd/interactsh-server" + ]; + + # Test files are not part of the release tarball + doCheck = false; + + meta = with lib; { + description = "An Out of bounds interaction gathering server and client library"; + longDescription = '' + Interactsh is an Open-Source Solution for Out of band Data Extraction, + A tool designed to detect bugs that cause external interactions, + For example - Blind SQLi, Blind CMDi, SSRF, etc. + ''; + homepage = "https://github.com/projectdiscovery/interactsh"; + license = licenses.mit; + maintainers = with maintainers; [ hanemile ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/nixpkgs/pkgs/tools/misc/kepubify/default.nix index b1ece43154fe..a53ff544ad19 100644 --- a/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "kepubify"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mxe43U0kxkSdAzs+lSJ0x/VspbJPam59DpTpFEJVMl4="; + sha256 = "sha256-ZQY5U9uMCwsMl3Ds3bscPYmTt8JdWehOoowb+AmJSbQ="; }; - vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; + vendorSha256 = "sha256-DcE2MCbH5FIU1UoIF8OF17TfsWS5eQhHnWDEAxy8X6c="; # remove when built with >= go 1.17 - buildFlags = [ "-tags" "zip117" ]; + tags = [ "zip117" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix index 1a561f0bef47..8af0674f54bf 100644 --- a/nixpkgs/pkgs/tools/misc/kermit/default.nix +++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://www.kermitproject.org/ck90.html"; + homepage = "https://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/misc/less/default.nix b/nixpkgs/pkgs/tools/misc/less/default.nix index d63861ace331..9c5a4b1568be 100644 --- a/nixpkgs/pkgs/tools/misc/less/default.nix +++ b/nixpkgs/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "581.2"; + version = "590"; src = fetchurl { url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0fyqslvrasv19qjvqrwfwz2n7mnm93y61x9bcx09ga90mxyb8d6f"; + sha256 = "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ eelco dtzWill ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix index 8aa8e9a663b7..b135ed061dee 100644 --- a/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ]; + ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix index 1c30b760a9c8..6a9fe05ca731 100644 --- a/nixpkgs/pkgs/tools/misc/lifecycled/default.nix +++ b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "lifecycled"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "lifecycled"; rev = "v${version}"; - sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + sha256 = "sha256-+Ts2ERoEZcBdxMXQlxPVtQe3pst5NXWKU3rmS5CgR7A="; }; - vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + vendorSha256 = "sha256-q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; postInstall = '' mkdir -p $out/lib/systemd/system diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index 729dc41a107d..fbfb488f9067 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { - version = "4.05"; + version = "4.06"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; + sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch b/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch new file mode 100644 index 000000000000..afbec1d7e479 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch @@ -0,0 +1,38 @@ +From 20c3fe76340981c43eeed16a5509480a0f5cb56d Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 6 Aug 2021 10:55:01 +0200 +Subject: [PATCH] Forcefully disable docs build + +This currently affects the following statement in `src/Makefile.am` +only: + + if !DISABLE_DOCUMENTATION + all-local: lnav + if test -w $(srcdir)/internals; then \ + env DUMP_INTERNALS_DIR=$(srcdir)/internals DUMP_CRASH=1 ./lnav Makefile; \ + mv $(srcdir)/internals/*.schema.json $(top_srcdir)/docs/schemas; \ + fi + endif + +We cannot do this (even on non-cross builds) since `lnav` requires e.g. +`/etc/nsswitch.conf` and other impurities here. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ce311fd8..e3c9ebe0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -287,7 +287,7 @@ AS_IF([test $? -eq 0], + + AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0) + AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"") +-AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ]) ++AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ true ]) + + AC_CONFIG_HEADERS([src/config.h]) + AC_CONFIG_FILES([Makefile]) +-- +2.31.1 + diff --git a/nixpkgs/pkgs/tools/misc/lnav/default.nix b/nixpkgs/pkgs/tools/misc/lnav/default.nix index 373687fafdf1..3cbfb2ad365a 100644 --- a/nixpkgs/pkgs/tools/misc/lnav/default.nix +++ b/nixpkgs/pkgs/tools/misc/lnav/default.nix @@ -3,18 +3,25 @@ stdenv.mkDerivation rec { pname = "lnav"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; rev = "v${version}"; - sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; + sha256 = "sha256-hAFyMypGC065aRgX2L4LdyFGpZ/LnX5SjA2iQv5Iuas="; }; + patches = [ ./0001-Forcefully-disable-docs-build.patch ]; + postPatch = '' + substituteInPlace Makefile.am \ + --replace "SUBDIRS = src test" "SUBDIRS = src" + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake zlib bzip2 ncurses @@ -24,10 +31,6 @@ stdenv.mkDerivation rec { curl ]; - postPatch = '' - sed -ie '/DUMP_INTERNALS/d' src/Makefile.am - ''; - preConfigure = '' ./autogen.sh ''; diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index 1abc0ff9bf82..c0c67b19b10a 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -1,6 +1,7 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , fetchurl , makeWrapper , nixosTests @@ -9,56 +10,69 @@ with lib; -let this = stdenv.mkDerivation rec { - version = elk7Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY="; + x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo="; + } + else { + x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU="; + x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A="; + }; + this = stdenv.mkDerivation rec { + version = elk7Version; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = - if enableUnfree - then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj" - else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; - }; + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); + }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; - buildInputs = [ - makeWrapper jre - ]; + buildInputs = [ + makeWrapper + jre + ]; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + runHook postInstall + ''; - meta = with lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = "https://www.elastic.co/products/logstash"; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; + meta = with lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = "https://www.elastic.co/products/logstash"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-7; + } + ); }; - passthru.tests = - optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; - { - elk = nixosTests.elk.ELK-7; - } - ); -}; -in this +in +this diff --git a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index 6c1f1759084e..087a5ce7f9a3 100644 --- a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.4"; + version = "2.6.7"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; + sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s="; }; - vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; + vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix index 55c11b00c93c..09e90ca07940 100644 --- a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix +++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, gettext, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "lrzsz-0.12.20"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10195.patch"; + url = "https://bugzilla.redhat.com/attachment.cgi?id=79507"; + sha256 = "0jlh8w0cjaz6k56f0h3a0h4wgc51axmrdn3mdspk7apjfzqcvx3c"; + }) + ]; + + nativeBuildInputs = [ gettext ]; + hardeningDisable = [ "format" ]; configureFlags = [ "--program-transform-name=s/^l//" ]; diff --git a/nixpkgs/pkgs/tools/misc/macchina/default.nix b/nixpkgs/pkgs/tools/misc/macchina/default.nix index 053240e21190..8b4b897526da 100644 --- a/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0d6nqjn2828kk91430yjl6xlwx1j10xhp2i0vv2slm3wv0a4w24x"; + sha256 = "sha256-ZuQ0FZM77ENAQ57B0oFqFmGqQnFblCP2wJETb47yo1E="; }; - cargoSha256 = "sha256:0mjqqd43jj6hxicgjkvmdf966vj5xf0ndibszzwp38zdb5kzshqi"; + cargoSha256 = "sha256-YwhhOHiQcN8VS1DFTtZGvD2QvNAfPngPm/ZeOxzuDnw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/tools/misc/maker-panel/default.nix b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix new file mode 100644 index 000000000000..96c4d6ad61c6 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, go-md2man +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "maker-panel"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "twitchyliquid64"; + repo = "maker-panel"; + rev = version; + sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; + }; + + cargoSha256 = "1ar62dn0khlbm47chakrsrxd1y76gpq0sql4g9j7dqqrvkavgd7w"; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postBuild = '' + go-md2man --in docs/spec-reference.md --out maker-panel.5 + ''; + + postInstall = '' + installManPage maker-panel.5 + ''; + + meta = with lib; { + description = "Make mechanical PCBs by combining shapes together."; + homepage = "https://github.com/twitchyliquid64/maker-panel"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ twitchyliquid64 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix b/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix index d74eb84dc340..01a6d2933222 100644 --- a/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -29,7 +29,10 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # No API changes. - substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' + substituteInPlace pyproject.toml \ + --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ + --replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \ + --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' ''; # No tests available on Pypi and there is only a failing version assertion test in the repo. diff --git a/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix index 7e940ee4f77f..a264a107990e 100644 --- a/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "mathpix-snipping-tool"; - version = "03.00.0025"; + version = "03.00.0050"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.mathpix.com/linux/Mathpix_Snipping_Tool-x86_64.v${version}.AppImage"; - sha256 = "0p39rsmjfz3m5s3k9pmmkqbp8f21s1cwjgspz8m47dq5jjls8ay8"; + sha256 = "0bf4x6jffiqdss8vwy1qypv75zxi1bfc8rywsgp5qlsjq792plpb"; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index 6cbe693fb604..b9ff4ad33d2c 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.26"; + version = "4.8.27"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; + sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook unzip ] @@ -62,6 +62,13 @@ stdenv.mkDerivation rec { sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc ''; + postFixup = lib.optionalString (!stdenv.isDarwin) '' + # libX11.so is loaded dynamically so autopatch doesn't detect it + patchelf \ + --add-needed ${libX11}/lib/libX11.so \ + $out/bin/mc + ''; + meta = with lib; { description = "File Manager and User Shell for the GNU Project"; downloadPage = "https://www.midnight-commander.org/downloads/"; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 6412eaa1f802..0d55da7fdfa4 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,30 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.6"; + version = "0.5.9"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-x2cED+WEc50RB8BxiDEm/XnauT1RqqGjSIdL5MMaFBY="; + sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; }; - postInstall = '' - substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly - install -Dm644 -t $out/share/mcfly mcfly.bash - install -Dm644 -t $out/share/mcfly mcfly.zsh - install -Dm644 -t $out/share/mcfly mcfly.fish - ''; - - cargoSha256 = "sha256-7RKewz5jBS2HhHvXHBUWaQQ/wq9nryS9E+DqzBOVjPs="; + cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; - changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt"; + changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index b25a850311e3..7eb57863575f 100644 --- a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mdbtools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "mdbtools"; repo = "mdbtools"; rev = "v${version}"; - sha256 = "11cv7hh8j8akpgm1a6pp7im6iacpgx6wzcg9n9rmb41j0fgxamdf"; + sha256 = "sha256-Hnub8h0a3qx5cxVn1tp/IVbz9aORjGGWizD3Z4rPl2s="; }; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/nixpkgs/pkgs/tools/misc/mdr/default.nix b/nixpkgs/pkgs/tools/misc/mdr/default.nix new file mode 100644 index 000000000000..095e7f35feba --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/mdr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "mdr"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ibM3303pXnseAFP9qFTOzj0G/SxRPX+UeRfbJ+MCABk="; + }; + + vendorSha256 = "sha256-5jzU4EybEGKoEXCFhnu7z4tFRS9fgf2wJXhkvigRM0E="; + + ldflags = [ + "-s" + "-w" + "-X main.GitCommit=${src.rev}" + "-X main.GitLastTag=${version}" + "-X main.GitExactTag=${version}" + ]; + + meta = with lib; { + description = "MarkDown Renderer for the terminal"; + homepage = "https://github.com/MichaelMure/mdr"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix index 308b69c9d744..f5e8f1524737 100644 --- a/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, python2, fetchFromGitHub }: -buildPythonPackage rec { +python2.pkgs.buildPythonPackage rec { pname = "me_cleaner"; version = "1.2"; diff --git a/nixpkgs/pkgs/tools/misc/microplane/default.nix b/nixpkgs/pkgs/tools/misc/microplane/default.nix index 89b0bc4d8b8d..a44ae344bf59 100644 --- a/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "microplane"; - version = "0.0.32"; + version = "0.0.34"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "sha256-QYii/UmYus5hloTUsbVKsw50bSfI4bArUgGzFSK8Cas="; + sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164="; }; - vendorSha256 = "sha256-1XtpoGqQ//2ccJdl8E7jnSBQhYoA4/YVBbHeI+OfaR0="; + vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' ln -s $out/bin/microplane $out/bin/mp diff --git a/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/nixpkgs/pkgs/tools/misc/mimeo/default.nix index ea79b8d2f0ff..d8e09e72f735 100644 --- a/nixpkgs/pkgs/tools/misc/mimeo/default.nix +++ b/nixpkgs/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "mimeo"; - version = "2019.7"; + version = "2021.2"; src = fetchurl { url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; - sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; + sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf"; }; buildInputs = [ file desktop-file-utils ]; diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 98fb83357888..64fdb40f52a8 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-Hv1aefuiu7pOlSMUjZLGY6bxVy+6myFH1afZZ5gtmi0="; + sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; }; - cargoSha256 = "sha256-CgiHluc9+5+hKwsC7UZimy1586QBUsj+TVlb2lQRXs0="; + cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix index 8787e4a838f6..640b0d611e47 100644 --- a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; - buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; meta = with lib; { homepage = "https://github.com/itchyny/mmv"; diff --git a/nixpkgs/pkgs/tools/misc/mrtg/default.nix b/nixpkgs/pkgs/tools/misc/mrtg/default.nix index e8ebde4ad4d9..ee6c9776c54b 100644 --- a/nixpkgs/pkgs/tools/misc/mrtg/default.nix +++ b/nixpkgs/pkgs/tools/misc/mrtg/default.nix @@ -1,24 +1,25 @@ { lib, stdenv, fetchurl, perl, gd, rrdtool }: stdenv.mkDerivation rec { - - version = "2.17.7"; pname = "mrtg"; + version = "2.17.8"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; - sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; + sha256 = "sha256-GsLgr2ng7N73VeeYylmDSreKwYXCpe/9t2hcWPLvAbQ="; }; buildInputs = [ - perl gd rrdtool + perl + gd + rrdtool ]; - meta = { + meta = with lib; { description = "The Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.robberer ]; - platforms = lib.platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix b/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix index 4ed1bd51696c..e6e95968a09f 100644 --- a/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix +++ b/nixpkgs/pkgs/tools/misc/neo-cowsay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "neo-cowsay"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Code-Hex"; repo = "Neo-cowsay"; rev = "v${version}"; - sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; + sha256 = "sha256-n01C6Z9nV2DDbSqgbOIZTqZAWXo6h4/NJdyFiOCh79A="; }; - vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; + vendorSha256 = "sha256-4qMsyNFD2MclsseE+IAaNm5r0wHWdcwLLPsZ0JJ3qpw="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/noti/default.nix b/nixpkgs/pkgs/tools/misc/noti/default.nix index 9bfc7e259d5b..c964a8872f83 100644 --- a/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -16,9 +16,9 @@ buildGoPackage rec { goPackagePath = "github.com/variadico/noti"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") - ''; + ldflags = [ + "-X ${goPackagePath}/internal/command.Version=${version}" + ]; postInstall = '' install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 diff --git a/nixpkgs/pkgs/tools/misc/notify/default.nix b/nixpkgs/pkgs/tools/misc/notify/default.nix index 0d7e6af8363f..8210dac327e6 100644 --- a/nixpkgs/pkgs/tools/misc/notify/default.nix +++ b/nixpkgs/pkgs/tools/misc/notify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "notify"; - version = "0.0.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "1nlsl4himxs5jv0fcd48jkwjnmn1w3alp0dcm1awmp6702zrsgqj"; + sha256 = "sha256-grTHSMN4PpsCo5mST6nXE5+u7DewMVJXI3hnNIJdhLs="; }; - vendorSha256 = "13dz0sk3561hrixsl1ghr9y0pzap2a8zrlbzzb7zs7550snbdcyg"; + vendorSha256 = "sha256-BbhDNy3FmnHzAfv3lxPwL2jhp8Opfo0WVFhncfTO/28="; modRoot = "."; subPackages = [ diff --git a/nixpkgs/pkgs/tools/misc/ntfy-webpush/default.nix b/nixpkgs/pkgs/tools/misc/ntfy-webpush/default.nix new file mode 100644 index 000000000000..27559dabbddf --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ntfy-webpush/default.nix @@ -0,0 +1,34 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonPackage rec { + pname = "ntfy-webpush"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "dschep"; + repo = "ntfy-webpush"; + rev = "v${version}"; + sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n"; + }; + + postPatch = '' + # break dependency loop + substituteInPlace setup.py \ + --replace "'ntfy', " "" + ''; + + propagatedBuildInputs = with python3Packages; [ + pywebpush + py-vapid + ]; + + # no tests, just a script + doCheck = false; + + meta = with lib; { + description = "cloudbell webpush notification support for ntfy"; + homepage = "https://dschep.github.io/ntfy-webpush/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/nixpkgs/pkgs/tools/misc/ntfy/default.nix index e2bb64ef5291..3f85e7f01a4b 100644 --- a/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { psutil matrix-client dbus-python + ntfy-webpush ]; checkPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 7c730c8c4a57..3250047e0e3d 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,23 +1,21 @@ { buildGoModule , fetchFromGitHub -, stdenv , lib }: buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.26.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; + sha256 = "sha256-iJL3EFoBtp4UOLm4/b4JBwzK6iZSTE0cb6EzmlziOLk="; }; - vendorSha256 = if stdenv.isDarwin - then "0anw3l6pq8yys2g2607ndhklb9m1i9krgjrw4wb99igavjzp3wpj" - else "04h463d2d7g6wqp5mzkqlszwzdbq0pix6j7n2s9s80lwg7nh8k3h"; + vendorSha256 = "sha256-LNlglYys4F7+W7PUmBT9cBnYs7y6AlB9wdaDibaxqC0="; + proxyVendor = true; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 062b49e8bbdc..a0803a36839f 100644 --- a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-PHr9wP+DgsiQAvrVNO8Aa/X/dkrAUnlPDwAzSISa0GM="; + sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix index b5c0940910ca..1508e6f93cd6 100644 --- a/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.1"; + version = "2021.3"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-kbS9kmSDHSD/AOxELUjt5SbbVTeb2RdgaGPAX0O4WlE="; + sha256 = "sha256-D6Wjnww+WMIEATPkIpyyhmDGG5eM1KKj0vbpfvTI0LM="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 0667327d062b..519d928c6952 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20210322"; + version = "20210722"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ="; + sha256 = "0jaa5137sjw2szvmnnslkqv1n3gg2rkkgr71j7hpp5a3q15hjf9j"; }; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix index d7f6a3d87394..48fc7bc32b41 100644 --- a/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix +++ b/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk="; + sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/peep/default.nix b/nixpkgs/pkgs/tools/misc/peep/default.nix index 6379f24649b3..e77ace41f9c2 100644 --- a/nixpkgs/pkgs/tools/misc/peep/default.nix +++ b/nixpkgs/pkgs/tools/misc/peep/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { description = "The CLI text viewer tool that works like less command on small pane within the terminal window"; license = licenses.mit; homepage = "https://github.com/ryochack/peep"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/pferd/default.nix b/nixpkgs/pkgs/tools/misc/pferd/default.nix index c964a334553c..5c88ea2349f7 100644 --- a/nixpkgs/pkgs/tools/misc/pferd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "08kcl1c8z8qx65dfz5ghmbfqyjgkng4g9ymcnhydiz8j27smkj5d"; + sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index e1fed81b2db6..ac1c0bd356d2 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "18s102hv6qqlx0nra91srdlb5fyv6x3hwism6c2r6zbxh68pgsag"; + sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY="; }; - vendorSha256 = "0mgq9zl56wlr37dxxa1sh53wfkhrl9ybjvxj5y9djspqkp4j45pn"; + vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; subPackages = [ "cmd" ]; - buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + ldflags = [ "-w" "-s" "-X main.gitTag=${src.rev}" "-X main.gitCommit=${src.rev}" "-X main.gitBranch=master" ]; postInstall = '' mv $out/bin/cmd $out/bin/pgcenter diff --git a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 54e7093747bf..c5a240f714ea 100644 --- a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.10.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ="; + sha256 = "sha256-8E4rciuoZrj8Oz2EXqtFgrPxvb8GJO3n1s2FpXrR0Q0="; }; - vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s="; + vendorSha256 = "sha256-scaaRjaDE/RG6Ei83CJBkfQCd1e5pH/Cs2vEbdl9Oyg="; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://pgmetrics.io/"; diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix index 06bd9def9aa6..85249c1242ff 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/tests.nix @@ -4,7 +4,7 @@ let inherit (phoronix-test-suite) pname version; in -runCommand "${pname}-tests" { meta.timeout = 3; } +runCommand "${pname}-tests" { meta.timeout = 60; } '' # automatic initial setup to prevent interactive questions ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null diff --git a/nixpkgs/pkgs/tools/misc/pick/default.nix b/nixpkgs/pkgs/tools/misc/pick/default.nix index a8203978feea..9a6c6881f7df 100644 --- a/nixpkgs/pkgs/tools/misc/pick/default.nix +++ b/nixpkgs/pkgs/tools/misc/pick/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkg-config }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "pick"; - version = "2.0.2"; + version = "4.0.0"; src = fetchFromGitHub { - owner = "calleerlandsson"; + owner = "mptre"; repo = "pick"; rev = "v${version}"; - sha256 = "0wm3220gqrwldiq0rjdraq5mw3i7d58zwzls8234sx9maf59h0k0"; + sha256 = "8cgt5KpLfnLwhucn4DQYC/7ot1u24ahJxWG+/1SL584="; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + PREFIX = placeholder "out"; meta = with lib; { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/tools/misc/pipelight/default.nix b/nixpkgs/pkgs/tools/misc/pipelight/default.nix index 96027677fa86..a5a5b727a8de 100644 --- a/nixpkgs/pkgs/tools/misc/pipelight/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipelight/default.nix @@ -21,7 +21,10 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; - patches = [ ./pipelight.patch ]; + patches = [ + ./pipelight.patch + ./wine-6.13-new-args.patch + ]; configurePhase = '' patchShebangs . diff --git a/nixpkgs/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/nixpkgs/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch new file mode 100644 index 000000000000..b67af621f64f --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch @@ -0,0 +1,42 @@ +diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c +index 80bf726..6b80f70 100644 +--- a/src/windows/pluginloader/apihook.c ++++ b/src/windows/pluginloader/apihook.c +@@ -42,7 +42,9 @@ + #include "common/common.h" + #include "pluginloader.h" + ++#define new cnew + #include <windows.h> // for PVOID and other types ++#undef new + #include <string.h> // for memset + + void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){ +diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c +index e4e38aa..19f29d5 100644 +--- a/src/windows/pluginloader/npnfunctions.c ++++ b/src/windows/pluginloader/npnfunctions.c +@@ -41,7 +41,9 @@ + #include "common/common.h" + #include "pluginloader.h" + ++#define new cnew + #include <windows.h> ++#undef new + + /* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */ + NPP shockwaveInstanceBug = NULL; +diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c +index 8f1170a..99dbceb 100644 +--- a/src/windows/pluginloader/pluginloader.c ++++ b/src/windows/pluginloader/pluginloader.c +@@ -50,7 +50,9 @@ + #include "pluginloader.h" + #include "apihook.h" + ++#define new cnew + #include <windows.h> ++#undef new + #include <objbase.h> // for CoInitializeEx + #include <GL/gl.h> + diff --git a/nixpkgs/pkgs/tools/misc/pistol/default.nix b/nixpkgs/pkgs/tools/misc/pistol/default.nix index 52c83abdf688..6d91a54e56dc 100644 --- a/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { installManPage pistol.1 ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; diff --git a/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix index 5e1ca0242bc6..6f40c08dd163 100644 --- a/nixpkgs/pkgs/tools/misc/piston-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; + propagatedBuildInputs = with python3Packages; [ rich prompt-toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 270a9ef8641d..304649a86bee 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.7"; + version = "1.2021.9"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-2hQIwUpkxLHGG+kx8AekSKJ1qO8inL8xnko0dlLC1Kg="; + sha256 = "sha256-ezyQGrJwMl2Tqv14GSQzApdDqg1RV8OWdnp4K8a1A5k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index 59bbe2c2ab1f..0a50ff49f653 100644 --- a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { - version = "2.41"; + version = "2.42"; pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; + sha256 = "1d94lp91i4y896vyc7fc3ysha700cwzsdjmmmwlm6h2zp652c73y"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index ff4e15c9cc86..4ac9d972a9a7 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.5.0"; + version = "5.3.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-RWezBNqjKybMtfpxPhDg2ysb4ksKphTPdTNTwCe4pas="; + sha256 = "sha256-wju69kC6koYy2yABjx7/rWsuJXV1vjwSBztNlu13TJs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index 5b88030849d5..00d46de8f96d 100644 --- a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -20,8 +20,6 @@ mkDerivation rec { "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Qt5 Configuration Tool"; homepage = "https://www.opendesktop.org/content/show.php?content=168066"; diff --git a/nixpkgs/pkgs/tools/misc/recutils/default.nix b/nixpkgs/pkgs/tools/misc/recutils/default.nix index 5453ab75a4a7..d6a5b517a84e 100644 --- a/nixpkgs/pkgs/tools/misc/recutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/recutils/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { - name = "recutils-1.8"; + pname = "recutils"; + version = "1.8"; src = fetchurl { - url = "mirror://gnu/recutils/${name}.tar.gz"; + url = "mirror://gnu/recutils/recutils-${version}.tar.gz"; sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz"; }; diff --git a/nixpkgs/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix index d10811ffa049..1ef0ee9dd46f 100644 --- a/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.06"; + version = "03.03.07"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s="; + sha256 = "sha256-h8lOKdHhiVT/XSIkfX7KMHzmIeEdIsFCCPkD9oo7ij0="; }; propagatedBuildInputs = tclLibraries; diff --git a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index a78d6f143a12..7766237753f9 100644 --- a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rlwrap"; - version = "0.45"; + version = "0.45.2"; src = fetchFromGitHub { owner = "hanslub42"; repo = "rlwrap"; rev = "v${version}"; - sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s"; + sha256 = "sha256-ubhAOyswdDG0mFKpnSDDq5f7umyCHsW/m721IHdjNMc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index 1f2d48b86ecb..79075dcc8a21 100644 --- a/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1h8hfyxxl4bpx8azzxj0snmzccn6xjd9vc2iyp8i2ar7aiyhf5yd"; + sha256 = "sha256-MPky0ZB7yfl/gOPThx1BpRoTgvY7mkLaoqnvGKPvSPo="; }; - cargoSha256 = "1ixjkb82863z160spylza2a5hk82x0c4wjjnzgakbzgrwv29pai3"; + cargoSha256 = "sha256-reVw8YkKi+EMDk0Bva2Ugp72VhAYB6axHonkr9Kdos4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/silicon/default.nix b/nixpkgs/pkgs/tools/misc/silicon/default.nix index 40586f6be656..ccef6ee293d3 100644 --- a/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg="; + sha256 = "sha256-yhs9BEMMFUtptd0cLsaUW02QZVhztvn8cB0nUqPnO+Y="; }; - cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI="; + cargoSha256 = "sha256-tj5HPE9EGC7JQ3dyeMPPI0/3r/idrShqfbpnVuaEtDk="; buildInputs = [ llvmPackages.libclang expat freetype fira-code ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index 1d1ed78b2faf..5ba4164346f6 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.17"; + version = "0.9.18"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa"; + sha256 = "sha256-8ALY3dsUEJxGsDnYTOxNAmJbwmmZIV8GuHjNg0vPFUQ="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 052e6198d4fb..7ad62ab9d2e0 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj"; + sha256 = "sha256-cxTBK6eZTlqEaVfWYARQk6BjNuANy39eaXC6qFs/+6k="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9"; + cargoSha256 = "sha256-TFHRDgIxqJCkcSwpdbcx8vguKU1QuTyslmAsRznxt2s="; preCheck = '' HOME=$TMPDIR diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index 847e8bb84282..ab28b8777f44 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -1,23 +1,33 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd -, libXdamage, expat }: +, gtk3, glib, systemd +, xorg, nss, nspr +, atk, at-spi2-atk, dbus +, gdk-pixbuf, pango, cairo +, expat, libdrm, mesa +, alsa-lib, at-spi2-core, cups }: let - LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ + glib gtk3 xorg.libXdamage + xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXcursor xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXrender xorg.libXtst + nss nspr atk at-spi2-atk dbus + gdk-pixbuf pango cairo + xorg.libXrandr expat libdrm + mesa alsa-lib at-spi2-core + cups + ]; in stdenv.mkDerivation rec { - version = "2.8.1"; + version = "4.0.1"; pname = "staruml"; src = - if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb"; - sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; - } else fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb"; - sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; + fetchurl { + url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb"; + sha256 = "0vxrs5y4a17bnc27fd2k2qc0vi81v677mi55znylwf3a41fjfcir"; }; nativeBuildInputs = [ makeWrapper dpkg ]; @@ -30,25 +40,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv opt/staruml $out/bin + mv opt/StarUML $out/bin mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - for binary in StarUML Brackets-node; do - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/$binary - wrapProgram $out/bin/$binary \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} - done + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/staruml + wrapProgram $out/bin/staruml \ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} ''; meta = with lib; { description = "A sophisticated software modeler"; homepage = "https://staruml.io/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 5514fd4e30f0..157b0fe63764 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0b0q4k5aacw2nna5higr6sk5lsdn62lw2l9lccfy5s3m530banni"; + sha256 = "1bsinf2r07g8c03mcw4gprl92wmysyaa81s8wyck0c6wdq3hcsnp"; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index 03d8e58f8b02..2453191d0cb8 100644 --- a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -16,13 +16,13 @@ buildGoPackage rec { # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. - buildFlagsArray = [ ''-ldflags= - -X main.version=v${version} - -X main.commit=${rev} - -X main.date="nix-byrev" - -s - -w - '' ]; + ldflags = [ + "-X main.version=v${version}" + "-X main.commit=${rev}" + "-X main.date=nix-byrev" + "-s" + "-w" + ]; nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; diff --git a/nixpkgs/pkgs/tools/misc/szyszka/default.nix b/nixpkgs/pkgs/tools/misc/szyszka/default.nix new file mode 100755 index 000000000000..61bc41b269ba --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/szyszka/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, glib +, cairo +, pango +, atk +, gdk-pixbuf +, gtk3 +}: + +rustPlatform.buildRustPackage rec { + pname = "szyszka"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "qarmin"; + repo = pname; + rev = version; + sha256 = "sha256-TQwDvkWWlk09kVVaVI56isJi+X9UXWnoz+2PVyK9BGc="; + }; + + cargoSha256 = "sha256-2uyMA2nIOPkc5+qImFn3eUVq2AxHu3Xj91TpkKswjao="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + cairo + pango + atk + gdk-pixbuf + gtk3 + ]; + + meta = with lib; { + description = "A simple but powerful and fast bulk file renamer"; + homepage = "https://github.com/qarmin/szyszka"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/nixpkgs/pkgs/tools/misc/t1utils/default.nix index 690fbe8abcb3..d581b71d16e2 100644 --- a/nixpkgs/pkgs/tools/misc/t1utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.41"; + pname = "t1utils"; + version = "1.42"; src = fetchurl { - url = "https://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; + url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; + sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; meta = with lib; { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = "http://www.lcdf.org/type/"; + homepage = "https://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE diff --git a/nixpkgs/pkgs/tools/misc/tagref/default.nix b/nixpkgs/pkgs/tools/misc/tagref/default.nix index f47a5808d063..30d00eb74d2e 100644 --- a/nixpkgs/pkgs/tools/misc/tagref/default.nix +++ b/nixpkgs/pkgs/tools/misc/tagref/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "0y1c0v2zjpav1n72pgf3kpqdz6ixp2mjhcvvza4gzfp865c236nc"; + sha256 = "sha256-PZ5ymYXn19PnvimofODh6su9zHdVoa3T7RCWPSO1Z6w="; }; - cargoSha256 = "0ca6maapn2337i78mq97199xjqk87ckw14k8kspc8kx5wnics2hl"; + cargoSha256 = "sha256-6siqfAWFoOomqcRvW+iku28FbyKCHiDzMVIUwWP8hJM="; meta = with lib; { description = "Tagref helps you refer to other locations in your codebase."; diff --git a/nixpkgs/pkgs/tools/misc/tea/default.nix b/nixpkgs/pkgs/tools/misc/tea/default.nix index a7af4fec7ba4..c968b57c60ad 100644 --- a/nixpkgs/pkgs/tools/misc/tea/default.nix +++ b/nixpkgs/pkgs/tools/misc/tea/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tea"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY="; + sha256 = "sha256-Y/Znj8vVjVt+rs+n8JRQsptq5u17G2D7r98PDxPLyd4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/misc/tealdeer/default.nix b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix index 985f2dccd682..e6b53e3c7583 100644 --- a/nixpkgs/pkgs/tools/misc/tealdeer/default.nix +++ b/nixpkgs/pkgs/tools/misc/tealdeer/default.nix @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dbrgn/tealdeer"; maintainers = with maintainers; [ davidak ]; license = with licenses; [ asl20 mit ]; + mainProgram = "tldr"; }; } diff --git a/nixpkgs/pkgs/tools/misc/teleconsole/default.nix b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix index 63277c90d47a..3bf1f5cd34b6 100644 --- a/nixpkgs/pkgs/tools/misc/teleconsole/default.nix +++ b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix @@ -25,7 +25,6 @@ buildGoPackage rec { ''; CGO_ENABLED = 1; - buildFlags = [ "-ldflags" ]; meta = with lib; { homepage = "https://www.teleconsole.com/"; diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index d9c9ad0451bb..8ca102444a9d 100644 --- a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -2,21 +2,20 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.5"; + version = "0.1.6"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ="; + sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI="; }; vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.toolVersion=${tag}" diff --git a/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 7ede307a86fb..13509af98c02 100644 --- a/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -22,6 +22,6 @@ buildPythonApplication rec { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; - maintainers = with maintainers; [ ma27 SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 2f9f436a1499..45a5edd6ae55 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "1ybj513l4953jhayrzb47dlh4yv9bkvs0q1lfvky17v9fdkxgn2j"; + sha256 = "sha256-4ZMF+RacZL9dJRCz63XPNuigTKHOW+ZcA4vB4jsnASc="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { description = "CPU, RAM, and load monitor for use with tmux"; - homepage = https://github.com/thewtex/tmux-mem-cpu-load; + homepage = "https://github.com/thewtex/tmux-mem-cpu-load"; license = licenses.asl20; maintainers = with maintainers; [ thomasjm ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index 25db7e668678..9e3b1ecc6b5a 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv"; + sha256 = "sha256-32LQiPsBjBh5LpRZuaYT+Dr/oETNTQERGqrpwWPhMTo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross diff --git a/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix b/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix new file mode 100644 index 000000000000..fc0062185b23 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, buildGoModule, lib }: + +buildGoModule rec { + pname = "traefik-certs-dumper"; + version = "2.7.4"; + + src = fetchFromGitHub { + owner = "ldez"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-exkBDrNGvpOz/VD6yfE1PKL4hzs/oZ+RxMwm/ytuV/0="; + }; + + vendorSha256 = "sha256-NmYfdX5BKHZvFzlkh/kkK0voOzNj1EPn53Mz/B7eLd0="; + excludedPackages = "integrationtest"; + + meta = with lib; { + description = "dump ACME data from traefik to certificates"; + homepage = "https://github.com/ldez/traefik-certs-dumper"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix index dbc00e13e1ae..5824e9cc4952 100644 --- a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.6.30"; + version = "0.21.7.24"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7"; + sha256 = "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5"; }; propagatedBuildInputs = [ python3Packages.psutil ]; @@ -18,8 +18,27 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - # Skip `test_user_specified` since its result depends on the mount path. - disabledTests = [ "test_user_specified" ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Create a home directory with a test file. + HOME="$(mktemp -d)" + touch "$HOME/deleteme" + + # Verify that trash list is initially empty. + [[ $($out/bin/trash-list) == "" ]] + + # Trash a test file and verify that it shows up in the list. + $out/bin/trash "$HOME/deleteme" + [[ $($out/bin/trash-list) == *" $HOME/deleteme" ]] + + # Empty the trash and verify that it is empty. + $out/bin/trash-empty + [[ $($out/bin/trash-list) == "" ]] + + runHook postInstallCheck + ''; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; diff --git a/nixpkgs/pkgs/tools/misc/triehash/default.nix b/nixpkgs/pkgs/tools/misc/triehash/default.nix new file mode 100644 index 000000000000..b916214fab52 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/triehash/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, perlPackages +}: + +stdenv.mkDerivation rec { + pname = "triehash"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "julian-klode"; + repo = pname; + rev = "debian/0.3-3"; + hash = "sha256-LxVcYj2WKHbhNu5x/DFkxQPOYrVkNvwiE/qcODq52Lc="; + }; + + nativeBuildInputs = [ + perlPackages.perl + ]; + + postPatch = '' + patchShebangs triehash.pl + ''; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/share/doc/${pname}/ $out/share/${pname}/ + install triehash.pl $out/bin/triehash + install README.md $out/share/doc/${pname}/ + cp -r tests/ $out/share/${pname}/tests/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/julian-klode/triehash"; + description = "Order-preserving minimal perfect hash function generator"; + license = with licenses; mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = perlPackages.perl.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/twurl/Gemfile b/nixpkgs/pkgs/tools/misc/twurl/Gemfile new file mode 100644 index 000000000000..55b6e9f5650b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/twurl/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'twurl' diff --git a/nixpkgs/pkgs/tools/misc/twurl/Gemfile.lock b/nixpkgs/pkgs/tools/misc/twurl/Gemfile.lock new file mode 100644 index 000000000000..d29268e656dd --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/twurl/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + oauth (0.5.6) + twurl (0.9.6) + oauth (~> 0.4) + +PLATFORMS + ruby + +DEPENDENCIES + twurl + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/twurl/default.nix b/nixpkgs/pkgs/tools/misc/twurl/default.nix new file mode 100644 index 000000000000..dccb67fbaf6c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/twurl/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "twurl"; + gemdir = ./.; + exes = [ "twurl" ]; + + passthru.updateScript = bundlerUpdateScript "twurl"; + + meta = with lib; { + description = "OAuth-enabled curl for the Twitter API"; + homepage = "https://github.com/twitter/twurl"; + license = "MIT"; + maintainers = with maintainers; [ brecht ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/twurl/gemset.nix b/nixpkgs/pkgs/tools/misc/twurl/gemset.nix new file mode 100644 index 000000000000..a1a2ed835d3e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/twurl/gemset.nix @@ -0,0 +1,23 @@ +{ + oauth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; + type = "gem"; + }; + version = "0.5.6"; + }; + twurl = { + dependencies = ["oauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jgsxa0cnkajnsxxlsrgl2wq3m7khaxvr0rcir4vwbc1hx210700"; + type = "gem"; + }; + version = "0.9.6"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index d9e454d4ab81..6c559ada9632 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -28,19 +28,19 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ZsZyV6zlMiNTVYPwqQi7F1OJ4hV33IqrrGkvUb8JaY="; + sha256 = "sha256-10e0cWt6XW8msNR/RXbaOpdwTAlRLm6jVvDed905rho="; }; - cargoSha256 = "sha256-t6KeyBwIfCQTfaennFiFX3K+8unFOsduBP7nRbAo9wI="; + cargoSha256 = "sha256-ezQ/tX/uKzJprLQt2xIUZwGuUOmuRmTO+gPsf3MLEv8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] - ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; @@ -53,7 +53,16 @@ rustPlatform.buildRustPackage rec { # dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled # compilation fails because of a missing http2 include doCheck = !stdenv.isDarwin; - checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1"; + # healthcheck_grafana_cloud is trying to make a network access + # test_stream_errors is flaky on linux-aarch64 + checkPhase = '' + TZDIR=${tzdata}/share/zoneinfo cargo test \ + --no-default-features \ + --features ${lib.concatStringsSep "," features} \ + -- --test-threads 1 \ + --skip=sinks::loki::tests::healthcheck_grafana_cloud \ + --skip=kubernetes::api_watcher::tests::test_stream_errors + ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. diff --git a/nixpkgs/pkgs/tools/misc/vial/default.nix b/nixpkgs/pkgs/tools/misc/vial/default.nix index c8d38d826d1f..5685141e4465 100644 --- a/nixpkgs/pkgs/tools/misc/vial/default.nix +++ b/nixpkgs/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.4"; + version = "0.4.1"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; + sha256 = "sha256-aN0wvgahWPNSXP/JmV1JWaEnARIOTyRdz1ko6eC7Y5s="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -26,7 +26,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; - license = licenses.gpl2Only; + license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes ]; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/tools/misc/vsh/default.nix b/nixpkgs/pkgs/tools/misc/vsh/default.nix index 13a3df4d6b94..416dd4bfcc13 100644 --- a/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = null; # make sure version gets set at compile time - buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; meta = with lib; { description = "HashiCorp Vault interactive shell"; diff --git a/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/nixpkgs/pkgs/tools/misc/wimboot/default.nix index 04dbca9ed63f..538f5113fd8d 100644 --- a/nixpkgs/pkgs/tools/misc/wimboot/default.nix +++ b/nixpkgs/pkgs/tools/misc/wimboot/default.nix @@ -1,38 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: +{ lib, stdenv, fetchFromGitHub, libbfd, zlib, libiberty }: stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.6.0"; + version = "2.7.3"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "134wqqr147az5vbj4szd0xffwa99b4rar7w33zm3119zsn7sd79k"; + sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70"; }; - NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 - - patches = [ - # Fixes for newer binutils - # Add R_X86_64_PLT32 as known reloc target - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; - sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; - }) - # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*) - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch"; - sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf"; - }) - ]; - - # We cannot use sourceRoot because the patch wouldn't apply - postPatch = '' - cd src - ''; - - hardeningDisable = [ "pic" ]; + sourceRoot = "source/src"; buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/nixpkgs/pkgs/tools/misc/wlc/default.nix b/nixpkgs/pkgs/tools/misc/wlc/default.nix index 874e31ca6ef1..dd7c5f7942f8 100644 --- a/nixpkgs/pkgs/tools/misc/wlc/default.nix +++ b/nixpkgs/pkgs/tools/misc/wlc/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "wlc"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256:0ysx250v2qycy1m3jj0wxmyf2f5n8fxf6br69vcbyq2cnqw609nx"; + sha256 = "sha256:01c1qxq6dxvpn8rgpbqs4iw5daa0rmlgygb3xhhfj7xpqv1v84ir"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/nixpkgs/pkgs/tools/misc/woeusb/default.nix index ade752e09f66..23d1f9cccbe4 100644 --- a/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -2,14 +2,14 @@ , coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wimlib, wget }: stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.1.2"; pname = "woeusb"; src = fetchFromGitHub { owner = "WoeUSB"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "1qakk7lnj71m061rn72nabk4c37vw0vkx2a28xgxas8v8cwvkkam"; + sha256 = "sha256-7NuUCo1uN6RZIpdDJFZr1DULrr4UNcXdPzx9A5t79O8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix index 2069ba6b1593..77491f22f987 100644 --- a/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA="; + sha256 = "sha256-P22DMmR+z2kl05SkOsbjFHFz9I5cu4W6EaYLpd1a0mg="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 209072da3b0b..cb3beca97038 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210502"; + version = "20210808"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-HkhyxsiOMOfTHTj+qmY8l2z2sMtO4eMZmJUU/WvV4wY="; + sha256 = "sha256-pHre4R0zVML1Stp0H4E3ee9Xbb3KNLgZFWOJPC5KTA8="; }; propagatedBuildInputs = with python3Packages; [ @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/nixpkgs/pkgs/tools/misc/you-get/default.nix b/nixpkgs/pkgs/tools/misc/you-get/default.nix index f58fb349c959..dd2115f99bff 100644 --- a/nixpkgs/pkgs/tools/misc/you-get/default.nix +++ b/nixpkgs/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1500"; + version = "0.4.1545"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; + sha256 = "63e9b0527424c565303fe3d8ede1cd35d48a4ecf4afe72e1c12b0e90b9fdcd39"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix new file mode 100644 index 000000000000..9cb2d1dea0da --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ffmpeg +, rtmpdump +, phantomjs2 +, atomicparsley +, pycryptodome +, websockets +, mutagen +, ffmpegSupport ? true +, rtmpSupport ? true +, phantomjsSupport ? false +, hlsEncryptedSupport ? true +}: + +buildPythonPackage rec { + pname = "yt-dlp"; + # The websites yt-dlp deals with are a very moving target. That means that + # downloads break constantly. Because of that, updates should always be backported + # to the latest stable release. + version = "2021.9.2"; + + src = fetchPypi { + inherit pname; + version = builtins.replaceStrings [ ".0" ] [ "." ] version; + sha256 = "sha256-yn53zbBVuiaD31sIB6qxweEgy+AsjzXZ0yk9lNva6mM="; + }; + + # build_lazy_extractors assumes this directory exists but it is not present in + # the PyPI package + postPatch = '' + mkdir -p ytdlp_plugins/extractor + ''; + + propagatedBuildInputs = [ websockets mutagen ] + ++ lib.optional hlsEncryptedSupport pycryptodome; + + # Ensure these utilities are available in $PATH: + # - ffmpeg: post-processing & transcoding support + # - rtmpdump: download files over RTMP + # - atomicparsley: embedding thumbnails + makeWrapperArgs = + let + packagesToBinPath = [ atomicparsley ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional phantomjsSupport phantomjs2; + in + [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; + + setupPyBuildFlags = [ + "build_lazy_extractors" + ]; + + # Requires network + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/yt-dlp/yt-dlp/"; + description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; + changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; + longDescription = '' + yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. + + 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.unlicense; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ytmdl/default.nix b/nixpkgs/pkgs/tools/misc/ytmdl/default.nix index 43f46bc05231..90a0590b8d95 100644 --- a/nixpkgs/pkgs/tools/misc/ytmdl/default.nix +++ b/nixpkgs/pkgs/tools/misc/ytmdl/default.nix @@ -1,44 +1,32 @@ { lib -, fetchFromGitHub -, python3 -, fetchpatch +, python3Packages , ffmpeg }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ytmdl"; - version = "2021.06.26"; + version = "2021.08.01"; - src = fetchFromGitHub { - owner = "deepjyoti30"; - repo = pname; - rev = version; - sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p"; + src = python3Packages.fetchPypi { + inherit pname; + version = builtins.replaceStrings [ ".0" ] [ "." ] version; + sha256 = "f5ef23dcba89aaf2307baf4ffc2326dc5c02324f646e5e5748219ed328202af4"; }; - patches = [ - # Fixes https://github.com/deepjyoti30/ytmdl/issues/188 - # Only needed until the next major release after 2021.06.26 - (fetchpatch { - url = "https://github.com/deepjyoti30/ytmdl/commit/37ba821d9692249c1fa563505cf60bd11b8e209e.patch"; - includes = [ "bin/ytmdl" ]; - sha256 = "sha256-VqtthpUL0Oub3DK7tSvAnemOzPPTcLvXXeebZIGOgdc="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" + --replace "bs4" "beautifulsoup4" \ + --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ + --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" ''; - - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ ffmpeg-python musicbrainzngs rich simber pydes - youtube-search + youtube-search-python unidecode pyxdg downloader-cli @@ -48,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { pysocks youtube-dl ytmusicapi + spotipy ]; makeWrapperArgs = [ diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index cb575adf75ee..5ef75778f254 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1jqibv7na9h2r8nxgzp40j9qpyiwx97c65krivkcqjwdjk5lrahl"; + sha256 = "sha256-54HvuJXjm846sBxwNHLmaBXvO24bbBDyK8YvY4I6LjY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index ed4f76fa6270..cf2226cad54c 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,15 +1,20 @@ -{ python3Packages, fetchurl, lib, - yubikey-personalization, libu2f-host, libusb1 }: +{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1 }: python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.3"; + version = "4.0.5"; - srcs = fetchurl { - url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ="; + src = fetchFromGitHub { + repo = "yubikey-manager"; + rev = version; + owner = "Yubico"; + sha256 = "sha256:0ycp7k6lkxzqwkc16fifhyqaqi7hl3351pwddsn18r5l83jnzdn2"; }; + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ click diff --git a/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 79be68c8d566..cee704e93812 100644 --- a/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.12"; + version = "1.8.13"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ="; + sha256 = "sha256-74EWeLkSRrVsJuucdN8sSTl5fPmboViYW0qdovBZQ5U="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index a28cf27ab1a1..7a66c7f92c58 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-M83J28aG4NACBZtCJzYNU7aYNTJILAboaDv5aAo35OM="; + sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-aF0vdudOFBcDrHpgsS7+HNE70GTNPdBOmbvQhLwmsM0="; + cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs="; postInstall = '' installManPage man/* |