diff options
Diffstat (limited to 'pkgs/tools')
55 files changed, 404 insertions, 267 deletions
diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index c22c6c0eb38ab..2b2aac5f66b07 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchurl -, netcdf, xlibsWrapper, xorg, udunits, expat +{ lib +, stdenv +, fetchurl +, expat +, libpng +, udunits +, netcdf +, xorg }: let @@ -14,7 +20,17 @@ in stdenv.mkDerivation { sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; }; - buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ]; + buildInputs = [ + expat + libpng + netcdf + udunits + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXaw + xorg.libXt + ]; meta = with lib; { description = "Visual browser for netCDF format files"; diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 3700c6ee81e4b..c00593d71951a 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xFAJrJSVf7wgJPUELCiwZVK0nBeOChuJBKROeJIRURc="; + sha256 = "sha256-voCFr5rb9VBSG926SeE2cMuk1gJskoaqjvkRY/9TZFU="; }; vendorSha256 = "sha256-f0HrQzHK1JDWmRrnqG/N4X8TG0DP/IRWd6b7QR/vyzo="; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 5f0b754e8ddb9..42daa857c1632 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "pulumi"; - version = "3.43.1"; + version = "3.46.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-LbPXCwU6aJp+z5scfej5Reo2X8QUvZpASWkcDBBF1J0="; + hash = "sha256-bEAggHGMhSSwEiYj+DdJRajR4DLunpidbd4DflkBrQ8="; }; - vendorSha256 = "sha256-APGiCqHdXDRCFx0W8RDeL89sskYZ2vzdpg4ePE7KixA="; + vendorSha256 = "sha256-+JKCCNkByqWuvAv8qUL3L9DlDhvIbMsDbsfn3KYolUo="; sourceRoot = "source/pkg"; @@ -62,6 +62,7 @@ buildGoModule rec { # Code generation tests also download dependencies from network rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go + rm -R codegen/{dotnet,go,nodejs,python}/gen_program_test '' + lib.optionalString stdenv.isDarwin '' export PULUMI_HOME=$(mktemp -d) ''; diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix index 530094b8506c6..fa01756f89825 100644 --- a/pkgs/tools/audio/isrcsubmit/default.nix +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { # drutil is required on Darwin, which does not seem to be available in nixpkgs - broken = stdenv.isDarwin; + broken = true; # 2022-11-16 description = "Script to submit ISRCs from disc to MusicBrainz"; license = licenses.gpl3Plus; homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/"; diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix new file mode 100644 index 0000000000000..4d98fce5c60a2 --- /dev/null +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, darwin, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "rustic-rs"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "rustic-rs"; + repo = "rustic"; + rev = "v${version}"; + hash = "sha256-MGFtJUfPK6IH3w8xe/RZaXS+QDIVS3jFSnf4VYiSLM4="; + }; + + cargoHash = "sha256-siJrqL7HjUQvcyXpUN5rQWNeQNBc+693N1xTSvlOixI="; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; + + postInstall = '' + for shell in {ba,fi,z}sh; do + $out/bin/rustic completions $shell > rustic.$shell + done + + installShellCompletion rustic.{ba,fi,z}sh + ''; + + meta = { + homepage = "https://github.com/rustic-rs/rustic"; + changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt"; + description = "fast, encrypted, deduplicated backups powered by pure Rust"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = [ lib.licenses.mit lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.nobbz ]; + }; +} diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index c175eb45aa0da..f13a17e01f791 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "isolyzer"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "KBNLresearch"; repo = pname; - rev = version; - sha256 = "1fysm05cz0z54apn1p889xhbgjnfwax6fngi05yij5qp2zxqghf9"; + rev = "refs/tags/${version}"; + sha256 = "sha256-NqkjnEwpaoyguG5GLscKS9UQGtF9N4jUL5JhrMtKCFE="; }; propagatedBuildInputs = with python3.pkgs; [ setuptools six ]; diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 0b337f6133665..1b943b3e41ab6 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,7 +1,6 @@ { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform , enableCfp ? true , enableCuda ? false -, enableExamples ? true , enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true @@ -9,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zfp"; - version = "0.5.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "zfp"; rev = version; - sha256 = "19ycflz35qsrzfcvxdyy0mgbykfghfi9y5v684jb4awjp7nf562c"; + sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ="; }; nativeBuildInputs = [ cmake ]; @@ -25,27 +24,24 @@ stdenv.mkDerivation rec { ++ lib.optional enableOpenMP llvmPackages.openmp ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]); + # compile CUDA code for all extant GPUs so the binary will work with any GPU + # and driver combination. to be ultimately solved upstream: + # https://github.com/LLNL/zfp/issues/178 + # NB: not in cmakeFlags due to https://github.com/NixOS/nixpkgs/issues/114044 + preConfigure = lib.optionalString enableCuda '' + cmakeFlagsArray+=( + "-DCMAKE_CUDA_FLAGS=-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_87,code=sm_87 -gencode=arch=compute_86,code=compute_86" + ) + ''; + cmakeFlags = [ - # More tests not enabled by default - ''-DZFP_BINARY_DIR=${placeholder "out"}'' - ''-DZFP_BUILD_TESTING_LARGE=ON'' - ] - ++ lib.optionals targetPlatform.isDarwin [ - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - ] - ++ lib.optional enableCfp "-DBUILD_CFP=ON" + ] ++ lib.optional enableCfp "-DBUILD_CFP=ON" ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON" - ++ lib.optional enableExamples "-DBUILD_EXAMPLES=ON" ++ lib.optional enableFortran "-DBUILD_ZFORP=ON" ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON" ++ lib.optional enablePython "-DBUILD_ZFPY=ON" ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]); - preCheck = lib.optional targetPlatform.isDarwin '' - export DYLD_LIBRARY_PATH="$out/lib:$DYLD_LIBRARY_PATH" - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/tools/filesystems/netatalk/no-suid.patch b/pkgs/tools/filesystems/netatalk/000-no-suid.patch index 194c1f5fac9f4..194c1f5fac9f4 100644 --- a/pkgs/tools/filesystems/netatalk/no-suid.patch +++ b/pkgs/tools/filesystems/netatalk/000-no-suid.patch diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch index 01c4ee9ba478d..01c4ee9ba478d 100644 --- a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch +++ b/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index dec4739654603..07bab154f09ae 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,19 +1,35 @@ -{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3, db -, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, libtirpc, libevent -, fetchpatch }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, acl +, autoreconfHook +, avahi +, db +, ed +, libevent +, libgcrypt +, libiconv +, libtirpc +, openssl +, pam +, perl +, pkg-config +, python3 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; version = "3.1.13"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; - sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0="; }; patches = [ - ./no-suid.patch - ./omitLocalstatedirCreation.patch + ./000-no-suid.patch + ./001-omit-localstatedir-creation.patch (fetchpatch { name = "make-afpstats-python3-compatible.patch"; url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; @@ -84,9 +100,24 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + python3 + python3.pkgs.wrapPython + ]; - buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; + buildInputs = [ + acl + avahi + db + libevent + libgcrypt + libiconv + openssl + pam + ]; configureFlags = [ "--with-bdb=${db.dev}" @@ -119,11 +150,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Apple Filing Protocol Server"; homepage = "http://netatalk.sourceforge.net/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jcumming ]; }; -} +}) diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix index 225cddd8418b3..f7931ded7bb03 100644 --- a/pkgs/tools/games/minecraft/packwiz/default.nix +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "packwiz"; - version = "unstable-2022-08-25"; + version = "unstable-2022-10-29"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "11671421acff9794b9ca5c7e083a514f8a3f55a4"; - sha256 = "sha256-A+DVRi0YByF4WP/okqhWrKRmci2ybAvbXYmODScIrYg="; + rev = "f00dc9844ffdd6ee5c0526a79b0084429e9cb130"; + sha256 = "sha256-YpihFWdcKfHJLEs+jHzHH7G+m/E8i5y2yp7IubObNhY="; }; vendorSha256 = "sha256-09S8RFdCvtE50EICLIKCTnTjG/0XsGf+yq9SNObKmRA="; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix deleted file mode 100644 index efa46b3b608a4..0000000000000 --- a/pkgs/tools/graphics/appleseed/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, -eigen, libpng, python3, libGLU, qt4, openexr, openimageio, -opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper -}: - -let boost_static = boost165.override { - enableStatic = true; - enablePython = true; - python = python3; -}; -in stdenv.mkDerivation rec { - - pname = "appleseed"; - version = "2.0.5-beta"; - - src = fetchFromGitHub { - owner = "appleseedhq"; - repo = "appleseed"; - rev = version; - sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5"; - }; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ - boost_static guile eigen libpng python3 - libGLU qt4 openexr openimageio opencolorio_1 xercesc - osl seexpr - ]; - - NIX_CFLAGS_COMPILE = toString [ - "-I${openexr.dev}/include/OpenEXR" - "-I${ilmbase.dev}/include/OpenEXR" - "-I${openimageio.dev}/include/OpenImageIO" - - "-Wno-unused-but-set-variable" - "-Wno-error=class-memaccess" - "-Wno-error=maybe-uninitialized" - "-Wno-error=catch-value" - "-Wno-error=stringop-truncation" - ]; - - cmakeFlags = [ - "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" - "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON" - "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" - "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" - "-DWITH_PYTHON=ON" - "-DWITH_DISNEY_MATERIAL=ON" - "-DUSE_SSE=ON" - "-DUSE_SSE42=ON" - ]; - - meta = with lib; { - description = "Open source, physically-based global illumination rendering engine"; - homepage = "https://appleseedhq.net/"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.mit; - platforms = platforms.linux; - }; - - # Work around a bug in the CMake build: - postInstall = '' - chmod a+x $out/bin/* - wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python3} - ''; -} - -# TODO: Is the below problematic? - -# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message): -# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when -# available. Run "cmake --help-policy CMP0072" for policy details. Use the -# cmake_policy command to set the policy and suppress this warning. -# -# FindOpenGL found both a legacy GL library: -# -# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so -# -# and GLVND libraries for OpenGL and GLX: -# -# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so -# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so -# -# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for -# compatibility with CMake 3.10 and below the legacy GL library will be used. diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 3c7ae47991bc1..7751ecdf25eb5 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-Hlowm+wtj3bJBGJd/JndOaGC6iSdab3sURUjzshqh+k="; + sha256 = "sha256-KAm4ng+FIMmhHAxoFNNVo48GVbW3c+raX6Hcab+KCf8="; }; - cargoSha256 = "sha256-Ir3u57nCBgzEuwaOzx8z71cxXmrIJLkURhuwFRoB2Xw="; + cargoSha256 = "sha256-xbE1Olf0lh6o4kF9ubZhdnTbZsJcd5TvLf7P1nWLf9Q="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index edebe1e60c2f0..ad75d6667dab5 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.0.1"; + version = "11.0.2"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4448"; - sha256 = "LWnEalfott+q/pcqhQYJ1ifJh+lZ2lZbpCMd+jR9/vQ="; + rev = "4468"; + sha256 = "EW96q9DsM1lQ3QZAmp0hZhQ6icsZFDGa3wYmjCQmBRE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 46db77695ef86..66ce5b04cd7f9 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - hash = "sha256-NnZhOQ/I7wbGlWkSXFXEV96UfG+GPMz1VSiEc9TwI6Y="; + hash = "sha256-VH+wZyVnfPqFxRwITU/LzkOAexFKm39LlcFxzhjRMdY="; }; inherit patches; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index d58df8bd2478a..c20fd50453ec9 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,16 +18,23 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-2ZuFZ2PHhbxNTmGdlZONgPfEJC7lI5Rc6dgiBj7VG2o="; + sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M="; }; patches = lib.optionals withPantheon [ + # Required for the next patch to apply + # Reverts https://github.com/JoseExposito/touchegg/pull/603 + (fetchpatch { + url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch"; + sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g="; + revert = true; + }) # Disable per-application gesture by default to make sure the default # config does not conflict with Pantheon switchboard settings. (fetchpatch { diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/tools/misc/addlicense/default.nix index 7980185bca426..a01ae0de0834e 100644 --- a/pkgs/tools/misc/addlicense/default.nix +++ b/pkgs/tools/misc/addlicense/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "addlicense"; - version = "unstable-2021-04-22"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = "addlicense"; - rev = "13e73a7f8fcb5696256b6a7b7addabf1070ad4b9"; - sha256 = "sha256-UiJaTWCBup/Ub9NZIvkb67TvcUllV/AmYAKVO4egRqc="; + rev = "v${version}"; + sha256 = "sha256-Vi+U0b9tTJitStZr1wSotr82Y2gA4IjvHLAa+rwGH/g="; }; vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix index 3cbea01be8a71..0abc2206b01c4 100644 --- a/pkgs/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -1,22 +1,23 @@ { lib , stdenv , fetchurl +, libtool , ncurses -, withLibrary ? false, libtool +, withLibrary ? false , unicodeSupport ? true , enableShared ? !stdenv.isDarwin }: assert withLibrary -> libtool != null; -assert unicodeSupport -> ncurses.unicodeSupport && ncurses != null; +assert unicodeSupport -> ncurses != null && ncurses.unicodeSupport; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dialog"; - version = "1.3-20211214"; + version = "1.3-20220728"; src = fetchurl { - url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks="; + url = "ftp://ftp.invisible-island.net/dialog/dialog-${finalAttrs.version}.tgz"; + hash = "sha256-VEGJc9VZpGGwBpX6/mjfYvK8c9UGtDaCHXfKPfRUGQs="; }; buildInputs = [ @@ -25,9 +26,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-rpath-hacks" - (lib.withFeature withLibrary "libtool") - "--with-ncurses${lib.optionalString unicodeSupport "w"}" + "--${if withLibrary then "with" else "without"}-libtool" "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" + "--with-ncurses${lib.optionalString unicodeSupport "w"}" ]; installTargets = [ @@ -41,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres spacefrogg ]; inherit (ncurses.meta) platforms; }; -} +}) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index a06237b33a7d9..1bd0fcc29812a 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-MiVscWYq2Y9EaupSYbTA9bsToLoIVhHCNE2Kj0GpkPw="; + sha256 = "sha256-MGdo145qdm/uOiVJfuxy1vblgJjPGQWf3i58xpAWIkQ="; }; - vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8="; + vendorSha256 = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index b66a59c960f69..68aa12eeb6643 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-Ns758mqz4O8hKpu3LHFFm1U1vxF1TJZ4GKstWADXOl0="; + sha256 = "sha256-P03L3UbXAlNUUwAwDqsIIs/ECB6s3GqCESbPK4AgnYg="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix new file mode 100644 index 0000000000000..bea127acb008f --- /dev/null +++ b/pkgs/tools/misc/moar/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "moar"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "walles"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cFXUspVSCUy0q5CW8K+YL/LBpK87qlPys8hg6AYvg5M="; + }; + + vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ./moar.1 + ''; + + meta = with lib; { + description = "Nice-to-use pager for humans"; + homepage = "https://github.com/walles/moar"; + license = licenses.bsd2WithViews; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 669ad1d3aea2a..8c110b89bbd21 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fr4Emw8S7Uu0I08Yxha+hzZF54cJZ8UQgWF4GGvWDu0="; + sha256 = "sha256-tH1aYMjKsSMWls53IgsqtAgMMLUvotb5zGlAmV3dlvQ="; }; - vendorSha256 = "sha256-P6FnDp+nEEZM/7uvSb9Zkrn2zLha816A82xN2AFNgWc="; + vendorSha256 = "sha256-nRH26ty3JVSz2ZnrZ+owTj2fponnvYkrASQxcJXm8aE="; doCheck = false; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 18b5854820263..8311290feb848 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,42 +1,64 @@ -{ fetchFromGitHub +{ lib , rustPlatform -, lib -, stdenv +, fetchFromGitHub +, cmake +, installShellFiles , pkg-config , zstd +, stdenv , CoreFoundation -, libiconv , libresolv , Security +, git }: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.12.0"; + version = "2.13.2"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nSvqAXzA/4CSnOMCZri2ks58bW+9v+SoyIIzb+K5S88="; + sha256 = "sha256-ydRdnzOI9syfF2ox9vHA9Q0j8C7ZNb0b7CJfqUprPA0="; }; + cargoSha256 = "sha256-IprUSNxoojagXUO/I7WDGJMG0U541ioe4qgLT4hqmbY="; + cargoPatches = [ # enable pkg-config feature of zstd ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-uSef6x5QkXKwajglbwyoIsUFGbz0zntVM1ko0FZqnck="; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ cmake installShellFiles pkg-config ]; buildInputs = [ zstd ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ]; + + checkInputs = [ + git + ]; + + preCheck = '' + git init + git config user.name nixbld + git config user.email nixbld@example.com + git add . + git commit -m test + ''; + + postInstall = '' + installShellCompletion --cmd onefetch \ + --bash <($out/bin/onefetch --generate bash) \ + --fish <($out/bin/onefetch --generate fish) \ + --zsh <($out/bin/onefetch --generate zsh) + ''; meta = with lib; { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; + changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne kloenk SuperSandro2000 ]; + maintainers = with maintainers; [ Br1ght0ne figsoda kloenk SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch index 24b95f1ca18b7..efe2482f9552d 100644 --- a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch +++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch @@ -1,31 +1,26 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 202cda0..bc864cc 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -872,6 +872,7 @@ dependencies = [ +@@ -2039,6 +2039,7 @@ dependencies = [ "tokei", "toml", "yaml-rust", -+ "zstd-sys", ++ "zstd", ] [[package]] -@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" +@@ -3286,4 +3287,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", + "pkg-config", ] -diff --git a/Cargo.toml b/Cargo.toml -index 8e0b5ff..48959b4 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -57,6 +57,8 @@ libc = "0.2.112" - [dev-dependencies] - more-asserts = "0.2" - paste = "1.0.7" -+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library -+zstd-sys = { version = "1", features = [ "pkg-config" ] } +@@ -58,6 +58,7 @@ time-humanize = { version = "0.1.3", features = ["time"] } + tokei = "12.1.2" + toml = "0.5.9" + yaml-rust = "0.4.5" ++zstd = { version = "*", features = ["pkg-config"] } - [features] - fail-on-deprecated = [] + [target.'cfg(windows)'.dependencies] + enable-ansi-support = "0.1.2" diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 0602f9d19d83d..73837f0ef644f 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -8,6 +8,7 @@ , pkg-config , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd , utf8proc +, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: let @@ -44,12 +45,14 @@ stdenv.mkDerivation rec { ncurses libevent ] ++ lib.optionals withSystemd [ systemd ] - ++ lib.optionals stdenv.isDarwin [ utf8proc ]; + ++ lib.optionals stdenv.isDarwin [ utf8proc ] + ++ lib.optionals withUtempter [ libutempter ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optionals withSystemd [ "--enable-systemd" ] + ++ lib.optionals withUtempter [ "--enable-utempter" ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 213a44488881a..26d7ac3971d72 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-RbcycZPTZFxvtgwcjZ8d0LUiSzBtMyFxyC0AcwKGlv4="; + sha256 = "sha256-eHFqczZtJWcZ4ZVOzpCUlVoCJ7wjyWNpFfiZ9MaJHOI="; }; - vendorSha256 = "sha256-/f1uzil3FtKLByFI5qp2Tc52/lajCbx5sNBRRJzjWN8="; + vendorSha256 = "sha256-50UDRf8S9Yl0zwGOrFLa5L1TmSKF4RQ/ju0tnFzs56M="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index 9b8bf0fb2ce4d..68ac50221b686 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well ''; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ georgesalkhouri ]; }; } diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 95fea4dac0f91..2d80665c00f62 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/GUPnP"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 57ed93d8130e3..0f31ef01cf226 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man , apparmorRulesFromClosure +, libxcrypt }: stdenv.mkDerivation rec { @@ -18,8 +19,9 @@ stdenv.mkDerivation rec { ./inetutils-1_9-PATH_PROCNET_DEV.patch ]; + strictDeps = true; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; - buildInputs = [ ncurses /* for `talk' */ ]; + buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; # Don't use help2man if cross-compiling # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index a29c426b2893b..fa3070eb31e51 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { hash = "sha256-UQq5TqK83I44ANU0yXD8YUTQWvBFLiAxmLSRtKUJ5WE="; }; + patches = [ + # disable tests which fail in NixOS sandbox (trying to access the network) + ./sandbox_tests.patch + ]; + # technically not needed as we do not support the paid maxmind databases, but # keep it around if someone wants to add support and /usr/share/GeoIP is # broken anyway diff --git a/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/pkgs/tools/networking/ipcalc/sandbox_tests.patch new file mode 100644 index 0000000000000..d0a246843589f --- /dev/null +++ b/pkgs/tools/networking/ipcalc/sandbox_tests.patch @@ -0,0 +1,59 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 536c169..0ce23f1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -64,54 +64,6 @@ test('RandomIPv6Explicit', + ipcalc.full_path() + ' -6 -r 24' + '|grep Address' + ] + ) +-test('HostnameIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -6 -o localhost', +- files('hostname-localhost-ipv6') +- ] +-) +-test('HostnameIPv4Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -4 -o localhost', +- files('hostname-localhost-ipv4') +- ] +-) +-test('HostnameIPv4LocalhostJson', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -j -4 -o localhost', +- files('hostname-localhost-ipv4-json') +- ] +-) +-test('IPIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h ::1', +- files('ip-localhost-ipv6') +- ] +-) +-test('IPIPv4Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h 127.0.0.1', +- files('ip-localhost-ipv4') +- ] +-) +-test('IPIPv4LocalhostJson', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -j -h 127.0.0.1', +- files('ip-localhost-ipv4-json') +- ] +-) + # --class-prefix tests + test('AssignClassPrefix12', + testrunner, diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e03e013f9ba0a..466ba57152874 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" + # darwin special-casing just causes trouble + substituteInPlace ./m4macros/ax_crypto.m4 --replace 'apple-darwin' 'nope' ''; outputs = [ diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 22ae4cb210c27..6107efff7871f 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-9/46EwvpihnEkUee9g82uO5Bqea8TX8sQQM/Y5VqMSY="; + sha256 = "sha256-47ORZQx7pnzqL+hNZ/201/yKoexc+G64u5hHEd+EZak="; }; configureFlags = [ diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 78066efab532e..84dc5db9c1a5b 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -2,16 +2,15 @@ let pname = "minidlna"; - version = "1.3.1"; + version = "1.3.2"; in stdenv.mkDerivation { inherit pname version; - # tarball for 1.3.1 is missing src = fetchgit { url = "https://git.code.sf.net/p/${pname}/git"; rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nbvz/QHSZBTZEqX/utOoOF5vorhrxGqIBA9qfpIZzyU="; + hash = "sha256-v+puglrbuLqHIAbrO7bhOA0npc/GYp0Bdi3DnD9qyII="; }; preConfigure = '' diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index bea16b809d198..45ef93462aeed 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { patches = [ ./ssh_path.patch ./mosh-client_path.patch - ./utempter_path.patch # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch ]; diff --git a/pkgs/tools/networking/mosh/utempter_path.patch b/pkgs/tools/networking/mosh/utempter_path.patch deleted file mode 100644 index a981708ffadf2..0000000000000 --- a/pkgs/tools/networking/mosh/utempter_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur mosh-1.3.2/src/frontend/mosh-server.cc mosh-1.3.2.patched/src/frontend/mosh-server.cc ---- mosh-1.3.2/src/frontend/mosh-server.cc 2017-07-22 23:14:53.000000000 +0200 -+++ mosh-1.3.2.patched/src/frontend/mosh-server.cc 2018-06-06 10:45:50.725352804 +0200 -@@ -351,6 +351,10 @@ - } - } - -+#ifdef HAVE_UTEMPTER -+ utempter_set_helper( "utempter" ); -+#endif -+ - try { - return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd ); - } catch ( const Network::NetworkException &e ) { diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index d8641cb29d947..b3e60ec45de8d 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -21,13 +21,13 @@ let pname = "mozillavpn"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-am2acceDig7tjhkO5GiWfvkq0Mabyxedbc8mR49SXBU="; + hash = "sha256-QXxZ6RQwXrVsaZRkW13r7aoz8iHxuT0nW/2aFDpLLzU="; }; netfilter-go-modules = (buildGoModule { @@ -40,14 +40,14 @@ let inherit src; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-sw6iylh3SgCDA1z/xvwNGWrCU2xr7IVPUL4fdOi43lc="; + hash = "sha256-BRUUEDIVQoF+FuKnoBzFbMyeGOgGb6/boYSaftZPF2U="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-gBJIzTTo6i415aHwUsBriokUt2K/r55QCpC6Tv8GXh4="; + hash = "sha256-oSO7KS4aBwSVYIyxmWTXKn0CL9t6CDR/hx+0+nbf/dM="; }; in @@ -108,7 +108,7 @@ stdenv.mkDerivation { substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - substituteInPlace src/connectionbenchmark/benchmarktaskdownload.cpp \ + substituteInPlace src/connectionbenchmark/benchmarktasktransfer.cpp \ --replace 'QT_VERSION >= 0x060400' 'false' ln -s '${netfilter-go-modules}' linux/netfilter/vendor diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index a9a56f2911e35..2322940907a0f 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KxayfMtLRLJfeSU8MXigOA02jBKBP6COFDI2iZeOrA8="; + sha256 = "sha256-hl2ZXfsgoZxGE/fWfkSwwIYIS/CvIZySeGjORY1Va3E="; }; vendorSha256 = "sha256-owksab5MgRomiBp5p48VILJj+CmgCLDkB1sOHRNA3uQ="; diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix index 449f15fb1eb9e..48df540616422 100644 --- a/pkgs/tools/networking/redli/default.nix +++ b/pkgs/tools/networking/redli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redli"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "IBM-Cloud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nLauKt3OnFZFnFjw0s2kTFdvdYjFkeA6eQwZEhT4n/s="; + sha256 = "sha256-AeIGlRsUWK6q0GJJFmvJwpuGy312VPsMhkxMqDDzay4="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b87991003cf13..b1ce1a7b7f6ac 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.13"; + version = "5.5.14"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-Qd1tPRKbiTNmsOdawxQhJO1ykEA1VdAAXeBPPVlXwvI="; + sha256 = "sha256-UTUsuu/CGWhx9zYr7ppnJd7pumb6nGEyVwtJwC0loZ0="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 73e6cbd27d1e2..036cc53efc991 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -2,24 +2,24 @@ , buildPythonApplication , fetchFromGitHub , nix -, nix-prefetch , nixpkgs-fmt , nixpkgs-review }: buildPythonApplication rec { pname = "nix-update"; - version = "0.7.0"; + version = "0.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-q3kC+CJ0+NRz3rqHFuJkiI4RCSAXZczqDiyfQB2CrFQ="; + sha256 = "sha256-EwEGHiJxdubecuXMuBrk6pDld3mNl2ortwlIa0Cdgu0="; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index 0b8447e6e4885..d124c504039ab 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-7X+UeguaWk7+IQ2/PgoFZR7OKpOTzgT/mo8k4eSl53A="; + hash = "sha256-rnzRl7pvX/qBteEbgXrFCzAvtP9Izy6YAZJhy/4nXl4="; }; - vendorSha256 = "sha256-XZk/cwbfg05RkUFMs+AHTfEZiEvqYYoPoSVZVFM967g="; + vendorSha256 = "sha256-96Vxl84+xjRGxudBOaMX8LpRxfYqC2c+hVsipT0NLwE="; sourceRoot = "source/cmd/jwx"; diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index a9f2c241d21c5..032840b7d33c0 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -42,8 +42,12 @@ mkDerivation rec { ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; - # there are *lots* of pointless warnings in v1.3.0 - cmakeFlags = [ "-Wno-dev" ]; + cmakeFlags = [ + # there are *lots* of pointless warnings in v1.3.0 + "-Wno-dev" + # required for kf5auth to work correctly + "-DCMAKE_POLICY_DEFAULT_CMP0012=NEW" + ]; meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix index 065a5fd4d696c..6a1d6379f2b45 100644 --- a/pkgs/tools/security/melt/default.nix +++ b/pkgs/tools/security/melt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "melt"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "melt"; rev = "v${version}"; - sha256 = "sha256-C5bvlgyHU4lfmaAjNddnVyB2B41Wq7yO/RmARAeaORw="; + sha256 = "sha256-ZDUvwBxPFE0RBgNGoZlU+LkyIXINZITqBnKDFnr59+Q="; }; - vendorSha256 = "sha256-9LTR7CrTBGAh7TPMQenY4vZQ7KMYv02fDsY51pkJZSo="; + vendorSha256 = "sha256-vTSLyRdv4rAYvy/2S7NnQNs144wyJOLzFkyBBW0TRmo="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/tools/security/pass2csv/default.nix index 2e48f541ca84e..95649695bfffb 100644 --- a/pkgs/tools/security/pass2csv/default.nix +++ b/pkgs/tools/security/pass2csv/default.nix @@ -7,12 +7,12 @@ buildPythonApplication rec { pname = "pass2csv"; - version = "0.3.2"; + version = "1.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "03a11bd0b0905737f4adb21d87aa1653d84cc1d9b5dcfdfb8a29092245d65db8"; + sha256 = "sha256-a/PQl/nqdj9xOM2hfAIiLuGy5F4KmEWFJihZ4gilaJw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index d6a26dc957f5e..fc966655faac5 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-sjiOmIoFyl1Kr4RKg1TqXJNIq2/HF91oxDLtRDa+eWw="; + sha256 = "sha256-tasR0p+8Y315zngWbDPUmn4O/SaIw+gKGPLT5FGymuo="; }; - vendorSha256 = "sha256-Xi5aJAYgbtrDq7KBAfZR1LT5/jbslwEa70qaFqW4vcQ="; + vendorSha256 = "sha256-1iDFM6KNsvvwOTg05TAJZvHVTv+Gc0nG0STzNdk0NB4="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index db6f890eda8b9..67fdac238e667 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.7.10"; + version = "0.4.7.11"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZH5W36Weo22rBSAn/Px2Y5BcgmwDUJNjxFaQDs1DWls="; + sha256 = "sha256-zzyvvu29vF/RwFQOdNbRCgBerf+SkJg5OBX4Z+MqE24="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix new file mode 100644 index 0000000000000..f4788aba5b686 --- /dev/null +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "automatic-timezoned"; + version = "1.0.41"; + + src = fetchFromGitHub { + owner = "maxbrunet"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-KT1mVP2pMn6M8BPBdBgK94iLuAuoUwGo24L5IT5fVAQ="; + }; + + cargoSha256 = "sha256-hfhSbpNVJm6OE/wL3aPNRV+kJGIZnpoTh8e/trRG21c="; + + meta = with lib; { + description = "Automatically update system timezone based on location"; + homepage = "https://github.com/maxbrunet/automatic-timezoned"; + license = licenses.gpl3; + maintainers = with maintainers; [ maxbrunet ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index f08a70e2b07a1..06d5fb0fa00ef 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - inherit (src.meta) homepage; description = "Tools and library to manipulate EFI variables"; + homepage = "https://github.com/rhboot/efivar"; platforms = platforms.linux; license = licenses.lgpl21Only; }; diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index 0f2ccca157b42..d483bdad221b6 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -47,7 +47,7 @@ , xinput , libva-utils , inxi -, vulkan-utils +, vulkan-tools , i2c-tools , opensc @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { xinput libva-utils # (vainfo) inxi - vulkan-utils + vulkan-tools i2c-tools opensc ] diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index 5d51f708e6a33..f4ad0f485e40e 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "0a01s9lqhqjqpycszfkgmxk60bk4h2ja9ykdhp32aqvcdsjsj763"; + sha256 = "sha256-F6MZxbB3FYEJ8tzJ0tp9/s0aLaH35QUnOJS6mCVfzUQ="; }; - cargoSha256 = "sha256-+OQ4np+JaHMm3n4uayqlAwx+DTi5k4NgKEOWA2lB/BQ="; + cargoSha256 = "sha256-+QPzwfoxt6+gpb4bDMd++1dBKoXOTON0z2EDdgmyy60="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index ec8b44648e2f9..eb54d8ee69504 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-LwDoIvhZj/1fHg2eWgadwTcegeOKPpY8aCAugLfKtDE="; + sha256 = "sha256-NhuFyJvXk3N9G6LedAPwJIDdd0CfFs1rjYmC1tJTqB8="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-u4zM4mmYxy1o1FXQ8SjLJB9YFhYI5SbUZH2Wca7Kjmg="; + cargoSha256 = "sha256-0XqLdjF9O8CRVyq7j7IvOqCUB0oCV2P703BcWwSlIx8="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 147d6c2c85227..f85b3d6275823 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1uukn1juFZB7lLZwGBmTc78h1p1GYhZxWMJqvpvIWpA="; + sha256 = "sha256-7qVjJLw90SUtXkfp40u/X84trnJzgCV6mp7b/yNmcPk="; }; - cargoSha256 = "sha256-SeQ0E/8m6Rxg7oOHbNliVoc+Vh5Yb1E9/n8TJO2rY80="; + cargoSha256 = "sha256-AV6wxD2KZN53rlJofsDISL6p2dfgw+5F+GiP5u9/2/w="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix index 38e4f9510eb02..1c14c4fa5bba4 100644 --- a/pkgs/tools/text/zoekt/default.nix +++ b/pkgs/tools/text/zoekt/default.nix @@ -1,28 +1,31 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , git }: buildGoModule { pname = "zoekt"; - version = "unstable-2021-03-17"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { - owner = "google"; + owner = "sourcegraph"; repo = "zoekt"; - rev = "d92b3b80e582e735b2459413ee7d9dbbf294d629"; - sha256 = "JdORh6bRdHsAYwsmdKY0OUavXfu3HsPQFkQjRBkcMBo="; + rev = "c4b18d3b44da94b3e7c9c94467d68c029666bb86"; + hash = "sha256-QtwOiBxBeFkhRfH3R2fP72b05Hc4+zt9njqCNVcprZ4="; }; - vendorSha256 = "d+Xvl6fleMO0frP9qr5tZgkzsnH5lPELwmEQEspD22M="; + vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k="; checkInputs = [ git ]; + preCheck = '' + export HOME=`mktemp -d` + git config --global --replace-all protocol.file.allow always + ''; + meta = with lib; { - broken = stdenv.isDarwin; description = "Fast trigram based code search"; homepage = "https://github.com/google/zoekt"; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 4f9129cb7269e..62b2c26e6d8e8 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-wdg3pYsWHAEzQHy5LZYp0q9sOn7dmtcwOn94/0wYDa0="; + hash = "sha256-pIxjesfkHWc7kz4knHxLnzopxO26dBAd/3+wVQ19oiI="; }; - vendorSha256 = "sha256-OKqF9EutZP+6CFtANpNt21hGsz6GxuXcoaEqPKnoqeo="; + vendorSha256 = "sha256-ILGUJsfG60qVu1RWoe8gwjVDfhPoAVZck0CVORgN2y0="; passthru = { updateScript = nix-update-script { attrPath = pname; }; |